mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,396 Commits 4 Branches 160 Tags 2.3 GiB
8c194398a9
Commit Graph

1151 Commits

Author SHA1 Message Date
Anuken
a141df434c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Platform.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
 2018-05-31 17:00:47 -04:00
Anuken
32201dda72 Implemented nuclear reactor 'heating' 2018-05-31 16:45:45 -04:00
Anuken
13b0c8880d Implemented block breaking on Android 2018-05-31 16:27:30 -04:00
Anuken
24e7d755eb Added respawn animation on game start 2018-05-31 11:48:07 -04:00
Anuken
e534a6b7fc Merge remote-tracking branch 'origin/4.0' into 4.0 2018-05-31 11:41:38 -04:00
Anuken
277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
Gureumi
8f283b2226
Update bundle_ko.properties 
Early update language file!
may be?
 2018-05-31 20:53:38 +09:00
Anuken
857b76980b Fixed shaky camera, many other small bugs 2018-05-30 23:51:42 -04:00
Anuken
fae7bfa8c5 Dynamic layout for unlocking blocks 2018-05-30 22:41:52 -04:00
Anuken
e9e7d2e289 Place menu scrolling, fixed some settings menu bugs 2018-05-30 18:32:01 -04:00
Anuken
e3cbe118c5 Done with desktop breaking 2018-05-30 13:43:49 -04:00
Anuken
9d05cfba36 Implemented desktop line placement 2018-05-30 12:40:51 -04:00
Anuken
b5966afe25 Removed unnecessary UI fragments, began work on Desktop input 2018-05-30 00:32:20 -04:00
Anuken
1cf91c0ce3 Added rotation to Android placement 2018-05-29 23:18:31 -04:00
Anuken
0f09a0b152 New shaders, remake of Android placement partially done 2018-05-29 22:03:43 -04:00
Anuken
b434c37f01 Rewrite of all static initialization code 2018-05-29 15:24:47 -04:00
Anuken
4655bd5502 Massive input refactoring 2018-05-29 00:15:24 -04:00
Anuken
fcb74d4fba Removed additional info from mac version 2018-05-28 16:55:46 -04:00
Anuken
2bf7d06a91 Scrapped current place menu 2018-05-28 16:23:23 -04:00
Anuken
ce68c2a3e9 Documentation, added Content/ContentDatabase classes 2018-05-28 15:20:46 -04:00
Anuken
e58194ac3c Confined Mac users to Downloads/ directory 2018-05-28 12:34:01 -04:00
Anuken
857f36e01a Re-definition of all ammo and new turrets 2018-05-28 12:28:50 -04:00
Anuken
83c3a80766 Definition of all bullet types listed on trello 2018-05-27 19:12:01 -04:00
Anuken
736552f3b1 Removed all usage of drawBullet, switched to BasicBulletType 2018-05-27 15:49:01 -04:00
Anuken
0b28f97d8f Bullet refactoring 2018-05-27 15:17:35 -04:00
Anuken
47b627d669 Added sprites for all ammo types 2018-05-25 23:04:48 -04:00
Anuken
b051a296fc Added definitions for all bullet types 2018-05-25 21:56:23 -04:00
Anuken
908a569413 Added all dummy ammo types, added ItemType class 2018-05-25 11:45:47 -04:00
Anuken
31f83dfb40 Merge remote-tracking branch 'origin/master' 2018-05-25 01:10:31 -04:00
Anuken
022b16c8e6 Updated Platform.java 2018-05-25 01:10:12 -04:00
Anuken
86360049c3 Updated FileChooser dir 2018-05-25 01:09:18 -04:00
Anuken
f524be6738 Added native file choosers for importing/exporting save 2018-05-24 23:16:03 -04:00
Anuken
519d2c1714 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/sprites/icon.icns
 2018-05-24 21:14:10 -04:00
