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

1691 Commits

Author SHA1 Message Date
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken
553333b656 Beam drill bugfixes 2021-10-23 11:27:25 -04:00
Anuken
88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
hortiSquash
c9eed5a936 horti and the better unloaders (#6201) 
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
 2021-10-22 10:57:16 -04:00
Anuken
5d20f3a89b Merge remote-tracking branch 'origin/master' 2021-10-22 09:04:06 -04:00
Anuken
677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
JrTRinny
f944d3d579 deselectable content selection UI (#6205) 2021-10-21 12:40:34 -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
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
2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -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
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
994f6f7e84 Redundant codegen cleanup 2021-10-17 15:21:41 -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
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
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
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
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -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
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
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken
1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken
f96700320e Removed PayloadLaunchPad 2021-10-13 13:58:47 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Matthew Peng
fdfe381b6e Unhardcode Drill Effect Randomness (#6144) 
* Unhardcode Drill Effect Randomness

* I should start refusing to make prs for people
 2021-10-12 22:32:58 -04:00
Matthew Peng
8c3ecfdb06 Make Burst + Spread Work (#5589) 
* Make Burst + Spread Work

* This is why you use an IDE

* h
 2021-10-12 17:36:59 -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