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

11012 Commits

Author SHA1 Message Date
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
9dfd4d0049 Merge remote-tracking branch 'origin/master' 2021-10-16 13:01:07 -04:00
Anuken
290450de5b Fixed deconstructor not accepting direct unit payloads 2021-10-16 13:01:03 -04:00
Darkness#3729
d970eb45e3 Lol (#6171) 2021-10-16 12:45:16 -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
Sharlotte
06bf2711a4 Update [KO] bundles once again (#6147) 
* Why did you marge this

* Update bundle_ko.properties
 2021-10-16 09:49:58 -04:00
Matthew Peng
7ff9ad7351 Move payload blend check to BuildingComp (#6152) 2021-10-16 09:49:52 -04:00
Yuri Polyakov
91acda56c1 [RU] New blocks translated (#6159) 
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
 2021-10-16 09:49:37 -04:00
JrTRinny
0f29a01292 Update bundle_th.properties (#6162) 2021-10-16 09:46:27 -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
b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -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
Zelaux
dcb84f9faf Made the Menus API less conflicting (#6154) 
* Made the Menus API less conflicting

* Fixed ignoring zero menuId in Menus
 2021-10-14 14:23:12 -04:00
itsragedev
d5babe88e3 Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00
Sunny Kim
ec1124499f Disable sector info for specific sectors (#6151) 
* showSectorLandInfo

* showSectorLandInfo type
 2021-10-14 11:16:36 -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
a2f40a5565 Fixed #6148 2021-10-13 19:35:04 -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
Anuken
d2ec511ede Bundle things 2021-10-13 09:53:52 -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
Anuken
9e01d1a69d Merge remote-tracking branch 'origin/master' 2021-10-12 18:25:43 -04:00