Anuken
c19fcb831f Added native file chooser, fixed macOS prefs errors 2018-05-24 21:13:31 -04:00
Anuken
ff6268e616 Updated icns file 2018-05-24 21:12:41 -04:00
Anuken
570226a051 Renamed all turrets 2018-05-24 15:40:36 -04:00
Anuken
96cfb51bd8 Sprite changes 2018-05-24 13:30:56 -04:00
Anuken
ba0c7907ca Merge remote-tracking branch 'origin/master' 2018-05-24 11:21:16 -04:00
Anuken
4c6ae83d4b Build 40 release 2018-05-24 11:19:03 -04:00
Anuken
e4231e012d Fixed a few minor bugs with scrolling in editor 2018-05-23 22:23:52 -04:00
Anuken
9693de8885 Added new screen for managing and viewing maps, many editor fixes 2018-05-23 21:40:59 -04:00
Anuken
d096a7ceb1 Merge fixes 2018-05-23 10:37:14 -04:00
Anuken
fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
 2018-05-23 10:36:59 -04:00
Anuken
3f1389818c Changed TextArea padding 2018-05-23 10:28:47 -04:00
Anuken
c920fa6740 Added all export/import menus, fixed bad icons for editor blocks 2018-05-22 23:56:29 -04:00
Anuken
b4088dcfbc Some more revisions to iOS version 2018-05-22 14:30:54 -07:00
Anuken
b20f026c7b Added dialogs for saving/loading maps directly, work on web support 2018-05-22 17:28:21 -04:00
Anuken
f0fa126e7b Changed map edit menu, added map info dialog 2018-05-22 14:16:12 -04:00
Anuken
2999694f48 Fixed brush not respecting multiblock rules 2018-05-22 12:33:42 -04:00
Anuken
fcc60957c1 Made DrawOperation non-disposable 2018-05-22 12:09:18 -04:00
Anuken
4781351184 Testing github webhook 2018-05-22 12:07:33 -04:00
Anuken
d97a585eba Added undoing for map editor 2018-05-22 00:02:43 -04:00
Anuken
2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -04:00
Anuken
3b5a9c0a10 Added IndexedRenderer color, block team indicator 2018-05-21 18:49:00 -04:00
Anuken
f6184004e5 Implemented editor multiblock support 2018-05-21 17:45:12 -04:00
Anuken
5602cb8920 Added basic enemy spawning, fixed turret base sprite, input place lag 2018-05-21 15:03:34 -04:00
Anuken
4a250b4e27 Fixed brush size layout, added map resize button 2018-05-21 13:59:35 -04:00
Anuken
37afb46957 Deprecated Draw.color(String), switched to type-safe usage 2018-05-21 13:37:16 -04:00
Anuken
9708d3183f Implemented multiblock replacement, upgrade-safe building 2018-05-21 12:20:23 -04:00
Anuken
241b86d704 Updated item transfer visuals, centered block inventory 2018-05-21 12:03:49 -04:00
Anuken
8f137eadf0 New ItemTransfer entity 2018-05-21 11:25:41 -04:00
Anuken
93353ff900 Removed action-based item transfer animation 2018-05-21 11:05:10 -04:00
Anuken
ed7e77b2db New breaking animation and colors 2018-05-21 00:27:01 -04:00
Anuken
2108aab523 Added usage of OS.getAppDataDirectory() 2018-05-20 21:52:45 -04:00
Anuken
75f01099ee Re-added resource harvesting from blocks 2018-05-20 20:51:56 -04:00
Anuken
26e1ad51ff Documentation, cleanup, incremental resource usage, core seeking 2018-05-20 20:41:10 -04:00
Anuken
c1a5482ad2 Major refactoring of building, sound, inventory 2018-05-20 17:59:52 -04:00
Anuken
ed232248a2 Updated polish bundle 2018-05-20 16:05:24 -04:00
Anuken
e215324292 Updated spanish bundle, added missing formatted text 2018-05-20 15:50:01 -04:00
Anuken
b64cbc223f Updated icons again 2018-05-20 15:16:44 -04:00
Anuken
de40df7f7b Fixed place mode not overwriting old queue 2018-05-20 13:05:25 -04:00
Anuken
94896451ac Merge remote-tracking branch 'origin/master' 2018-05-20 11:47:32 -04:00
Anuken
0e35bb4852 Fixed scrolling player menu causing panning on mobile 2018-05-20 11:47:20 -04:00
Anuken
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -07:00
Anuken
1c1df81341 Added sharing for iOS saves, fixed icons 2018-05-19 17:13:04 -07:00
Anuken
66a1cc7b71 Updated iOS map sharing 2018-05-19 18:25:20 -04:00
Anuken
0543569315 Merge remote-tracking branch 'origin/master' 2018-05-19 15:01:55 -07:00
Anuken
e5a94bd140 Grid updates 2018-05-19 15:01:18 -07:00
Anuken
adfebdb3f6
Merge pull request #122 from Prosta4okua/patch-1 
Update bundle_ru.properties[Work in progress]
 2018-05-19 15:58:41 -06:00
