Commit Graph
2004 Commits
Author SHA1 Message Date
Anuken c49b3124d5 Merge remote-tracking branch 'origin/master' 2020-09-25 18:49:36 -04:00
Anuken dc30993898 Fixed #2729 2020-09-25 18:49:31 -04:00
AnukenandGitHub 47d734873b Merge pull request #2727 from LeoDog896/drown
Drown event
2020-09-25 16:27:21 -04:00
1d52211f93 Update core/src/mindustry/entities/comp/FlyingComp.java
Co-authored-by: Summet <summet.dev@gmail.com>
2020-09-25 14:21:48 -04:00
Anuken 059b72b3e2 Merge remote-tracking branch 'origin/master' 2020-09-25 14:21:34 -04:00
Anuken 2cc93924f1 Support for Android java mods 2020-09-25 14:21:30 -04:00
LeoDog896 53d4124fc3 Use reportIssueUrl 2020-09-25 12:26:04 -04:00
LeoDog896 c912eb197b Drown event
we all need to know when they drown
2020-09-25 12:01:59 -04:00
LeoDog896 35e4f696aa Merge remote-tracking branch 'upstream/master' 2020-09-25 10:55:04 -04:00
AnukenandGitHub 85d32cd510 Merge pull request #2726 from Voz-Duh/shadow-fix
Shadow Fix
2020-09-25 09:53:13 -04:00
Anuken 292793daf1 Fixed #2722 2020-09-25 09:50:38 -04:00
Voz-Duh 41b4cbbce2 Shadow Fix 2020-09-25 15:18:06 +03:00
LeoDog896 6492ffd35d More sort and target options 2020-09-25 07:58:44 -04:00
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
MEEP of FaithandGitHub 9f26979419 why variable here 2020-09-24 20:34:02 -07:00
Anuken 3a06cacf1d Minor fixes 2020-09-24 22:41:13 -04:00
Anuken 2141e2ebab Cleaned up extra accessor method 2020-09-24 18:32:18 -04:00
MEEP of FaithandGitHub 55e25cc509 Make lightning have frag angle properties
Adds `lightningCone`, which is the full angle of where the lightning direction can be, and `lightningAngle` which is the angle compared to the bullet that the center of the lightning cone is.
2020-09-24 15:31:03 -07: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
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 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
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 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
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