Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,340 Commits 4 Branches 180 Tags
502816d210334c13b41c6d0fa9cbaa932b6d46cd
Commit Graph

466 Commits

Author SHA1 Message Date
Anuken
1d46fb5425 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-22 09:52:19 -04:00
JrTRinny
7773a3b17b let payload source/void replace each other (#5835) 2021-08-22 09:45:05 -04:00
Anuken
e5c77ef69a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-20 11:10:55 -04:00
Anuken
465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -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
4fc18d35ce #5742 2021-08-11 16:42:25 -04:00
Anuken
c2720bbc33 Increased PPT range 2021-08-11 11:36:20 -04:00
Anuken
ec89db7cb1 Things 2021-08-11 09:54:30 -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
Anuken
be38bba0e4 #5729 2021-08-10 10:16:15 -04:00
Anuken
f0a0b4cfc9 Fixed keyDown not registering at low FPS / Spectre bullet balance 2021-08-06 18:01:57 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
ec30232c4e Made AttributeCrafters consume a constant amount of liquid 
+ cultivator water requirement decrease
 2021-08-05 10:27:46 -04:00
Anuken
f820121e08 Sector bugfixes / More sector info 2021-08-03 16:01:27 -04:00
Anuken
f354b6bcca pulverizer drawSpinSprite 2021-07-30 19:43:29 -04:00
Anuken
fa0f161106 Minor swarmer range buff 2021-07-28 17:08:48 -04:00
Anuken
fef8ee925b Potential fix for #5660 2021-07-28 11:51:20 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
1734d02291 Bridge code cleanup 2021-07-25 19:21:13 -04:00
Anuken
7a1f332731 Ammo system redesign 2021-07-25 17:15:39 -04:00
Anuken
0ee137fe05 Added hint & tooltip for derelict structures 2021-07-24 12:48:25 -04:00
Anuken
adbfcdf16a Reverted vault/container health buff due to "damaged" appearance in saves 2021-07-24 09:14:38 -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
f98622fdc9 Class renaming 2021-07-23 13:18:08 -04:00
Anuken
ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken
bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken
d30c32eddc reorganization 2021-07-22 16:52:05 -04:00
Anuken
fcb9ebb8c3 Thermal generator effect tweaks 2021-07-21 09:02:08 -04:00
Anuken
d506685bba Stacked map editor brush slider 2021-07-20 19:56:55 -04:00
Anuken
14e4203ee7 #4912 2021-07-20 17:59:47 -04:00
Anuken
f8ddf952ca Improved coal centrifuge update effect 2021-07-20 15:22:57 -04:00
Anuken
34cf8466d6 Added default value for mass driver bullet 2021-07-19 08:44:19 -04:00
Anuken
4ffcf252b7 Fixed bullet heal percent being displayed as 0 when <1 2021-07-18 12:48:57 -04:00
Anuken
822fe9ab7a Fixed inaccessible gaps in Serpulo generator 2021-07-16 10:05:59 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
 2021-07-15 09:13:35 -04:00
Anuken
dd5389c738 New sound for rock/plant breaking 2021-07-14 17:22:21 -04:00
Anuken
ac25e17286 Unused property cleanup 2021-07-14 16:06:03 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
a0c5ed3761 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-07-08 09:29:36 -04:00
Anuken
64ab8328b8 WallCrafter progress 2021-07-07 16:28:33 -04:00
Anuken
017552f573 Fixed crash caused by invalid NinePatch sprites 2021-07-06 15:23:37 -04:00
Anuken
a7d465439b Decorations no longer depend on color 2021-07-05 09:47:19 -04: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
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
ec59cb602c Crash fix / tilesSecond speed unit 2021-07-01 11:17:42 -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
2eb57ab680 Minor repair turret nerf 2021-06-28 18:57:13 -04:00