 slava0135
|
79f4608e81
|
Merge remote-tracking branch 'origin/tsunami' into tsunami
|
2020-09-25 14:22:13 +03:00 |
|
|
slava0135
|
9050cac19c
|
added to tech tree
|
2020-09-25 14:21:52 +03:00 |
|
  
|
79ac9894b3
|
Update core/src/mindustry/content/Blocks.java
s p a c e
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
|
2020-09-25 12:58:28 +03:00 |
|
|
slava0135
|
3e81d194cb
|
New liquid turret - Tsunami
|
2020-09-25 11:49:04 +03:00 |
|
 Anuken
|
7b90f5a97d
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 22:41:17 -04:00 |
|
|
Anuken
|
3a06cacf1d
|
Minor fixes
|
2020-09-24 22:41:13 -04:00 |
|
|
AnukenandGitHub
|
56515db614
|
Update bug_report.md
|
2020-09-24 21:27:33 -04:00 |
|
|
Anuken
|
2141e2ebab
|
Cleaned up extra accessor method
|
2020-09-24 18:32:18 -04:00 |
|
|
Anuken
|
bc705aa7a0
|
Minor allocation optimization
|
2020-09-24 18:24:43 -04:00 |
|
|
Anuken
|
9e0b29b3dd
|
Cleanup
|
2020-09-24 18:11:10 -04:00 |
|
|
Anuken
|
504334999d
|
Campaign multiplayer note
|
2020-09-24 16:49:04 -04:00 |
|
|
Anuken
|
8d8cedaa44
|
Removed launch mechanic remnants
|
2020-09-24 16:44:11 -04:00 |
|
|
Anuken
|
659da0a837
|
formation tweaks
|
2020-09-24 15:49:39 -04:00 |
|
|
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 |
|
|
AnukenandGitHub
|
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 |
|
|
AnukenandGitHub
|
d1980ef493
|
Merge pull request #2704 from summetdev/patch-2
remove .bat extension from README.md
|
2020-09-24 12:02:34 -04:00 |
|
 SummetandGitHub
|
110c04e5e3
|
remove .bat
|
2020-09-24 18:32:57 +03: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 |
|
|
AnukenandGitHub
|
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 |
|
|
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
|
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 |
|
|
AnukenandGitHub
|
e4d97d790f
|
Merge pull request #2576 from MWestfall/patch-3
Update servers.json
|
2020-09-23 19:02:24 -04:00 |
|
|
AnukenandGitHub
|
5fa31b5625
|
Merge pull request #2577 from MWestfall/patch-4
Update servers_v6.json
|
2020-09-23 19:01:29 -04:00 |
|
|
AnukenandGitHub
|
414d3eb3c4
|
Merge pull request #2637 from AydenRennaker/patch-7
Add Atanner Gaming V6 Server
|
2020-09-23 19:01:11 -04:00 |
|
|
AnukenandGitHub
|
abd8356385
|
Update .travis.yml
|
2020-09-23 18:47:29 -04:00 |
|
|
AnukenandGitHub
|
ae78054188
|
Update .travis.yml
v106
|
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 |
|
|
AnukenandGitHub
|
8efba6ada7
|
Merge pull request #2564 from Prosta4okua/master
[Bundle][RU] actual L10n
|
2020-09-23 18:25:36 -04:00 |
|
|
AnukenandGitHub
|
c12263078a
|
Merge pull request #2626 from YellOw139/patch-2
[Bundle][RO] Translation Update
|
2020-09-23 18:25:24 -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 |
|