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

4916 Commits

Author SHA1 Message Date
Anuken
9416f137cb bugfixes 2021-10-20 11:01:47 -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
a21f6d335f Fixed incorrect waves on serpulo sectors 2021-10-19 18:18:58 -04:00
Anuken
2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -04:00
buthed010203
52238e3aa4 Remove redundant cast (#6193) 
* Remove redundant cast

* dumb
 2021-10-18 21:57:05 -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
7dc492892e Fixed #6190 2021-10-18 16:28:52 -04:00
Anuken
4e92aa2000 Turret payload shoot fix 2021-10-18 11:48:44 -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
af3467035b Building tile referernce cleanup 2021-10-17 19:55:37 -04:00
Anuken
0acd339e33 Payload loader crash fix 2021-10-17 16:46:39 -04:00
Anuken
9cb8c6d83d Added liquid container to tech tree 2021-10-17 15:30:52 -04:00
Anuken
994f6f7e84 Redundant codegen cleanup 2021-10-17 15:21:41 -04:00
Anuken
ba91fb8eb7 Bugfixes 2021-10-17 15:14:19 -04:00
Anuken
e6d7330f6e Fixed #6182 2021-10-17 15:01:29 -04:00
Anuken
be1561b0cb Don't allow constructing banned blocks 2021-10-16 23:17:54 -04:00
Anuken
b271f5b630 Fixed #6174 2021-10-16 23:06:07 -04:00
Anuken
d5a2f13442 Payload loader tweaks 2021-10-16 22:33:17 -04:00
Anuken
f03d3d89f3 Fixed large units fitting into deconstructors 2021-10-16 18:43:43 -04:00
Anuken
717a620ff4 Unpause game in logic variable dialog if necessary 2021-10-16 14:51:53 -04:00
Anuken
290450de5b Fixed deconstructor not accepting direct unit payloads 2021-10-16 13:01:03 -04:00
Anuken
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Anuken
f43e308dad Merge remote-tracking branch 'origin/master' 2021-10-16 10:22:24 -04:00
Anuken
bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Matthew Peng
7ff9ad7351 Move payload blend check to BuildingComp (#6152) 2021-10-16 09:49:52 -04:00
Anuken
902f3695ee amend 2021-10-16 09:03:21 -04:00
Anuken
d5e239c610 Fixed #6168 2021-10-16 09:02:40 -04:00
Anuken
36064c63e3 Fixed #6166 2021-10-15 22:26:52 -04:00
Anuken
733e0e86f9 Fixed #6166 2021-10-15 22:26:25 -04:00
Anuken
4a979058c2 Crawler shootOnDeath 2021-10-15 21:40:09 -04:00
Anuken
c3c3c2b522 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 18:53:37 -04:00
Anuken
956cbe792b Fixed #6164 2021-10-15 18:48:59 -04:00
Anuken
73dae0da47 compile fix 2021-10-15 18:46:11 -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
e9e5fea306 Merge remote-tracking branch 'origin/master' 2021-10-15 17:04:39 -04:00
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
buthed010203
b66eb173d8 Consistency (#6163) 
* Consistency

Why is this inconsistent with the portion just above it?

* C o n s i s t e n t
 2021-10-15 16:07:15 -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
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
Anuken
d8cf65e24c More permissive json type re-declarations 2021-10-14 21:59:02 -04:00
Anuken
3de9cfa1d7 Don't crash on invalid research 2021-10-14 21:26:34 -04:00
Anuken
df156444e7 Prioritize mod content in parser 2021-10-14 21:24:19 -04:00
Anuken
8a3dd53aa2 ClassMap regen 2021-10-14 21:01:20 -04:00
Anuken
56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ef399d349c # Conflicts: 
#	core/src/mindustry/content/Blocks.java
 2021-10-14 19:17:50 -04:00