mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,846 Commits 4 Branches 160 Tags 2.3 GiB
8432677826
Commit Graph

842 Commits

Author SHA1 Message Date
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
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
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -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
Prosta4okua
b2ea733b45
Update bundle_ru.properties 2018-05-19 21:49:29 +03: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
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
19e62786c9 New placement system without limits, queue block placements 2018-05-17 20:36:43 -07:00
Anuken
cf1148e7c8 iOS plist fixes, re-added music 2018-05-16 11:06:15 -07:00
Anuken
57bcea56b5 Implemented block build animation and shaders 2018-05-15 20:03:03 -07:00
Anuken
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
Commodore64x
7f2c2d9d6b Added edit logging and whole world rollback 2018-05-12 18:34:44 +10:00
Gureumi
cbdf252fe6
fix missing tranlate lang and update about info 2018-05-09 20:33:53 +09:00
Anuken
6cc1cecf5a Updated RDX item, changed packet creation to use pooling 2018-05-08 10:53:36 -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
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
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
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
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -04:00
Anuken
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken
941ebd39bf Added new royalty-free music 2018-04-28 13:44:46 -04:00
Anuken
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken
8a13482c38 Changed OGGs to MP3s, fixed desktop version being unable to start 2018-04-27 22:44:21 -04:00
Anuken
91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/assets/bundles/bundle_es_LA.properties
#	core/assets/version.properties
 2018-04-25 20:45:39 -04:00
Anuken
8c369d9874 Removed version.properties 2018-04-25 20:44:22 -04:00
Anuken
b5008f4ad3 Added unit ammo support, multi-ammo inventories 2018-04-25 20:40:51 -04:00
Anuken
deefab8a5b Implemented ammo ressuplying 2018-04-24 21:38:57 -04:00
Anuken
ff6dc98bbe Added spanish bundle 2018-04-23 21:47:39 -04:00
Anuken
8581213126 Moved bullet FX to ammo type, beginning of weapon rework 2018-04-23 21:35:40 -04:00
Anuken
aa83510fbe Moved unit-related classes, added base flying types 2018-04-22 17:40:23 -04:00
Anuken
5aa995b5ef Version.properties update 2018-04-21 18:49:06 -04:00
Anuken
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
 2018-04-21 18:47:43 -04:00
Anuken
9f4f107b6d Changed version build 2018-04-21 18:39:49 -04:00
Anuken
90716ebaad Added italian bundle 2018-04-21 18:32:56 -04:00
Anuken
496b4e77e8 Updated version 2018-04-21 18:28:38 -04:00
Anuken
6e9d833c77 Added infinite reach on sandbox 2018-04-21 18:08:34 -04:00
Anuken
48061d3cae Fixed flick scroll issues 2018-04-21 18:03:43 -04:00
Anuken
292ce33e0f Fixed placement preview PR 2018-04-21 15:54:21 -04:00
Anuken
365fc6af20
Merge pull request #117 from hellomouse/feature-blockpreview 
Added Placement Preview
 2018-04-21 15:41:03 -04:00
