Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,071 Commits 4 Branches 180 Tags
aa83510fbefab04fe4404be7ea0e18e59f9de490
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AnukenandGitHub 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 68bfd3017b Updated uCore 2018-04-19 22:02: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 32fb79478c Updated uCore 2018-04-18 21:34:07 -04:00
Anuken d950396f68 Updated DrawLayer 2018-04-18 21:32:06 -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 b020bf6816 Variable name refactorings / Untested entity sleeping 2018-04-17 09:31:41 -04:00
Anuken 47d61c4a0e Changed GridMap usage to IntMap 2018-04-17 09:06:55 -04:00
Anuken 714c5fd784 Added missing synchronized block 2018-04-17 08:59:01 -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 d396149521 Implemented passing of commands as arguments 2018-04-16 20:28:47 -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 e21d92cf4d Changed UUID algorithm on desktop 2018-04-16 09:58:31 -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
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
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 b715e0d34e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-14 20:45:46 -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 cc26e61d7a Updated uCore 2018-04-14 13:50:05 -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 1ff6a7e423 Updated uCore 2018-04-12 17:34:59 -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 bed34c4cad Fixed typo in findip command / Tweaks to kicking criteria 2018-04-11 10:25:59 -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 697e288de2 Fixed 'bans' server crash 2018-04-09 10:24:47 -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 00b78402eb Fixed build errors 2018-04-08 10:48:22 -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 53ca2d0755 Removed extra line of code 2018-04-04 00:04:05 -04:00