Commit Graph

15558 Commits

Author SHA1 Message Date
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
Epowerj
45ac8a1bca Merge remote-tracking branch 'origin/map_4' into map_4 2022-09-28 19:18:13 -04:00
Epowerj
9f6602c0ba Fixed issues with stronghold 2022-09-28 19:18:08 -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
248b622d00 Merge remote-tracking branch 'origin/map_4' into map_4 2022-09-28 16:55:10 -04:00
Epowerj
a4d342c397 Added stronghold to campaign, tweaked tech tree 2022-09-28 16:54:46 -04:00
Github Actions
9c97bbaa1c Automatic bundle update 2022-09-28 19:09:09 +00:00
Epowerj
c7dfa4a824 Added bundled objective text for stronghold 2022-09-28 15:07:48 -04:00
Epowerj
a574805bce Progress on stronghold 2022-09-27 23:57:06 -04:00
Epowerj
bc1b2e8277 Progress on stronghold 2022-09-27 23:16:24 -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
f7a34cfa46 Merge remote-tracking branch 'origin/master' 2022-09-27 11:57:15 -04:00
Anuken
48a5ae443f Fixed #7633 2022-09-27 11:57:11 -04:00
Alex
a68c17d876
GitHub Workflows security hardening (#7629)
* build: harden push.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>

* build: harden deployment.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>

* build: harden pr.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>

Signed-off-by: Alex <aleksandrosansan@gmail.com>
2022-09-27 08:10:18 -04:00
Anuken
e21cac75b5 Disable RTS AI for naval units 2022-09-26 21:22:03 -04:00
Anuken
5d4015387e Mark RTS AI rule as unfinished/buggy 2022-09-26 20:57:48 -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
Epowerj
cc5f8fed50 Progress on stronghold 2022-09-26 18:40:19 -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
Joan Josep
52759faa5d
Update bundle_ca.properties (#7623) 2022-09-25 07:13:36 -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
Epowerj
29974ace55 Progress on stronghold 2022-09-24 19:50:01 -04:00
Klomertza
a9334bcc65
Update servers_v7.json (#7619)
Added my Server
2022-09-24 19:26:33 -04:00
Brandons404
e1757b3539
Update servers_v7.json (#7620) 2022-09-24 19:25:08 -04:00
Epowerj
e4f83216f8 Progress on stronghold 2022-09-24 19:15:08 -04:00
RTOmega
a966fb0882
OmegaHub dns change (#7618)
* Update servers_v7.json

* Update servers_v6.json

* Update servers_v7.json
2022-09-24 09:38:34 -04:00
Joel
c456970d4d
fix json syntax errors and omnidustry hub being in servers_v6.json when it is v7 (#7615)
* fix: json syntax errors

* fix: omnidustry hub is v7, not v6
2022-09-24 07:50:21 -04:00
null
fd0d4fb097
why is this hardcoded anyway (#7617) 2022-09-24 07:49:54 -04:00
Epowerj
232784a4ff Progress on stronghold 2022-09-24 00:35:07 -04:00
GTMZ
c818611bb4
add one ip address! (#7611) 2022-09-23 19:55:38 -04:00
Anuken
5e734dfd59 arc 2022-09-23 19:55:16 -04:00
Anuken
c6cefb0420 literally nothing 2022-09-23 16:48:11 -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
0e9e3de11f Merge remote-tracking branch 'origin/master' 2022-09-23 12:27:49 -04:00
Anuken
8b9cbc2c7c BuildVisibility non-enum / Canvas is now shown 2022-09-23 12:27:44 -04:00
Tomoko
e1b8931d63
Update servers_v7.json (#7609)
* Update servers_v7.json

* Update servers_v7.json
2022-09-22 17:54:45 -04:00
Rex Aliis
3874d2c7a1
Update servers_v6.json & servers_v7.json (#7605)
* Update servers_v6.json

* Update servers_v7.json
2022-09-22 12:27:54 -04:00