Commit Graph

10480 Commits

Author SHA1 Message Date
Anuken
df6ff248a4 Merge branch 'master' of https://github.com/Anuken/Mindustry into map_4 2022-09-29 17:13:49 -04:00
Anuken
4f9fe2a36f Misc tweaks 2022-09-28 22:58:06 -04:00
Anuken
e9df883e10 Further RTS tweaks 2022-09-28 21:29:28 -04:00
Anuken
7557a57266 Experimental changes to make RTS AI "smarter" 2022-09-28 21:07:04 -04:00
Anuken
85228bad0a Merge branch 'master' of https://github.com/Anuken/Mindustry into map_4 2022-09-28 19:11:10 -04:00
Anuken
713119fb29 Map limit visuals fix 2022-09-28 19:11:02 -04:00
Anuken
b1fd87adbd Fixed #7634 2022-09-28 17:00:02 -04:00
Epowerj
a4d342c397 Added stronghold to campaign, tweaked tech tree 2022-09-28 16:54:46 -04:00
Anuken
01813c4339 Made 2x2+ liquid tanks solid again 2022-09-27 17:34:05 -04:00
Anuken
5a79960ce0 Minor changes to disassembler/separator sprites 2022-09-27 14:57:53 -04:00
Anuken
d741485d35 Comment unnecessary 2022-09-27 12:30:17 -04:00
Anuken
b873392309 Misc block rendering cleanup 2022-09-27 12:29:27 -04:00
Anuken
48a5ae443f Fixed #7633 2022-09-27 11:57:11 -04:00
Anuken
e21cac75b5 Disable RTS AI for naval units 2022-09-26 21:22:03 -04:00
Anuken
84f2b68387 Crash fix 2022-09-26 19:27:39 -04:00
Anuken
b993f150fb Fixed controller hit not registering splash damage 2022-09-26 19:17:18 -04:00
Anuken
159f335f64 Fixed some RTS AI perf issues 2022-09-26 13:51:40 -04:00
Anuken
b48c78a50a Merge remote-tracking branch 'origin/master' 2022-09-26 10:56:15 -04:00
Anuken
dec2642434 Fixed #7628 2022-09-26 10:56:10 -04:00
Даркнесс#3729
04a75d14b1 remove enabled() check in getMod() method (#7625) 2022-09-25 13:26:17 -04:00
Anuken
edaa0652bd Merge remote-tracking branch 'origin/master' 2022-09-25 07:11:26 -04:00
Anuken
4735e28aad Fixed #7622 2022-09-25 07:11:21 -04:00
null
fd0d4fb097 why is this hardcoded anyway (#7617) 2022-09-24 07:49:54 -04:00
Anuken
b26f7625d8 Cleanup 2022-09-23 16:24:51 -04:00
hortiSquash
1d971231ca Support of mods with textures in different resolution (HD or low-res) (#7602)
* HDustry - scl() & private map

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

* MEEP stop doing stuff when i work

<3 <3

* Replaced Draw.scl

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2022-09-23 16:21:53 -04:00
Anuken
8b9cbc2c7c BuildVisibility non-enum / Canvas is now shown 2022-09-23 12:27:44 -04:00
Anuken
710fd3484f Fixed #7607 2022-09-22 09:32:08 -04:00
Anuken
e56f207160 Moved logo back over menu 2022-09-21 12:42:10 -04:00
Anuken
4c8c0efd0c Made Corvus/Vela no longer stop to shoot with command AI 2022-09-20 22:51:38 -04:00
Anuken
9b7ac713ee DefenderAI tweaks 2022-09-20 21:54:57 -04:00
Anuken
7f5095921a Mod pregenerated meta option 2022-09-20 21:50:44 -04:00
Anuken
ac93539a5c Merge remote-tracking branch 'origin/master' 2022-09-20 15:27:17 -04:00
Anuken
7aaf5e477b Fixed treads on modded units 2022-09-20 15:27:11 -04:00
Mnemotechnican
10d989fbc2 Support for custom menu buttons (#7595)
* added support for custom main menu buttons

* layout fix

* ...and yet another fix

* removed another unneccesary table, which was causing issues

* actually, it looks better with even and odd buttons swapped

* made the container a scroll pane, needs some testing...

* this seems to work correctly

* render the logo under the menu buttons

* rename Buttoni to MenuButton
2022-09-20 11:25:56 -04:00
MEEPofFaith
a8bed595c3 Fix Variable Reactor power output (#7600) 2022-09-20 08:43:05 -04:00
Anuken
3eb6061358 Slightly better planet icon 2022-09-19 11:37:47 -04:00
Anuken
e4fe0c24c1 Merge remote-tracking branch 'origin/master' 2022-09-18 23:33:57 -04:00
Anuken
cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
Mythril382
991d98b718 add a display field to weapons just like abilities (#7591)
* weapo

* that
2022-09-18 07:50:27 -04:00
buthed010203
d66a3b80ae Fix javaPath not looking for .exe (#7590)
I never tested this on windows and finally decided to get to the bottom of all the weird reports ive been getting
2022-09-17 22:37:00 -04:00
Anuken
c46c99bb08 Fixed #7589 2022-09-17 22:36:40 -04:00
MEEPofFaith
9d6b08a15d Hide Items on Planets Field (#7550)
* Hide item on planet field

* Better name, Planet[] instead of String[]

* a
2022-09-16 12:20:43 -04:00
Anuken
bdf3bea2a4 Tantros is hidden now 2022-09-16 11:22:47 -04:00
Anuken
942a3796d7 Hide missiles on minimap 2022-09-16 08:59:28 -04:00
Anuken
a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Anuken
ad858c74ad Merge remote-tracking branch 'origin/master' 2022-09-14 19:39:14 -04:00
Anuken
bbb612d3cc Added missing Erekir tech to tree 2022-09-14 19:39:09 -04:00
Даркнесс#3729
8a50aa931b Why it uses name instead of id? (#7562) 2022-09-14 18:26:15 -04:00
MEEPofFaith
918eb1bafe Fix ContinuousLiquidTurret not changing bullets when changing liquids. (#7561)
* Wrong liquid, don't keep bullet alive.

* Better transition

* Annihilate unnecessary code duplication

* Further reduce duplicated code

* Unnecessary imports
2022-09-14 10:50:23 -04:00
Anuken
38d96a26f3 Random attempts to fix Android game freeze 2022-09-14 10:28:18 -04:00