Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,197 Commits 4 Branches 180 Tags
1f4372ebc7aa84e12983d0bc7c80e413bb2ffebb
Commit Graph

566 Commits

Author SHA1 Message Date
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 Peng
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
Anuken
2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken
5e5df8848d Ammo rebalancing / Possible crash fix 2021-08-11 09:27:06 -04:00
Anuken
e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Matthew Peng
6246a1d39c Option to make a unit not appear on the title screen. (#5728) 2021-08-09 18:04:21 -04:00
Anuken
c60f6d155f Fixed #5725 2021-08-09 11:41:39 -04:00
Anuken
42486cd784 Fixed export/import lines curving through planet 2021-08-09 09:59:49 -04:00
Anuken
4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken
6fdbe1d5f0 Fixed minimap not updating when build team changes 2021-08-05 14:20:23 -04:00
Anuken
fa0f161106 Minor swarmer range buff 2021-07-28 17:08:48 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken
f8ddf952ca Improved coal centrifuge update effect 2021-07-20 15:22:57 -04:00
MEEP of Faith
7656aedb6b Drawf.Laser with different ends (#5301) 
* Laser with different ends

* Allow usage of different ended TractorBeamTurret lasers

* oops

* aaaa

* too. many. commits.

* Remove rotation

* I shouldn't be allowed to edit from the browser.
 2021-07-20 11:22:17 -04:00
Anuken
6b7a63aba5 Cleanup 2021-07-19 15:20:53 -04:00
Sunny Kim
2583541c0f spinSprite 2021-07-19 16:36:58 +09:00
Anuken
ebf0c71db6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
 2021-07-04 09:52:57 -04:00
Anuken
9c29706297 Only draw status for player's team blocks 2021-06-30 19:09:48 -04:00
Anuken
3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-28 18:57:27 -04:00
Anuken
17eee61a93 Fixed #5478 2021-06-26 09:34:25 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken
8f6365015a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-18 18:40:02 -04:00
Anuken
12dfd71345 Minor load markup fix 2021-06-18 15:44:35 -04:00
Anuken
7ab0c86978 Stencil buffer fallback 2021-06-18 15:14:08 -04:00
Anuken
afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
 2021-06-17 10:44:51 -04:00