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

17337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
9307cd74ef Merge remote-tracking branch 'origin/master' 2023-12-01 13:34:24 -05:00
Anuken
88b10f4cf8 Fixed #9336 2023-12-01 13:34:17 -05:00
Redstonneur1256
af36f5fd6d
Update servers_v7.json (#9333) 2023-11-30 15:56:57 -05:00
Anuken
ed96b2eec8 Simplified JSON music/sound loading 2023-11-30 14:19:30 -05:00
Mythril382
5fe28254e7
Custom Launch Music for Each Planet (#8901) 
* plant

* what

* literal ctrl+c ctrl+v

* more music

* issue

* feedback

* commit return
 2023-11-30 14:16:44 -05:00
NazrinNya
0afed49b7c
IP change of cyandustry (#9312) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2023-11-30 10:17:09 -05:00
alex
0271089211
Update servers_v7.json for alex mindustry (#9330) 2023-11-30 07:18:59 -05:00
MEEPofFaith
9bd494504e
angleOffset is added twice in Weapon shoot (#9332) 2023-11-30 07:18:40 -05:00
abcxyzDustry
871209d880
Update servers_v7.json (#9329) 2023-11-29 19:29:52 -05:00
router
08758ec29c
Clean up 0.baseduser.eu.org (servers_v7.json) (#9328) 2023-11-29 15:01:41 -05:00
router
ada2ee128b
fix typo in russian bundle (#9326) 2023-11-29 07:10:52 +00:00
OSP
45aee7d582
Darkdustry reborn (#9324) 2023-11-28 22:35:49 +00:00
Anuken
f57d6a7ede Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-28 15:02:31 -05:00
Anuken
2ad5e37302 Fixed #9325 2023-11-28 15:00:39 -05:00
ApsZoldat
90e40af8c1 Minor setmarker ui statement fix (farming tiny commits?) 2023-11-28 22:24:48 +03:00
ApsZoldat
20b2be5de8 "i forgor" fix 2023-11-28 22:19:08 +03:00
ApsZoldat
557f2d4447 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-11-28 22:08:33 +03:00
ApsZoldat
02a53daa58 Marker autoscale now works outside of minimap mode, another yet lmarkercontrol instructions cleanup, fix renderer's draw color breaking after drawing markers 2023-11-28 22:00:08 +03:00
Anuken
120860665d Fixed #9322 2023-11-28 05:31:14 -05:00
Arksource (ShardDustry [ES]) Owner
6543c41bde
Agua en HD (#9323) 
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json

* Agua 2-3
 2023-11-28 05:29:04 -05:00
Anuken
1a3824700a Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 20:48:11 -05:00
Anuken
bc308847f4 Clarify that only ASCII is supported 2023-11-27 20:47:24 -05:00
Anuken
e1ffc4ed62 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 20:38:02 -05:00
Anuken
5f06ce0bff Added draw print instruction 2023-11-27 20:37:25 -05:00
Github Actions
8db6ca8b59 Automatic bundle update 2023-11-28 01:35:56 +00:00
The1Crux
0469bb5ce5
Update servers_v7.json (#9321) 
last servers exploded 💀
 2023-11-27 17:40:13 -05:00
ApsZoldat
6ea2188bee Add minimap mode to other objective markers 2023-11-27 22:56:26 +03:00
alex
a0c4b0e431
Update servers_v7.json (#9319) 
add more servers
 2023-11-27 14:06:29 +00:00
Anuken
8bace60059 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-27 06:57:01 -05:00
Anuken
d759e71edc Fixed bombers stopping when patrolling 2023-11-27 06:55:40 -05:00
Anuken
44f7c726b5
Revert #9294 2023-11-27 06:05:57 -05:00
OSP
8d04a6820d
Update servers_v7.json (#9318) 2023-11-27 09:51:47 +00:00
abcxyzDustry
f9d39ad31a
Update servers_v7.json (#9315) 2023-11-25 12:54:05 -05:00
TheRadioactiveBanana
589b8d9d37
Eradication Mindustry Merge (#9310) 
Anuke finally gave the go ahead
 2023-11-24 02:46:19 -05:00
Anuken
fbf8b2bff1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 19:04:19 -05:00
Anuken
130336bff0 arc 2023-11-23 19:04:17 -05:00
Elixias
9af7a864bd
f (#9309) 2023-11-23 23:59:14 +00:00
Anuken
31eee11bf5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 14:25:07 -05:00
Anuken
d2956d1f2c ConnectFilter API now public 2023-11-23 14:24:59 -05:00
karlo292
1feeef7aef
Update servers_v7.json (#9307) 2023-11-23 13:35:26 -05:00
Anuken
f5424ea59b Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 06:29:38 -05:00
Anuken
4076a146b1 Reject invalid tile configs 2023-11-23 06:28:57 -05:00
Hahaa13
f4741e0e59
Back back vndustry (#9297) 
* Update servers_v7.json

* Update servers_v7.json

* Back :))
 2023-11-23 06:25:36 -05:00
Electron
3fcaf8f916
Update servers_v7.json (#9294) 
Co-authored-by: Electron <135461023+Electorn215@users.noreply.github.com>
 2023-11-23 09:59:32 +00:00
abcxyzDustry
726ba2af31
Update servers_v7.json (#9304) 2023-11-22 17:06:05 -05:00
ApsZoldat
aa018b314d World processor markers: remove toggleVisibility, swap makemarker's type and id arguments for instruction consistency 2023-11-22 22:33:05 +03:00
112Hack
8bb6acfacb
Update servers_v7.json (#9303) 2023-11-22 13:24:45 +00:00
Anuken
b189bfdf44 Closes Anuken/Mindustry-Suggestions/issues/4780 (dumping neoplasm from tanks) 2023-11-19 19:09:15 -05:00
Anuken
afc2e15c51 Fixed #9298 2023-11-19 10:55:42 -05:00
Arksource (ShardDustry [ES]) Owner
0787cbbb5f
Agua 3, 20% more water (#9295) 
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json
 2023-11-18 20:54:20 -05:00