mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,444 Commits 4 Branches 160 Tags 2.3 GiB
9c3ff56508
Commit Graph

17444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HamzaGSopp
4495e85a4d
Update servers_v7.json (#9385) 2023-12-16 20:39:07 -05:00
Anuken
2a6dc573ac Fixed FPS cap changes 2023-12-16 13:10:22 -05:00
NazrinNya
180eb6d1f0
Update servers_v7.json (#9383) 2023-12-16 12:13:09 -05:00
HamzaGSopp
7d3bd7e71b
Update servers_v7.json (#9382) 2023-12-16 09:09:00 -05:00
Anuken
41d19ce0cb Less confusing JITPack hash message 2023-12-16 09:05:30 -05:00
Atomic-Laboratory
332d98148b
Update servers_v7.json (#9381) 2023-12-15 12:21:42 -05:00
ApsZoldat
8ab37c5ce4 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-15 19:39:30 +03:00
ApsZoldat
df8f90a02b Small MapObjectives refactor (removal of duplicating overrided methods) 2023-12-15 19:33:03 +03:00
Anuken
13b78927f4 Merge remote-tracking branch 'origin/master' 2023-12-13 22:37:39 -05:00
Anuken
3a485eb338 Fixed #9379 2023-12-13 22:37:31 -05:00
Estcool9
175153e870
Update servers_v7.json Add My server mindustry est1.be (#9378) 2023-12-13 17:05:15 -05:00
a-big-fish-fish
5d5783bf54
Update servers_v7.json (#9376) 2023-12-13 17:04:17 -05:00
ApsZoldat
317a533b5c millimicronanopico setmarker texture fix (object print consistency) 2023-12-13 18:24:08 +03:00
ApsZoldat
5830259e41 Markers draw code refactor, minor text marker control changes 2023-12-12 22:40:33 +03:00
BalaM314
68b06fdea6
Allow fetching unitCount by type, and buildCount without type (#9374) 
* Allow fetching unitCount by type, and buildCount without type

* show in processor ui
 2023-12-12 08:47:40 -05:00
Gadgetroch
588732c856
Update servers_v7.json (#9367) 
Good morning,

Compared to your recommendations, everything was done except 2 things:
I left the connection/disconnect message because I am logging this in my discord server (protected channel)

I left the maps at default, to see over time.

Thank's
 2023-12-11 07:46:37 -05:00
Anuken
eeefdd8054 Crash fix 2023-12-10 21:55:21 -05:00
Anuken
1eb70404d7 GC retention fixes 2023-12-10 20:01:40 -05:00
Anuken
a0f235b430 Make isSaveValid check backups 2023-12-10 15:48:35 -05:00
ApsZoldat
4802076bf8 WIP marker changes, fix server name not appearing for saved hosts in join dialog 2023-12-10 22:44:30 +03:00
Anuken
3e4b86d095 Clear block config background on rebuild 2023-12-10 09:29:02 -05:00
Anuken
32ca69a96f Merge remote-tracking branch 'origin/master' 2023-12-10 08:32:56 -05:00
Anuken
e494806cc8 Better Flare/Avert targeting / Fixed targets resetting on save load 2023-12-10 08:32:49 -05:00
TheRadioactiveBanana
c02a052b7b
Load Balancing Refactor (#9369) 
- Move off of dumb port scheme that I was too lazy to fix
- 3MIDustry partnership for more servers
- Load balancing because eradication servers have maxed out my two machines (yes, really)
 2023-12-09 20:15:20 -05:00
Anuken
484d89f022 Merge remote-tracking branch 'origin/master' 2023-12-09 12:38:25 -05:00
Anuken
cecd84817c Validate server JSON with org.json as well 2023-12-09 12:38:16 -05:00
3MIDustry
5bc73fafea
Update servers_v7.json (#9362) 
* Update servers_v7.json

We changed our server and ports

* Update servers_v7.json
 2023-12-09 08:39:35 -05:00
abcxyzDustry
ee52588ae7
Update servers_v7.json (#9364) 
vndustry wants to merge into abcxyzdustry
 2023-12-09 08:38:46 -05:00
AwA
f3e351cd9b
Update servers_v7.json (#9365) 
fix a syntax error in line 12
 2023-12-09 08:37:56 -05:00
meiqiu
626edbbf2a
Update servers_v7.json (#9361) 2023-12-08 18:25:22 -05:00
BnDLett
a2a690834d
Add DDNS experimental server to server list (#9360) 
Added DDNS experimental server to the server list under "mindustry.ddns.net".
 2023-12-08 17:03:40 -05:00
Lifeless-Darkness
d15de9f4fc
Update servers_v7.json (#9357) 2023-12-08 07:11:11 -05:00
CamoGekko
dd5dfa6a97
Fixed an error message (#9355) 2023-12-07 12:38:12 -05:00
ApsZoldat
2b0a6a6f97 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-07 18:26:55 +03:00
ApsZoldat
c20684025e Small git shenanigans to actually (i really hope) revert all the bad stuff 2023-12-07 18:24:51 +03:00
Gamer-art9044
ec48733150
Update servers_v7.json (#9352) 
add a STP server to the list
 2023-12-07 07:20:14 -05:00
Anuken
45c21d60bf Merge remote-tracking branch 'origin/master' 2023-12-05 15:43:42 -05:00
Anuken
3232e97d1a Display banned status in Steam lobbies 2023-12-05 15:43:33 -05:00
Github Actions
3aa4da7ebd Automatic bundle update 2023-12-05 20:18:42 +00:00
Anuken
351c2c84f2 Fixed banned Steam users loading indefinitely 2023-12-05 15:17:55 -05:00
Anuken
91cc4f922e steamtest task destination 2023-12-05 13:57:41 -05:00
Anuken
2f9f371c88 ok buthed 2023-12-05 13:55:47 -05:00
Anuken
1df0495a2f Merge remote-tracking branch 'origin/master' 2023-12-05 13:54:54 -05:00
Anuken
b3c26fac05 Fixed Steam kicking 2023-12-05 13:54:47 -05:00
ApsZoldat
adada50f1c Minor map locales dialog fixes 2023-12-04 23:33:23 +03:00
ApsZoldat
cf131696bd Merge remote-tracking branch 'upstream/master' 2023-12-04 22:43:59 +03:00
ApsZoldat
cf02b0f36d Make setmarker ignor null values, remove redundant marker control operations 2023-12-04 22:39:32 +03:00
OSP
5d4d904ef9
Darkdustry reborn. Again. (#9346) 2023-12-04 10:35:37 -05:00
The1Crux
a0dc08aaca
Update servers_v7.json (#9345) 
new slots
 2023-12-04 06:44:17 -05:00
Anuken
fdfb79477b Merge remote-tracking branch 'origin/master' 2023-12-02 20:04:53 -05:00