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

138 Commits

Author SHA1 Message Date
Anuken
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
Anuken
41b669d6e1 Unit assembly system progress 2021-12-18 11:50:21 -05:00
Anuken
00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
Matthew (or Maya) Peng
339d87ad78 Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4 remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
Anuken
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
Anuken
3f503a7f4d Bugfixes 2021-12-01 13:50:08 -05:00
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
Anuken
9b291a366a Fixed cyanogen color / Fixed liquid display negative values 2021-11-25 12:31:53 -05:00
Anuken
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken
eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken
7acf53c509 multi-liquids consumers 2021-11-14 23:30:58 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
MrDuck557
f2ce32cbb2 LogicDisable (#6191) 
* LogicDisable

* I have read CONTRIBUTING.md

I forgot one space

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-10-18 20:17:57 -04:00
Anuken
176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken
0331d8c6c4 Fixed #5937 2021-09-04 20:37:26 -04:00
Anuken
f0a8c6e281 Oyxgen env 2021-08-20 10:06:16 -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
d3a15fba96 Filter locked items from stat values 2021-08-10 21:47:28 -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
f8c7739d5a Removed unitModifier flag 2021-07-25 17:17:07 -04:00
Anuken
7a1f332731 Ammo system redesign 2021-07-25 17:15:39 -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
buthed010203
1c22e2ed28 Update StatValues.java (#5629) 
Why is this number 0? The default amount should be 1, the timeperiod is already set to 0 everywhere anyways.
 2021-07-21 15:50:35 -04:00
Anuken
4c51519b8a #4886 2021-07-20 13:59:19 -04:00
Anuken
4ffcf252b7 Fixed bullet heal percent being displayed as 0 when <1 2021-07-18 12:48:57 -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
8041c305ad Misc bugfixes 2021-07-13 10:28:35 -04:00
Anuken
5ceb8e2b48 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-07-09 19:48:35 -04:00
Patrick 'Quezler' Mounier
2167a3d7fe Remove double space (#5551) 2021-07-08 09:32:53 -04:00
Anuken
64ab8328b8 WallCrafter progress 2021-07-07 16:28:33 -04:00
Anuken
ec59cb602c Crash fix / tilesSecond speed unit 2021-07-01 11:17:42 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
41082e9429 Fixed #5371 2021-06-05 16:55:15 -04:00
genNAowl
9f087214a1 Just a Few Small Changes to Status Effect Stat Displays (#5361) 
* Messing Around with Status Effect Stats

* Longer, but cleaner and less buggy

Co-authored-by: Leonwang4234 <leonwang4234@gmail.com>
 2021-06-05 09:01:38 -04:00
genNAowl
b8daa422ee I Like Stats (#5347) 
Co-authored-by: Leonwang4234 <leonwang4234@gmail.com>
 2021-06-04 08:31:33 -04:00
Anuken
ac20b17e0b Mod bugfixes 2021-06-03 13:58:56 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
MrDuck557
39d725d5ff Healing Status Effect Stat (#5304) 
* Up

* Ground

* Healing

Very tiny change
 2021-05-27 23:23:53 -04:00
MEEP of Faith
7a0e772a05 Remove space between damage and /sec (#5024) 2021-03-30 10:22:08 -04:00
MEEP of Faith
1ecc49f9b7 Use continuous damage (#4966) 2021-03-20 08:38:17 -04:00