Anuken
97360b33f4 Added new chain/titan sprites 2018-04-21 15:18:12 -04:00
Anuken
5012313dc4 Implemented inefficient pathfinding 2018-04-21 14:26:05 -04:00
Anuken
95f10aeb06 Attempts to further optimize pathfinding 2018-04-21 11:55:32 -04:00
Anuken
8a965e56cd Fixed not being able to pan with invalid recipe selected 2018-04-21 11:02:54 -04:00
Anuken
fb14a83b9a More work on pathfinding 2018-04-21 01:09:06 -04:00
Anuken
4261e6242c Implemented JPS badly 2018-04-20 19:55:41 -04:00
Anuken
ccd25c7e76 Implemented basic minimap 2018-04-19 21:57:55 -04:00
Anuken
7df232c65d Added block rubble, more liquid interaction 2018-04-19 19:06:52 -04:00
Anuken
7d5f336e36 Final block rendering system revisions, for now 2018-04-18 21:31:33 -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
622f0d9355 Refactored BlockRenderer into two classes 2018-04-17 22:20:57 -04:00
Anuken
434256b0a5 Messed up many things 2018-04-17 20:04:57 -04:00
Anuken
e7a4ce2e19 Implemented entity pooling, effect saving, other fixes 2018-04-17 18:57:03 -04:00
Anuken
23dc62dbd2 Fixed map file names not being shown 2018-04-17 17:15:43 -04:00
Anuken
739e636a2c Added 'sleeping entity' optimization 2018-04-17 17:07:04 -04:00
Anuken
47d61c4a0e Changed GridMap usage to IntMap 2018-04-17 09:06:55 -04:00
Anuken
7f2a0a77c7 Player saveWrite tweaks 2018-04-17 08:57:30 -04:00
Anuken
0bebe5008b Implemented leaky liquid explosions / New entity save system 2018-04-16 22:46:16 -04:00
Anuken
ee24eb8d1b Made saves load backup files if original save gets corrupted 2018-04-16 21:11:49 -04:00
Anuken
a4962c5225 Basic documentation for fire/puddles 2018-04-16 17:41:49 -04:00
Anuken
bece87c790 Implemented puddles of liquid 2018-04-16 17:32:35 -04:00
Anuken
e6f9ce888f Fixed autosave not updating meta 2018-04-15 23:12:26 -04:00
Anuken
871b6548ab Implemented player explosion intensity calculation / Fixed fire spread 2018-04-15 22:41:27 -04:00
Anuken
cb569be3b3 Improved fireballs and general block explosions 2018-04-15 20:06:38 -04:00
Commodore64x
0e50fbf3f2 Fixed rendering and other issues. 2018-04-16 09:08:44 +10:00
Anuken
3adc599278 Implemented fire 2018-04-15 17:12:09 -04:00
Anuken
68593acf89 Changed UUID generation slightly 2018-04-15 16:04:22 -04:00
Anuken
6007e511ba Implemented basic block explosion modeling 2018-04-15 15:49:50 -04:00
Anuken
01fc7108d8 Implemented conveyor item access 2018-04-15 13:05:18 -04:00
Commodore64x
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
Anuken
02ab945ab8 Made junction ignore clogs 2018-04-14 21:57:10 -04:00
Anuken
97e5ac4c1e Implemented 'deep' unplaceable floor blocks 2018-04-14 21:51:46 -04:00
Anuken
458d4378f0 Removed liquid storage 2018-04-14 21:13:10 -04:00
Anuken
cce4113b2d Fixed flipped fin/fout usage 2018-04-14 20:44:40 -04:00
Anuken
89f06506c1 Fixed transfer exploit 2018-04-14 20:38:33 -04:00
Anuken
4b6b1b43cd Updated uCore 2018-04-14 13:49:42 -04:00
Anuken
913ee34c8d Implemented item dumping 2018-04-14 13:47:55 -04:00
Anuken
4e77f24a06 Implemented inventory capacity 2018-04-14 12:00:42 -04:00
Anuken
fcf62ada8f Changed inventory system to use real core inventory 2018-04-14 11:14:00 -04:00
Anuken
86b7966027 Implemented item dragging and transferring 2018-04-13 23:55:53 -04:00
Anuken
43c9bc51dc Implemented basic block inventories 2018-04-13 20:05:42 -04:00
Anuken
439d2c88ae Updated uCore 2018-04-12 17:34:24 -04:00
Anuken
37aced0ad3 Minor tweaks to fit new Effects position 2018-04-12 17:22:29 -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
b1ad8f917d Changed parameters of griefer command 2018-04-11 13:06:03 -04:00
Anuken
221f7be21b Added utility griefer scan command 2018-04-11 13:05:08 -04:00
Anuken
f8b0819fb3 Fixed stone formers 2018-04-11 10:24:01 -04:00
Anuken
25778a143c Added overflow gate block 2018-04-10 21:30:24 -04:00
Anuken
5b11875a5a Better conveyor physics / Performance test maps / Unit inventory begin 2018-04-09 20:25:08 -04:00
Anuken
6967093689 Added liquid bridge / Smoothed conduit liquid display 2018-04-09 18:31:06 -04:00
Anuken
0cafa152bf Added fix for overflow block IDs 2018-04-09 10:30:15 -04:00
Anuken
aa28c3a45b Added light item bridge 2018-04-08 21:46:48 -04:00
Anuken
815daccff1 Made server connection info slightly less verbose 2018-04-08 12:38:22 -04:00
Anuken
f61aa6068b Added additional server commands, fixed a crash 2018-04-08 12:33:13 -04:00
Anuken
21fe0f9246 Added incinerator 2018-04-08 12:23:39 -04:00
Anuken
6db1175c95 Implemented conveyor physics 2018-04-08 12:02:42 -04:00
Anuken
30ddd91a34 Merge fixes 2018-04-08 10:47:09 -04:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
Anuken
86d5803b63 Minor status effect/liquid bugfixes 2018-04-08 10:36:49 -04:00
Anuken
98ec2dcf44 Implemented passable liquids 2018-04-07 23:24:33 -04:00
Anuken
117e2e2cb6 Added metal floor / Implemented teleporter activation 2018-04-07 21:37:33 -04:00
Anuken
4b39e5fab6 Fully implemented teleporters 2018-04-07 19:31:42 -04:00
Anuken
7ea4a503f7 Added new 'space' tile with shader / Added additional teleporter FX 2018-04-06 21:28:14 -04:00
Anuken
7cf619e620 Back button usage cleanup 2018-04-06 17:07:33 -04:00
Anuken
7a65604cc8 Lightning turret tweaks / Beginning of teleporter rework 2018-04-06 16:59:31 -04:00
Anuken
d67402e6aa Implemented lightning turret 2018-04-06 15:14:19 -04:00
Anuken
2191437f39 Fixed turrets hitting friendly players / Fixed android compile error 2018-04-06 10:33:11 -04:00
Anuken
c6efa6ca2e Updated uCore 2018-04-05 22:30:59 -04:00
Anuken
5172ae781f Updates for new uCore version 2018-04-05 22:30:25 -04:00
Anuken
343a94bf05 Implemented GFX for all status effects 2018-04-05 22:25:08 -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
0559b43bde Updated uCore 2018-04-03 23:58:33 -04:00
Anuken
397220e682 Implemented liquid turrets with ammo / Implemented flamer turret 2018-04-03 23:06:39 -04:00
Anuken
636da8f95f Additional bullet effects / Rotational replacement 2018-04-03 18:36:18 -04:00
Anuken
94f2e880cd Additional effect tweaks 2018-04-02 23:08:07 -04:00
Anuken
c03aa6300e Added shell ejection effects / Added burst turret 2018-04-02 22:52:24 -04:00
Anuken
54d0cae450 Major turret and bullet refactoring // New effects 2018-04-02 21:43:06 -04:00
Anuken
efd9280f96 Build code fix 2018-04-02 15:35:20 -04:00
Anuken
a1ca9d396c Updated to build 37 2018-04-02 14:39:54 -04:00
Anuken
c686bf6149 Changed tunnel buffer system (again) 2018-04-02 14:25:08 -04:00
Anuken
20b95fa063 Ammo things added 2018-04-01 21:07:52 -04:00
Anuken
9db7b1385d Updated uCore / Fixed behind-UI swipe bug 2018-04-01 12:07:30 -04:00
Anuken
ec5f74b753 Removed every single bullet type, breaking everything 2018-04-01 11:56:11 -04:00
Anuken
0936fc6550 Multithreading crash fixes / Server 'find' command added 2018-04-01 11:33:30 -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
eab226f04d Organized FX 2018-03-31 15:30:06 -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
ed276ac79e Fixed random collision deaths 2018-03-30 19:18:33 -04:00
Anuken
84548187f5 Changed tunnel acceptance algorithm 2018-03-30 18:05:58 -04:00
Anuken
532eeb7ab0 Groundwater pump animation / water recolor 2018-03-29 23:38:16 -04:00
Anuken
e78579581f Drill cleanup / Added liquid boosting / Liquid hierarchy cleanup 2018-03-29 22:51:49 -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
737c63da5e Plastic production system balancing 2018-03-28 10:20:42 -04:00
Anuken
f0302ca7dc Changed file sorting comparator to ignore case 2018-03-28 09:39:29 -04:00
Anuken
c54df7cbd1 Fixed host bug, server failing to kick people firing too fast 2018-03-28 00:22:07 -04:00
Anuken
a98f42012a Implemented biomatter compressor 2018-03-28 00:05:27 -04:00
Anuken
8526c67e4d Updated uCore to fix build errors 2018-03-27 23:21:01 -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
e0c1bb8da1 Final kick revision (?) 2018-03-24 19:30:16 -04:00
Anuken
fd352f4ab1 Changed kicking again 2018-03-24 19:19:24 -04:00
Anuken
7f40247b89 Fixed overly sensitive shoot-kicking 2018-03-24 19:10:17 -04:00
Anuken
674d259df1 Editor crude multiblock support, indexed renderer Z support 2018-03-24 18:19:39 -04:00
Anuken
b20a2f74c4 3.5 release 2018-03-24 14:23:39 -04:00
Anuken
5c748fbe54 Upgrade purchase verification, various bugfixes for 3.5 2018-03-24 14:07:07 -04:00
Anuken
8eb2a13efd Added host/join info text 2018-03-24 12:25:56 -04:00
Anuken
3af18094f7 Fixed power passback, adjusted laser colors to depend on transfer amount 2018-03-24 11:12:21 -04:00
Anuken
9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
Anuken
c73286358c Changed router passback function to take items into account 2018-03-23 23:00:08 -04:00
Anuken
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
Anuken
2dd67c229c Made hand cursor display on configurable blocks 2018-03-23 22:42:40 -04:00
Anuken
7b3d60215b New power system implemented 2018-03-23 22:39:42 -04:00
Anuken
7d2fd514be Experimental power system changes 2018-03-23 20:17:35 -04:00
Anuken
2981dd857f Fixed some compile errors 2018-03-22 20:37:13 -04:00
Anuken
357fc37a79 Fixed teleporter crash and color switch bug 2018-03-22 19:21: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
23e6f89eef Added very basic exporting, preview and a test map 2018-03-21 00:31:43 -04:00
Anuken
e330b28e49 Optimized map renderer to no longer lag out on crappy phones 2018-03-20 22:15:44 -04:00
Anuken
1984921883 WIP inefficient mesh renderer 2018-03-20 21:55:11 -04:00
Anuken
68f8ef54ac Removing CacheBatch due to performance issues 2018-03-20 20:14:39 -04:00
Anuken
d5493e6149 Fixed overlapping background on Android 2018-03-20 18:42:12 -04:00
Anuken
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken
940b8b72f9 Basic implementation of editor 2018-03-19 23:09:38 -04:00
Anuken
ba7be0293c Added changelog to 'about' dialog, for Android users 2018-03-19 20:54:34 -04:00
Anuken
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
0f8168324f Removed old maps, re-added map editor, broke compilation again 2018-03-18 22:30:33 -04:00
Anuken
172ac78466 New map format, completely broke loading or playing 2018-03-17 21:21:24 -04:00
Anuken
713875100b Everything has been broken 2018-03-17 12:22:21 -04:00
Anuken
ba84bb82b4 Implemented a basic unit 2018-03-17 00:41:56 -04:00
Anuken
3903750ba2 Fixed overly large hitboxes 2018-03-16 22:40:01 -04:00
Anuken
ed0b796c5a Extra merge changes 2018-03-16 22:19:35 -04:00
Anuken
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00
Anuken
714fdc751a Added test unit type 2018-03-16 21:48:44 -04:00
Anuken
e2effa1c5d Minor scroll fix 2018-03-16 21:28:03 -04:00
Anuken
5846af9453 Finished new menu layout, added submenu for playing 2018-03-16 19:36:44 -04:00
Anuken
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
Anuken
13619a14dc Added custom cursors 2018-03-16 12:34:35 -04:00
Anuken
b9f565f5fc Minor cleanup of gamemode description PR 2018-03-16 00:39:39 -04:00
Anuken
ad2e2032e6 Added GroundUnitType, compile fixed 2018-03-16 00:30:41 -04:00
Anuken
52c0a8e573 Fixed compile errors, unitification 2018-03-15 21:42:23 -04:00
Cedric L'homme
4dff6d834a add an info button for descriptions of the game mode. 2018-03-15 21:18:06 +01:00
Anuken
2037ebaaba Fixed many placement mode bugs 2018-03-15 14:25:45 -04:00
Anuken
807c4688c2 Added Units class, removed writeString() from SaveFileVersion 2018-03-15 13:30:06 -04:00
Anuken
b4ec2ccb90 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-15 12:57:03 -04:00
Anuken
ae89a004a6 Fixed port bug, possible random disconnect fix 2018-03-15 12:53:47 -04:00
Anuken
95db857fb5 Updated uCore 2018-03-15 12:29:19 -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
01ba051c43 Fixed compilation errors 2018-03-14 20:15:25 -04:00
Anuken
1cd30e9057 Mass-deletion of enemy code 2018-03-14 18:02:35 -04:00
Anuken
a023c4fbac Fixed positions jumping with shader zoom-out 2018-03-14 14:13:06 -04:00
Anuken
99c12595a9 Animated oil blocks as well 2018-03-14 12:57:30 -04:00
Anuken
3056e9e79c Animated water 2018-03-13 22:34:52 -04:00
Anuken
b822a02d41 Added cryofluid mixer, liquid rebalancing 2018-03-13 18:54:28 -04:00
Anuken
f056edded7 Fixed getting oldest version instead of latest one 2018-03-13 14:30:46 -04:00
Anuken
ea9b3cc7dd Fixed some minor bugs with teleporters an changelog 2018-03-13 13:40:57 -04:00
Anuken
8fffc1cf9c Fixed misaligned desktop placing and breaking 2018-03-13 11:44:22 -04:00
Anuken
539971b5a0 Changed oil extractor sprite 2018-03-13 11:38:56 -04:00
Anuken
2a0d3b05d3 Added oil extractor 2018-03-13 01:16:15 -04:00
Anuken
d1b51844e4 Changed laser transitions and effects 2018-03-13 00:16:40 -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
a0f85a8e4b Updated uCore/crash fix 2018-03-11 10:08:13 -04:00
Anuken
9674ca5e87 Fixed some problems with Generators 2018-03-11 10:07:12 -04:00
Anuken
5834dc9b2e Improved laser visuals 2018-03-11 09:46:57 -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
Anuken
bf6e33791d Added sorted unloader and new block group system 2018-03-10 15:22:34 -05:00
Anuken
c9342d60d7 Fixed invalid FR bundle format 2018-03-10 14:03:23 -05:00
Anuken
6a11f0dd8d Fixed improper drill time display 2018-03-10 13:30:33 -05:00
Anuken
3fa9d5ed10 Updated FR bundle 2018-03-10 12:14:10 -05:00
Anuken
83452b1e36 Fixed many crashes, refactored block bars 2018-03-10 12:13:42 -05:00
Anuken
d88a908e29 Changed plasma drill stats 2018-03-09 23:08:27 -05:00
Anuken
9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
 2018-03-09 20:58:21 -05:00
