Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,382 Commits 4 Branches 180 Tags
6a8127e7cdd5c59daa794d9469dac04a1aa26668
Commit Graph
11382 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TranquillyUnpleasantandGitHub 6a8127e7cd un-escape \n for string configs. (#5042) 
Currently it escapes them to a literal text, making multi line messages impossible.
 2021-04-01 09:14:20 -04:00
Anuken 1bd4c96ee8 Power node placement fixes 2021-03-31 22:36:46 -04:00
Anuken d66d7e09e3 Explosion damage tweaks 2021-03-31 13:28:08 -04:00
Anuken e85e43c162 Disable blending when drawing displays 2021-03-31 11:18:17 -04:00
Anuken dee020bd71 Merge remote-tracking branch 'origin/master' 2021-03-31 09:52:35 -04:00
Anuken d548a11c60 Skip invalid lobbies 2021-03-31 09:52:31 -04:00
RebornTrack970andGitHub 59bf2e3571 Updated Server Omega (#5031) 
Moved Expansion and fixed immesureable ping.
 2021-03-31 09:46:14 -04:00
Anuken 6ebabbb56a Fixed local games sometimes not being found on Steam 2021-03-31 09:42:44 -04:00
Anuken 179cedd6cc Merge remote-tracking branch 'origin/master' 2021-03-30 20:58:20 -04:00
Anuken 3b56f36bbd Fixed #5029 2021-03-30 20:58:13 -04:00
buthed010203andGitHub be0765f5ea Radar shouldn't sense derelict as enemies (#5027) 
Turrets no longer shoot derelict units by default, they shouldn't be sensed as enemies if this is the case.
 2021-03-30 11:58:53 -04:00
Anuken 1715741e37 arc 2021-03-30 11:06:39 -04:00
Anuken aaa41fbf72 copyNatives before iOS copyAssets 2021-03-30 10:42:51 -04:00
Anuken 2096d006be Merge remote-tracking branch 'origin/master' 2021-03-30 10:24:57 -04:00
Anuken e455f7d170 Fixed #5025 2021-03-30 10:24:53 -04:00
MEEP of FaithandGitHub 7a0e772a05 Remove space between damage and /sec (#5024) 2021-03-30 10:22:08 -04:00
AnukenandGitHub 7f3b8f7e56 jitpack is dead 2021-03-29 20:35:07 -04:00
Anuken 5a493ebf0e arc 2021-03-29 19:05:55 -04:00
Anuken 70bcb0a940 copyNatives task for iOS 2021-03-29 18:33:03 -04:00
Anuken 3105478328 Merge remote-tracking branch 'origin/master' 2021-03-29 15:06:21 -04:00
Anuken ae8833e679 Fixed rare schematic crash 2021-03-29 15:06:06 -04:00
OSPandGitHub afbac48a45 Change ip hub (#5014) 
transition to new hosting
v126.2 		2021-03-29 09:38:56 -04:00
Anuken 4a9eeeeac3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-03-28 19:56:20 -04:00
liuxiluandGitHub e7d9cddbae update zh-CN for logic hints (#4655) 
* add new logic hints to zh-CN

* logic hints for zh-CN completed

* more hints and fix

* draw operations

* update command hint

* 载荷

* up to d7f848f
 2021-03-28 18:44:29 -04:00
YellOw139andGitHub a6fe1275c7 [Bundle][RO] Update (#4860) 
* [Bundle][RO] Update

This PR ~~was~~ will soon be tested in-game ~~and is ready to merge at any time~~.

Changelog:

- New strings/changes up to commit b75a8d5260
- Typo fixes & various other improvements

* Status effects

* Minor change

* Improve, adapt

* After test bundles be like

* cleanup

* typo

* options, options...

* Added block_info keybind name
 2021-03-28 18:42:50 -04:00
Prosta4okuaandGitHub 2f3fd9de3b [Bundle][uk_UA] Update Ukrainian (#4868) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

03.06.2021

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-03-28 18:42:41 -04:00
MEEP of FaithandGitHub 8b2e78ab1e maxRange overriding on laser bulllets (#4873) 2021-03-28 18:42:26 -04:00
CatchearsandGitHub d04eaa81e0 german translation (#4897) 
* update german translation to https://github.com/Anuken/Mindustry/commit/b75a8d52606b8cf5e6b554844e5fad4ddd3c556b

* update german translation to https://github.com/Anuken/Mindustry/commit/8e52d8a2729727bf145aa816846aeace2bfd5458

* foreshadow improvements

* block info keybind
 2021-03-28 18:41:06 -04:00
cinnxandGitHub b71d5837e9 Update bundle_pl.properties (#4910) 
Added missing part of the translation from the English bundle file, fixed a lot of typos.

Huge thanks to:
Somka#9325
count sudoku#9564
Zielony Trójkąt#9074
for pointing out those errors :D
 2021-03-28 18:40:55 -04:00
MEEP of FaithandGitHub 332b1ce100 collidesGround targetting in GroundAI (#4911) 2021-03-28 18:40:47 -04:00
VanguardandGitHub c17040b1ab [Bundle][RU] Update (#4927) 
* 21 new, 4 changed, 4 deleted

New:
status.burning.name
status.freezing.name
status.wet.name
status.muddy.name
status.melting.name
status.sapped.name
status.spore-slowed.name
status.tarred.name
status.overclock.name
status.shocked.name
status.blasted.name
status.unmoving.name
stat.opposites
stat.damagemultiplier
stat.healthmultiplier
stat.speedmultiplier
stat.reloadmultiplier
stat.buildspeedmultiplier
stat.reactive
bullet.lightning
content.status.name

Changed:
wavemode.health
boss.health
rules.blockhealthmultiplier
rules.unithealthmultiplier

Deleted:
bullet.sapping
bullet.shock
bullet.freezing
bullet.tarred

* 1 new line

keybind.block_info.name
 2021-03-28 18:38:50 -04:00
SharlotteandGitHub a3bd7ba3ad [KO]Update Bundle (#4935) 2021-03-28 18:38:44 -04:00
MEEP of FaithandGitHub 2a7525cdf1 Allow for dynamic counting (#4988) 2021-03-28 18:38:16 -04:00
Anuken de458f5c26 Cleanup 2021-03-28 10:57:06 -04:00
Anuken db931bace2 Cleanup 2021-03-28 10:56:19 -04:00
AzCraftandGitHub 43602caab2 Added Bulgarian translations. [bundle_bg.properties] (#5013) 2021-03-28 09:42:37 -04:00
RebornTrack970andGitHub 793e957d0d OmegaHub Updated (#5011) 
Moved Annexation and Rush from Minecraft hosting to Mindustry host and improved ping.
Added Castle Wars by Xusx.
 2021-03-28 09:42:03 -04:00
Anuken 66594a2b32 Fixed #5012 2021-03-28 09:41:08 -04:00
Anuken e81219dd3e Merge remote-tracking branch 'origin/master' 2021-03-27 22:12:54 -04:00
Anuken d11a26c568 Pack effect icons in UI spritesheet 2021-03-27 22:12:47 -04:00
SkatandGitHub cf3543ec07 Change int parameters to long type (#5008) 2021-03-27 17:38:55 -04:00
ValeriyandGitHub 886d8752b7 Update servers_v6.json (#4753) 2021-03-27 16:45:52 -04:00
fuzzbuckandGitHub 496d6b139e Update servers_v6.json (#5003) 
TLD change
 2021-03-26 20:30:42 -04:00
Darkness6030andGitHub 3ce064ca11 Update mindurka ip (#5002) 
Mindurka.ru come back!)
[RU]Заспидранил восстановление сервера с нуля за один день!) Гений мысли...
 2021-03-26 14:17:48 -04:00
Anuken 1be7f3b36c Merge remote-tracking branch 'origin/master' 2021-03-26 10:13:46 -04:00
Anuken 3fddd6eea7 .size 2021-03-26 10:13:42 -04:00
CxZxRainzzGitHubJoshua Fan
 		339fc8113b Shutting down CxZx (#4996) 
* Shutting down CxZx

I shutting down the servers because of family issues i hope to rejoin the community later

* Update servers_v6.json

Co-authored-by: Joshua Fan <joshuaptfan@gmail.com>

Co-authored-by: Joshua Fan <joshuaptfan@gmail.com>
 2021-03-25 23:00:37 -04:00
Anuken 025bf5ffc3 Merge remote-tracking branch 'origin/master' 2021-03-25 22:42:01 -04:00
Anuken 1dc2906343 Fixed #4997 2021-03-25 22:41:55 -04:00
L0615T1C5-216AC-9437andGitHub eea276118f Add more ports for Chaotic Neutral (#4981) 2021-03-25 16:33:12 -04:00