Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,402 Commits 4 Branches 180 Tags
16358dbd6a57fdac0df7bf9a99b6a3c20f309f81
Commit Graph
591 Commits
Author SHA1 Message Date
Anuken f3b2e4498d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-10 14:36:45 -05:00
LawrenceLin2333andGitHub 68f8668162 Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -05:00
Anuken 07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken 09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Anuken 6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken 240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken 18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken ebf3e0fbd1 Cloud fix 2021-10-31 15:05:03 -04:00
Anuken a511e50a7b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-31 13:33:46 -04:00
Anuken f1d1f935fb Fixed #6264 2021-10-29 22:36:24 -04:00
Anuken c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
Anuken a4339b8b2b I should really rebind my aseprite zoom hotkeys 2021-10-27 10:24:13 -04:00
Anuken 7843785182 Comment 2021-10-27 09:34:38 -04:00
Anuken 705c85281c the vent 2021-10-26 20:34:45 -04:00
Anuken 860e4a2999 Clamp pixelator FBO size 2021-10-26 09:52:02 -04:00
Anuken aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken 693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken 88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
Anuken 009eea1988 Cloud rendering overlap fix 2021-10-22 17:47:17 -04:00
Anuken 677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
Anuken 9416f137cb bugfixes 2021-10-20 11:01:47 -04:00
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken 19b881561f slurp 2021-10-05 21:46:41 -04:00
Anuken 5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
TranquillyUnpleasantandGitHub dbd31b9031 Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
Anuken 29242249bd Fixed #6039 2021-09-23 19:44:42 -04:00
Anuken e57087e891 Better payload construct/deconstruct effects 2021-09-20 10:09:00 -04:00
Anuken bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Anuken cc0cdeb6c0 Use Unit icon() for minimap icons 2021-09-19 09:29:32 -04:00
Anuken 58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Anuken e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Anuken ed911d87a3 Planet rendering refactoring 2021-09-16 14:18:17 -04:00
Anuken ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Anuken 4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken dedfd8efd3 Cloud improvements 2021-09-05 11:10:36 -04:00
Anuken 9feedabf07 Serpulo clouds, now with 2 layers 2021-09-05 01:18:50 -04:00
Anuken ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken e958cce816 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/Planet.java
 2021-09-04 23:29:02 -04:00
Anuken 82e659dd80 Planet rendering infrastructure stuff 2021-09-04 23:28:15 -04:00
Anuken dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Matthew PengandGitHub 71f064bda1 Shouldn't shorten() also reset the counter? (#5890) 2021-08-29 08:28:38 -04:00
Anuken 259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken b2aaca45d5 progress 2021-08-21 18:35:27 -04:00
Anuken 5ddb22ab61 Various minor tweaks 2021-08-20 00:05:08 -04:00
Anuken 946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken 0ab5f5bb14 hide hidden units in menu 2021-08-19 21:29:50 -04:00
Anuken f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken 8e179552ec pointless casts begone 2021-08-17 21:45:13 -04:00
Anuken c2fcffb0d8 Planet frustum culling 2021-08-13 23:49:47 -04:00