mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,534 Commits 4 Branches 160 Tags 2.3 GiB
2c97a4aefe
Commit Graph

294 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
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
277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
Anuken
9d05cfba36 Implemented desktop line placement 2018-05-30 12:40:51 -04:00
Anuken
1cf91c0ce3 Added rotation to Android placement 2018-05-29 23:18:31 -04:00
Anuken
2bf7d06a91 Scrapped current place menu 2018-05-28 16:23:23 -04:00
Anuken
857f36e01a Re-definition of all ammo and new turrets 2018-05-28 12:28:50 -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
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
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
f0fa126e7b Changed map edit menu, added map info dialog 2018-05-22 14:16:12 -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
241b86d704 Updated item transfer visuals, centered block inventory 2018-05-21 12:03:49 -04:00
Anuken
26e1ad51ff Documentation, cleanup, incremental resource usage, core seeking 2018-05-20 20:41:10 -04:00
Anuken
6cc1cecf5a Updated RDX item, changed packet creation to use pooling 2018-05-08 10:53:36 -04:00
Anuken
f8a4128c88 Updated sprites 2018-05-06 01:43:33 -04:00
Anuken
c1066e94f2 Implemented drone sprite, basic AI 2018-05-03 22:54:21 -04:00
Anuken
036f233946 Improved rubble and VTOL accuracy 2018-05-01 19:07:13 -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
37fcd81e87 Improved VTOL animation, made power nodes circular 2018-04-29 10:46:14 -04:00
Anuken
b589d8a1df Added VTOL animation 2018-04-29 01:22:26 -04:00
Anuken
8581213126 Moved bullet FX to ammo type, beginning of weapon rework 2018-04-23 21:35:40 -04:00
Anuken
97360b33f4 Added new chain/titan sprites 2018-04-21 15:18:12 -04:00
Anuken
7df232c65d Added block rubble, more liquid interaction 2018-04-19 19:06:52 -04:00
Anuken
b5cba3abfd New unbroken floor rendering system 2018-04-18 21:18:12 -04:00
Anuken
1d8630dd7d Improved conduit interaction / Various messups 2018-04-18 15:23:20 -04:00
Anuken
bfcce4f7ab Messed up rendering some more 2018-04-17 23:52:38 -04:00
Anuken
6007e511ba Implemented basic block explosion modeling 2018-04-15 15:49:50 -04:00
Anuken
fcf62ada8f Changed inventory system to use real core inventory 2018-04-14 11:14:00 -04:00
Anuken
a3a1e6d3a9 Added liquid bridge conduits 2018-04-11 21:39:54 -04:00
Anuken
2c769cad0b Removed tunnels / Added item bridge 2018-04-11 21:14:12 -04:00
Anuken
25778a143c Added overflow gate block 2018-04-10 21:30:24 -04:00
Anuken
6967093689 Added liquid bridge / Smoothed conduit liquid display 2018-04-09 18:31:06 -04:00
Anuken
aa28c3a45b Added light item bridge 2018-04-08 21:46:48 -04:00
Anuken
21fe0f9246 Added incinerator 2018-04-08 12:23:39 -04:00
Anuken
117e2e2cb6 Added metal floor / Implemented teleporter activation 2018-04-07 21:37:33 -04:00
Anuken
7ea4a503f7 Added new 'space' tile with shader / Added additional teleporter FX 2018-04-06 21:28:14 -04:00
Anuken
7a65604cc8 Lightning turret tweaks / Beginning of teleporter rework 2018-04-06 16:59:31 -04:00
Anuken
7cd96e379e Partial liquid turret implementation / Status effects 2018-04-05 21:37:54 -04:00
Anuken
ddf39461fb Implemented lancer turret 2018-04-05 17:29:49 -04:00
Anuken
62608bea6c More effect tweaks / Unfinished implementation of lancer turret 2018-04-04 23:50:27 -04:00
Anuken
05356776c5 Static effects / Better shell ejections / Implemented new cannon turret 2018-04-04 21:13:49 -04:00
Anuken
1956fccbe9 Implemented 'railgun' turret / Hierarchy split / Color refactoring 2018-04-04 16:44:32 -04:00
Anuken
397220e682 Implemented liquid turrets with ammo / Implemented flamer turret 2018-04-03 23:06:39 -04:00
Anuken
54d0cae450 Major turret and bullet refactoring // New effects 2018-04-02 21:43:06 -04:00
Anuken
5ee369f26a Fixed fusion reactor power transfer / Start of turret overhaul 2018-04-01 11:13:27 -04:00
Anuken
198dff7864 Updated plasma drill sprites 2018-03-31 22:48:56 -04:00
Anuken
0813f00ea1 Added fusion reactor 2018-03-31 22:39:23 -04:00
Anuken
06dcc875bd Added longer-range power nodes / Resprite of some generators 2018-03-31 17:20:48 -04:00
Anuken
dd0ad495f7 Added plasma drill 2018-03-31 14:51:24 -04:00
Anuken
8a80e82b5d Added nuclear drill / Broke various things 2018-03-31 14:03:52 -04:00
Anuken
c14fb51eb8 Added pulverizer block 2018-03-31 11:55:17 -04:00
Anuken
9302b7c15c Added text 2018-03-31 11:53:32 -04:00
Anuken
662283908c Implemented silicon production / Centrifuge / Retexturing 2018-03-30 23:25:39 -04:00
Anuken
532eeb7ab0 Groundwater pump animation / water recolor 2018-03-29 23:38:16 -04:00
Anuken
027e8dc35e Start of drill re-tiering / Animated drills / Fixed fracker bugs 2018-03-29 21:36:34 -04:00
Anuken
d83a852681 Start of drill re-tiering / Animated drills / Fixed fracker bugs 2018-03-28 23:00:12 -04:00
Anuken
826d5705c9 Animated oil extractor 2018-03-28 21:23:02 -04:00
Anuken
fbf8655ea4 Oil extractor water now needed / new liquid physics / new plastic balance 2018-03-28 20:01:47 -04:00
Anuken
a98f42012a Implemented biomatter compressor 2018-03-28 00:05:27 -04:00
Anuken
29051d4281 Improved cultivator sprite, changed save format of some crafters 2018-03-27 23:17:15 -04:00
Anuken
1d0063ed39 Fixed offloadNear and power smelter bugs 2018-03-27 21:30:54 -04:00
Anuken
18d81f6daa Implemented alloy smelter, fixed place crashes for many of the blocks 2018-03-27 20:11:47 -04:00
Anuken
17bc8fd9ed Added sprites for all new crafting blocks, fixed seprator 2018-03-26 22:49:33 -04:00
Anuken
707e57e72d Added many new block types, changed land unit AI, bugfixes 2018-03-26 20:26:36 -04:00
Anuken
203e4bc0a4 Added ground unit factory support 2018-03-25 23:49:40 -04:00
Anuken
d6cd197435 Implemented new build shader 2018-03-25 16:47:01 -04:00
Anuken
684b57d139 Flying unit factory implementation, bugfixes 2018-03-25 15:04:29 -04:00
Anuken
3418979f4d Content class reorganization, beginning work on unit factory 2018-03-25 13:12:32 -04:00
Anuken
59530909d6 Added terrain exporting and importing 2018-03-25 00:44:25 -04:00
Anuken
9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
Anuken
7d2fd514be Experimental power system changes 2018-03-23 20:17:35 -04:00
Anuken
5b075ead9e Removed quartz and dirium, added plastic + dense alloy 2018-03-22 19:10:28 -04:00
Anuken
e5656896e7 Added text 2018-03-21 20:50:00 -04:00
Anuken
238c589ad6 Unified turret outlines, fixed saves not working 2018-03-21 20:04:59 -04:00
Anuken
85988a2ff9 More map editor improvements, turret outline rendering 2018-03-21 16:45:05 -04:00
Anuken
713875100b Everything has been broken 2018-03-17 12:22:21 -04:00
Anuken
ed0b796c5a Extra merge changes 2018-03-16 22:19:35 -04:00
Anuken
714fdc751a Added test unit type 2018-03-16 21:48:44 -04:00
Anuken
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
Anuken
155f3945a6 Progress on implementing unit teams 2018-03-15 00:19:05 -04:00
Anuken
0b2a933faa Fixed startup crash, implemented basic player animations 2018-03-14 23:03:27 -04:00
Anuken
1cd30e9057 Mass-deletion of enemy code 2018-03-14 18:02:35 -04:00
Anuken
b822a02d41 Added cryofluid mixer, liquid rebalancing 2018-03-13 18:54:28 -04:00
Anuken
2a0d3b05d3 Added oil extractor 2018-03-13 01:16:15 -04:00
Anuken
94b815b8ab Added groundwater pump, 3x3 solar panels 2018-03-12 22:02:52 -04:00
Anuken
e67ddf9430 Added liquid silos, general liquid cleanup 2018-03-12 16:09:14 -04:00
Anuken
9d49c7d836 Implemented new display/icon system for power lasers/batteries 2018-03-10 23:32:13 -05:00
Anuken
3ce7284fc5 Added batteries, 3x3 teleporter 2018-03-10 20:28:25 -05:00