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

1517 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
Matthew Peng
51730556a5 Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
JrTRinny
c96b723aaa more delectable selection pane (#6318) 2021-11-08 18:12:23 -05:00
Anuken
8964caf2aa Conduit bridge fixes 2021-11-08 16:09:43 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Matthew Peng
1dd0f67daf recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -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
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -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
Anuken
9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Anuken
c43ca32b7d cleanup 2021-11-04 19:33:38 -04:00
Anuken
3a70a26b93 Fixed 'spark' name conflict 2021-11-04 16:20:39 -04:00
Anuken
240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Matthew Peng
7884bbd299 stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -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
00f03d793f Bugfixes 2021-11-02 12:52:59 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken
cffd355045 BuildTurret save queue 2021-11-02 00:37:14 -04:00
Anuken
c4dc7e91f3 Merge remote-tracking branch 'origin/master' 2021-11-02 00:24:33 -04:00
Anuken
48b9bbc317 Less thruster rotation 2021-11-02 00:24:28 -04:00
Anuken
f108791379 BuildTurret AI, efficiency 2021-11-02 00:23:32 -04:00
Anuken
6fb2b3e920 WIP build tower 2021-11-02 00:13:25 -04:00
Anuken
00bea730e0 Cleanup 2021-11-01 21:18:00 -04:00
hortiSquash
134ef9e00e hortiloaders hotfix randomness (#6283) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-01 17:34:40 -04:00
Anuken
f5c09845ae Fixed #6282 2021-11-01 15:29:07 -04:00
Anuken
8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -04:00
Anuken
5e249e50dd Beam tower 2021-11-01 11:46:32 -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
Anuken
e36c66c87b Duct router/sorter combo 2021-10-31 10:58:14 -04:00
Anuken
64a6f10338 Misc polish 2021-10-30 19:01:47 -04:00
Anuken
87a8453871 Beam node balance 2021-10-30 15:15:06 -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
26045904f4 Fixed #6259 2021-10-29 11:29:38 -04:00
Anuken
e16384adb3 Fixed #6259 2021-10-29 11:29:05 -04:00
Anuken
fc900bec58 Merge remote-tracking branch 'origin/master' 2021-10-28 22:27:26 -04:00
Anuken
850a3cfb4e Fixed #6256 2021-10-28 22:27:22 -04:00
Anuken
58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
hortiSquash
10f2a7b59c hortiloader hotfix (#6248) 
Added an offset so they cycle through all buildings having the same load
 2021-10-28 10:01:05 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Anuken
705c85281c the vent 2021-10-26 20:34:45 -04:00