Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,515 Commits 4 Branches 180 Tags
785ba7910d46a9ccb53bad66612917491f40c20e
Commit Graph
10467 Commits
Author SHA1 Message Date
老滑稽andGitHub f5c8d0bf52 Update bundle_zh_CN.properties 2020-09-25 00:12:45 +08:00
LeoDog896 244a587db8 Merge remote-tracking branch 'upstream/master' 2020-09-24 12:08:27 -04:00
LeoDog896 b88302e604 Make shader final 
Seriously, it shouldn't be changed
 2020-09-24 12:07:45 -04:00
老滑稽andGitHub f95f6d8c7b Update bundle_zh_CN.properties 2020-09-25 00:07:24 +08:00
老滑稽andGitHub db558672cb Update bundle_zh_CN.properties 2020-09-24 23:54:52 +08:00
AnukenandGitHub f3f33038e4 Merge pull request #2701 from Voz-Duh/team-indicator-for-command-center 
Team Indicator For Command Center
 2020-09-24 11:16:12 -04:00
Voz-Duh d08c54d9a7 Fix 2020-09-24 18:10:49 +03:00
LeoDog896 e23e8de62a Added boss as radar target 2020-09-24 10:59:13 -04:00
Voz-Duh 11eb5f464f Team Indicator For Command Center 2020-09-24 17:47:50 +03:00
Anuken db94acdb83 Merge remote-tracking branch 'origin/master' 2020-09-24 09:23:42 -04:00
Anuken 68e708cf9a d 2020-09-24 09:23:38 -04:00
YellOw139andGitHub 0b4caec004 [Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:
- Changes up until commit 35460f0b5f
- Typo fixes & various other improvements
 2020-09-24 11:43:16 +03:00
Petr Gašparík c08875498f Czech update upto commit 35460f0 2020-09-24 07:38:26 +02:00
老滑稽andGitHub c2348f9019 Update bundle_zh_CN.properties 2020-09-24 13:10:06 +08:00
AnukenandGitHub 35460f0b5f Merge pull request #2692 from Prosta4okua/master 
immediate RU L10n update
 2020-09-23 23:03:54 -04:00
Felix CorvusandGitHub 90fe7d7e59 immediate RU L10n update 2020-09-24 05:34:37 +03:00
Anuken 0288cb34fb Cleanup 2020-09-23 22:15:14 -04:00
AnukenandGitHub 75ebaab3a3 Merge pull request #2660 from J-VdS/schematic 
Server disable schematic option (fix #2382)
 2020-09-23 22:01:06 -04:00
Anuken ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken 764b93154e Turret sprite tweaks 2020-09-23 19:16:33 -04:00
Anuken 28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken d7bd4bd0c8 Merge remote-tracking branch 'origin/master' 2020-09-23 18:26:09 -04:00
Anuken 3a618761b3 Pre-release tweaks 2020-09-23 18:26:05 -04:00
AnukenandGitHub 8efba6ada7 Merge pull request #2564 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-09-23 18:25:36 -04:00
AnukenandGitHub fcff922370 Merge branch 'master' into patch-2 2020-09-23 18:25:12 -04:00
AnukenandGitHub 14627dbbf7 Merge pull request #2639 from PetrGasparik/6.0-aplha-2 
Czech translation track for 6.0 aplha 2
 2020-09-23 18:24:48 -04:00
Anuken 5df5a6e39f tweak 2020-09-23 18:01:12 -04:00
Anuken 3db2ffb843 Launch pad destination selection 2020-09-23 18:00:24 -04:00
Anuken 1cc8d7e3f4 Balance 2020-09-23 15:21:06 -04:00
AnukenandGitHub 84aa4ad602 Merge pull request #2675 from Voz-Duh/turrets-shadow 
Turrets Shadow
 2020-09-23 10:50:47 -04:00
J-VdSandGitHub d0c6f3274b Merge branch 'master' into schematic 2020-09-23 16:29:41 +02:00
Voz-Duh 64d4fd5579 Fix 2020-09-23 16:55:59 +03:00
Voz-Duh 868c6a6996 Fix 2020-09-23 16:47:11 +03:00
Anuken 8ed83964a2 Bugfixes 2020-09-23 09:33:56 -04:00
Anuken ec11e60c7c Fixed #2679 2020-09-23 09:32:27 -04:00
Voz-Duh b4d0df03df Fix 2020-09-23 12:56:21 +03:00
Voz-Duh d0f6d9fb95 Deleted other files 2020-09-23 12:42:02 +03:00
YellOw139andGitHub fb42302720 Update bundle_ro.properties 2020-09-23 12:40:27 +03:00
YellOw139andGitHub 7701368d1b Main menu adjustments for mobile 2020-09-23 12:39:13 +03:00
Voz-Duh 9503e26e1d Add shadow 2020-09-23 12:39:06 +03:00
Felix CorvusandGitHub fe9a44d876 Update bundle_ru.properties 2020-09-23 08:35:28 +03:00
Anuken 6b43697891 (2) 2020-09-22 23:32:34 -04:00
Anuken b601dc5deb Fixed fuse length being less than expected 2020-09-22 23:25:44 -04:00
Anuken a4375f9c85 Merge remote-tracking branch 'origin/master' 2020-09-22 23:22:56 -04:00
Anuken 0058d45352 Fixed #2672 2020-09-22 23:22:53 -04:00
AnukenandGitHub 2eaa7d2745 Merge pull request #2669 from genNAowl/camelcasing1 
rotatespeed > rotateSpeed
 2020-09-22 23:08:50 -04:00
Anuken cf13717cc8 Fixed #2671 2020-09-22 22:52:55 -04:00
Anuken 721e79eb90 Fixed #2670 2020-09-22 21:48:42 -04:00
Anuken f685c30178 testing if travis messed up codegen 2020-09-22 21:28:31 -04:00
Leonwang4234 e00b50c1f1 rotatespeed > rotateSpeed 2020-09-22 18:25:05 -07:00