1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-20 12:58:38 +03:00
Commit Graph

8621 Commits

Author SHA1 Message Date
Anuken
0dccbf8598 Better physics system 2020-09-24 15:39:34 -04:00
Anuken
1682e3b996 Fixed #2714 2020-09-24 14:26:24 -04:00
Anuken
a914bd77f6 Fixed #2712 2020-09-24 14:00:43 -04:00
Anuken
da115e90bc Merge remote-tracking branch 'origin/master' 2020-09-24 13:05:43 -04:00
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -04:00
Anuken
1d530f531d
Merge pull request #2707 from LeoDog896/master
Make renderer shader final
2020-09-24 12:43:51 -04: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
Anuken
d1980ef493
Merge pull request #2704 from summetdev/patch-2
remove .bat extension from README.md
2020-09-24 12:02:34 -04:00
Summet
110c04e5e3
remove .bat 2020-09-24 18:32:57 +03:00
Anuken
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
Anuken
da66d93db9
Merge pull request #2702 from LeoDog896/master
Added boss as radar target
2020-09-24 11:15:15 -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
Anuken
35460f0b5f
Merge pull request #2692 from Prosta4okua/master
immediate RU L10n update
2020-09-23 23:03:54 -04:00
Felix Corvus
90fe7d7e59
immediate RU L10n update 2020-09-24 05:34:37 +03:00
Anuken
0288cb34fb Cleanup 2020-09-23 22:15:14 -04:00
Anuken
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
f9b46fbf18 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-23 19:16:53 -04:00
Anuken
764b93154e Turret sprite tweaks 2020-09-23 19:16:33 -04:00
Anuken
e4d97d790f
Merge pull request #2576 from MWestfall/patch-3
Update servers.json
2020-09-23 19:02:24 -04:00
Anuken
5fa31b5625
Merge pull request #2577 from MWestfall/patch-4
Update servers_v6.json
2020-09-23 19:01:29 -04:00
Anuken
414d3eb3c4
Merge pull request #2637 from AydenRennaker/patch-7
Add Atanner Gaming V6 Server
2020-09-23 19:01:11 -04:00
Anuken
abd8356385
Update .travis.yml 2020-09-23 18:47:29 -04:00
Anuken
ae78054188
Update .travis.yml 2020-09-23 18:37:45 -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
Anuken
8efba6ada7
Merge pull request #2564 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-09-23 18:25:36 -04:00
Anuken
c12263078a
Merge pull request #2626 from YellOw139/patch-2
[Bundle][RO] Translation Update
2020-09-23 18:25:24 -04:00
Anuken
fcff922370
Merge branch 'master' into patch-2 2020-09-23 18:25:12 -04:00
Anuken
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
Anuken
84aa4ad602
Merge pull request #2675 from Voz-Duh/turrets-shadow
Turrets Shadow
2020-09-23 10:50:47 -04:00
J-VdS
d0c6f3274b
Merge branch 'master' into schematic 2020-09-23 16:29:41 +02:00
J-VdS
1e10817708 revert file 2020-09-23 16:26:48 +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
YellOw139
fb42302720
Update bundle_ro.properties 2020-09-23 12:40:27 +03:00
YellOw139
7701368d1b
Main menu adjustments for mobile 2020-09-23 12:39:13 +03:00