Prosta4okua
dbe06b0a93
Update bundle_ru.properties 2018-05-19 22:50:50 +03:00
Anuken
e8305d1245 Updated map editor with better placement preview 2018-05-19 11:53:01 -07:00
Prosta4okua
b2ea733b45
Update bundle_ru.properties 2018-05-19 21:49:29 +03:00
Anuken
fc320fb9ee Moved Platform.java, basic iOS image loading 2018-05-19 10:35:48 -07:00
Commodore64x
a3268eefbf Fixed field size in rollback menu. 2018-05-19 14:34:50 +10:00
Commodore64x
5a77eebb34 Fixed ui in the rollback menu. 2018-05-19 14:22:07 +10:00
Commodore64x
68af32bc9f Added rollback into the admin menu, fixed a bug where players would crash upon trying to view their own logs on relog. 2018-05-19 13:37:44 +10:00
Anuken
100e5042de Fixed block placement crash 2018-05-18 18:24:36 -07:00
Anuken
b3e188a5f4 Improvements to annotation code generation system, client RMI 2018-05-18 17:21:18 -07:00
Anuken
ae3bcac3b7 Removed gifimages folder 2018-05-18 09:26:50 -07:00
Anuken
afed54b217 Fixed a few bugs with new placement system 2018-05-18 09:22:40 -07:00
Anuken
57b0e3e311 Fixed iOS donate button and changelog appearing 2018-05-17 20:55:29 -07:00
Anuken
19e62786c9 New placement system without limits, queue block placements 2018-05-17 20:36:43 -07:00
Anuken
97cac33773 New build limits, recipe refactoring 2018-05-16 14:27:25 -07:00
Anuken
a889571b98 Added unit-based block building with effects 2018-05-16 12:54:36 -07:00
Anuken
cf1148e7c8 iOS plist fixes, re-added music 2018-05-16 11:06:15 -07:00
Anuken
e2f74fd4f0 Removed build effect surface usage 2018-05-16 07:52:17 -07:00
Anuken
57bcea56b5 Implemented block build animation and shaders 2018-05-15 20:03:03 -07:00
Commodore64x
380a955e7a Updated the way packets are exchanged for edit logs. 2018-05-15 16:36:39 +10:00
Anuken
cf50f47459 Improvements to ground unit AI 2018-05-14 08:51:16 -07:00
Anuken
eb69dce585 Removed Invoke class 2018-05-14 06:40:23 -07:00
Commodore64x
b3adf7b331 Replaced ArrayLists with Arrays, overhauled requesting of logs from the server, improved rollback command and added log resetting. 2018-05-14 18:48:44 +10:00
Anuken
c79f0b76ff Keybind fixes 2018-05-13 21:16:44 -07:00
Anuken
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
Anuken
d1a3752b2d Annotation processing done, more work on local multiplayer input 2018-05-13 16:41:50 -07:00
Anuken
00e70cbb6a Massive amount of refactoring for local multiplayer, annotations 2018-05-12 07:30:23 -07:00
Commodore64x
7f2c2d9d6b Added edit logging and whole world rollback 2018-05-12 18:34:44 +10:00
Anuken
959f756ff5 Local multiplayer initial commit 2018-05-11 07:59:10 -07:00
Anuken
90b9ba71de Removed delta() usage in modules 2018-05-11 07:02:10 -07:00
Anuken
26025a3018 Fixed multithreading affecting wave time 2018-05-09 16:58:53 -07:00
Anuken
09bdfd7ac1 Added local method invocation annotation 2018-05-09 16:41:02 -07:00
Anuken
ce2b73b737 Updated Bullet to use floats 2018-05-09 09:46:24 -07:00
Anuken
83d1707b56 Added event method, changed Fireball to projectile type 2018-05-09 10:52:51 -04:00
Gureumi
cbdf252fe6
fix missing tranlate lang and update about info 2018-05-09 20:33:53 +09:00
Anuken
55cd0c2bae Added basic RMI-like system for network evens 2018-05-08 18:39:52 -04:00
Anuken
6cc1cecf5a Updated RDX item, changed packet creation to use pooling 2018-05-08 10:53:36 -04:00
Anuken
7a94ebcf2a Implemented packet pooling 2018-05-07 14:23:52 -04:00
Anuken
84a126253a Fixed player looking at cursor with no ammo 2018-05-06 21:35:59 -04:00
Anuken
ad3ce3f9fc Minor comment fix 2018-05-06 11:52:10 -04:00
Anuken
c74ee2150c Implemented new accurate turret prediction 2018-05-06 10:54:18 -04:00
Prosta4okua
665f0ee03e
Update bundle_ru.properties 2018-05-06 09:45:17 +03:00
Anuken
f8a4128c88 Updated sprites 2018-05-06 01:43:33 -04:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
b020336f8c Temporarily disabled validating replacements 2018-05-05 22:26:59 -04:00
Anuken
299c2af59b Added configurable anti-grief 2018-05-05 20:20:34 -04:00
Anuken
37a73eda37 Fixed menu opening and closing when chat is open 2018-05-05 18:36:25 -04:00
Anuken
450fc456be Fixed extra wave time counting down on tutorial 2018-05-05 14:13:21 -04:00
Anuken
f7e0dc4818 Changed music back 2018-05-05 13:50:32 -04:00
Anuken
b496f51afc Added turk bundle, updated wrapping, added fastshoot kick message 2018-05-05 13:45:04 -04:00
Anuken
c1163a078a Updated translation bundles, added autowrap to menu 2018-05-05 13:18:21 -04:00
Anuken
90c243dec8 Merge remote-tracking branch 'origin/master' 2018-05-05 12:49:01 -04:00
Anuken
fab22a152c Fixed instant disconnect due to UDP flood, extremely jumpy interpolation 2018-05-05 12:48:50 -04:00
Anuken
3905da1a62 Added RDX entry 2018-05-05 10:16:26 -04:00
Gureumi
3dd1fc2efe
Update translate file to Mindustry 4.0 2018-05-04 13:13:12 +00:00
Anuken
c1066e94f2 Implemented drone sprite, basic AI 2018-05-03 22:54:21 -04:00
Anuken
3a3c23d2f1 Fixed discarded shells appearing in water 2018-05-03 15:19:00 -04:00
Anuken
2af750cfec Implemented shooting and states for ground units 2018-05-03 12:59:23 -04:00
Anuken
42b3b19a57 Fixed broken blocks not updating path 2018-05-02 17:26:20 -04:00
Anuken
496498b913 Implemented auto-updating pathfinder 2018-05-02 17:14:10 -04:00
Anuken
3fcdfbd01a Optimized floor rendering 2018-05-02 11:38:44 -04:00
Anuken
72fc673020 Fixed floor rendering 2018-05-02 00:19:38 -04:00
Anuken
c3967c79c9 Fixed some hitbox issues, preparing to remake floor rendering 2018-05-01 23:45:32 -04:00
Anuken
3dd07d2f4a Implemented fast dijkstra-map pathfinding 2018-05-01 21:34:30 -04:00
Anuken
036f233946 Improved rubble and VTOL accuracy 2018-05-01 19:07:13 -04:00
Anuken
9776884a91 Fixed controllers not aiming properly 2018-05-01 17:04:32 -04:00
Anuken
131f646024 Fixed broken resupply animations 2018-05-01 16:46:10 -04:00
Anuken
1bf728359d Fixed build errors 2018-05-01 16:02:42 -04:00
Anuken
8a83e0fc1a Fixed server compile errors, added resupply point block 2018-04-30 22:28:47 -04:00
Anuken
0be49002ba Added repair point block 2018-04-30 17:14:35 -04:00
Anuken
2b96c820fd Fixed rubble-related crash, improved vtol AI 2018-04-29 23:34:40 -04:00
Anuken
9641a388e2 Improved vtol effects, added state machines for behavior 2018-04-29 15:31:13 -04:00