Commit Graph

5812 Commits

Author SHA1 Message Date
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
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
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
68e708cf9a d 2020-09-24 09:23:38 -04: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
3a618761b3 Pre-release tweaks 2020-09-23 18:26:05 -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
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
9503e26e1d Add shadow 2020-09-23 12:39:06 +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
Anuken
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
Anuken
ba6ab8483e Various tweaks 2020-09-22 20:42:36 -04:00
Anuken
4a02315ee5 Small bugfixes 2020-09-22 17:59:37 -04:00
Anuken
f3e08f9cb6 Internal refactoring & cleanup 2020-09-22 15:50:33 -04:00
Anuken
0256a475cf Fixed #2662 2020-09-22 13:38:08 -04:00
Anuken
3a466475fd Better error handling on Steam 2020-09-22 13:12:21 -04:00
J-VdS
28cd08bdd1 idk 2020-09-22 19:04:42 +02:00
J-VdS
428c396968 Update SchematicsDialog.java 2020-09-22 19:04:05 +02:00
J-VdS
890dfdeb06 weird intellij 2020-09-22 19:03:27 +02:00
J-VdS
a0913c67df Update DesktopInput.java 2020-09-22 19:01:51 +02:00
J-VdS
393ca67291 cleanup 2020-09-22 18:42:59 +02:00
J-VdS
f4003fd463 merge 2020-09-22 18:41:24 +02:00
J-VdS
51065b57c4 info popup 2020-09-22 18:40:04 +02:00
Anuken
5895e2f23c #2647 2020-09-22 12:24:40 -04:00
Anuken
08ff36c43e Bugfixes 2020-09-22 12:16:17 -04:00
Anuken
b2b8949e26 Cleanup 2020-09-22 11:16:19 -04:00
Anuken
ce4f67341c Merge remote-tracking branch 'origin/master' 2020-09-22 10:03:10 -04:00
Anuken
a6c10a97f2 Fixed #2654 / Fixed #2651 / fine I'll add a base 2020-09-22 10:03:05 -04:00