Anuken
89ca9ad213 Added generic drill class, cleanup of other subclasses 2018-03-09 20:57:12 -05:00
Anuken
0310614392 Formatting 2018-03-09 19:32:33 -05:00
Anuken
460496339b Un-broke multiblock breaking, tweaked build script 2018-03-09 17:51:01 -05:00
Anuken
1c8b451ec8 Updated buildscript 2018-03-09 17:17:01 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken
c46f1ec590 Added LiquidDrill 2018-03-09 10:09:32 -05:00
Anuken
1d83e94ad6 Changed android UUID flow, again 2018-03-08 22:36:22 -05:00
Anuken
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
Anuken
7d8b0f9941 Version modification 2018-03-08 22:32:34 -05:00
Anuken
2a306d70be Fixed invalid web servers, teleporter clearing, desktop input misplace 2018-03-08 21:56:20 -05:00
Anuken
b0086082d0 Fixed server crashes, android client error, ping system rewrite 2018-03-08 18:59:11 -05:00
Anuken
d3313d6438 Fixed outstanding block type crashes 2018-03-08 16:59:39 -05:00
Anuken
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
Anuken
a7096720d6 Updated uCore 2018-03-07 16:22:04 -05:00
Anuken
4be5752b69 Version update 2018-03-07 15:26:28 -05:00
Anuken
7425b5e367 Fixed bullets being able to hit their own players 2018-03-07 00:08:24 -05:00
Anuken
565c3ed12f Updated to build 32, UI layout fixes 2018-03-07 00:04:37 -05:00
Anuken
594c49ac91 Fixed server freezing on dispose(), socket in use exception 2018-03-06 23:34:33 -05:00
Anuken
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
Anuken
cd038ba5ad Fixed label font contamination 2018-03-06 22:28:54 -05:00
Anuken
049cfa06c8 Changed system for UUID retrieval (desktop) 2018-03-06 22:25:48 -05:00
Anuken
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken
1e456d6560 Changed biomatter extractor texture 2018-03-06 17:46:24 -05:00
Anuken
6a564f6693 Fixed some generator bugs, implemented laser drill properly 2018-03-05 23:26:53 -05:00
Anuken
45a3be7642 Refactoring of generators, added solar panel, power drills 2018-03-05 22:12:33 -05:00
Anuken
a25b6a9952 Added biomatter extractor, sulfuric acid 2018-03-05 16:38:13 -05:00
Anuken
25063ed1f0 Added new turret sprites 2018-03-05 14:10:52 -05:00
Anuken
292dbf101b More reorganization, implemented multiblock drills, API changes 2018-03-04 22:00:32 -05:00
Anuken
099d88ba7b Retexturing, changed mega repair turret size 2018-03-04 16:29:54 -05:00
Anuken
992fcc73b8 Added liquid tunnel recipe, fixed crashes/bugs 2018-03-04 00:17:30 -05:00
Anuken
9b3c9aaea2 Storage blocks, organized sprites, liquid tunnel implementation 2018-03-03 23:46:51 -05:00
Anuken
41e4f87e06 Merge fixes 2018-03-03 18:08:35 -05:00
Anuken
6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
 2018-03-03 18:06:57 -05:00
Anuken
70b104c936 Cleanup of Tile 2018-03-03 18:03:15 -05:00
Anuken
3653135bb0 Fixed bugs with web version connections 2018-03-03 17:43:50 -05:00
Anuken
8c53cf4150 Updated to build 30 2018-03-03 11:48:30 -05:00
Anuken
2a41453bc8 Crash fixes 2018-03-03 11:31:17 -05:00
Anuken
ba46dacfdc Removed servtesting code 2018-03-03 10:44:32 -05:00
Anuken
2122d04f78 Completely new continuous collision system to prevent piercing 2018-03-03 01:14:14 -05:00
Anuken
94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken
e37cdf6040 Updated uCore 2018-03-02 09:11:02 -05:00