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

1451 Commits

Author SHA1 Message Date
Anuken
67f8cffca0 Liquid total bugfixes 2021-11-16 11:02:42 -05:00
Anuken
eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken
9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Matthew Peng
4a7774fe5a Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
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
MrDuck557
1c4e6b77b4 DestroyBullet (#6311) 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-09 18:10:28 -05:00
Matthew Peng
fff7283568 Pointless if (#6310) 2021-11-06 21:12:38 -04:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Matthew Peng
996193ea69 payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
b418afed63 Added WorldLabel entity for better server-side labels 2021-11-02 10:03:44 -04:00
Anuken
99d30b6351 Fixed #6287 2021-11-02 09:04:37 -04:00
Anuken
6fb2b3e920 WIP build tower 2021-11-02 00:13:25 -04:00
Anuken
72e3461745 indent 2021-11-01 15:15:13 -04:00
Anuken
8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -04:00
Anuken
779bab0344 Merge remote-tracking branch 'origin/master' 2021-11-01 09:41:39 -04:00
Anuken
0639e3eedb Power pickup bugfixes 2021-11-01 09:41:33 -04:00
Matthew Peng
223fb8d6f5 Basic unitsorts for hjson (#6280) 
* Create some basic unitSorts

* Set as defaults

* add to ContentParser
 2021-10-31 21:30:35 -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
Matthew Peng
4999c25723 Homing on healing bullets does not take collided into account (#6276) 2021-10-31 13:03:19 -04:00
Anuken
a3f4dc7d1d Fixed #6272 2021-10-30 21:02:45 -04:00
Anuken
f1d1f935fb Fixed #6264 2021-10-29 22:36:24 -04:00
Anuken
828464a449 Why was this false 2021-10-29 20:16:37 -04:00
Anuken
26045904f4 Fixed #6259 2021-10-29 11:29:38 -04:00
Anuken
e16384adb3 Fixed #6259 2021-10-29 11:29:05 -04:00
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken
085a974350 Cleanup 2021-10-20 14:34:27 -04:00
Anuken
4436a5ced9 An experiment 2021-10-20 14:30:06 -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
Anuken
2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -04:00
Anuken
f31759bb96 Update/draw payload buildings (broken) 2021-10-18 11:37:26 -04:00
Anuken
c6f6b8e46e Fixed legged units using wrong pathfinder 2021-10-18 09:58:01 -04:00
Anuken
324e5151aa Block cleanup 2021-10-17 22:40:21 -04:00
Anuken
ba91fb8eb7 Bugfixes 2021-10-17 15:14:19 -04:00
Matthew Peng
7ff9ad7351 Move payload blend check to BuildingComp (#6152) 2021-10-16 09:49:52 -04:00
Anuken
a04e8f87a9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 17:10:30 -04:00
Anuken
7a94af5e82 drag multiplier 2021-10-15 17:10:24 -04:00
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -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
816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Ilya246
095cc27ea6 Add shootOnDeath to weapons (#6149) 
* Update Weapon.java

* Add files via upload
 2021-10-14 09:50:57 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00