Commit Graph

154 Commits

Author SHA1 Message Date
Anuken
058b2ddfce Fixed #3565 2020-11-24 09:00:34 -05:00
Anuken
dcbe06229c Campaign fixes & balance 2020-11-23 10:36:41 -05:00
Anuken
b09dc47aad Bugfixes / Tutorial cleanup 2020-11-21 15:50:44 -05:00
Anuken
1ef264d560 Added final campaign map (WIP, untested) 2020-11-18 18:58:54 -05:00
Anuken
f4a7288633 Fixed #3447 2020-11-18 09:26:31 -05:00
MEEP of Faith
361ed26907 Lasers cannot and should not collide with anything. 2020-11-16 12:24:36 -08:00
Anuken
a9756aefad Cleanup of weapon stats 2020-11-13 14:42:46 -05:00
Skat
f84e780f3b Merge branch 'master' into cleanup-2 2020-11-09 20:21:01 +04:00
Anuken
a211fceab4 SFX changes 2020-11-08 13:55:09 -05:00
Skat
ed36390f3c Great cleanup 2020-11-07 11:37:46 +03:00
Anuken
696ad92b59 Merged changes 2020-11-03 17:20:43 -05:00
Anuken
5d2e705923 asfehioafuhioaghuoytgfctyr 2020-11-02 20:54:39 -05:00
Anuken
05dcd7622b Campaign tweaks 2020-10-31 14:52:03 -04:00
Anuken
9c54fcee2e Sector damage calculation fix 2020-10-31 13:42:43 -04:00
Anuken
2079cfaece Fixed #3208 2020-10-31 13:03:19 -04:00
DeltaNedas
865beac7fb fix modded bullets 2020-10-31 15:35:45 +00:00
Anuken
4ec8e24bd8 Cleanup of merged PR 2020-10-30 19:03:05 -04:00
genNAowl
60f2c67bde Merge branch 'master' into ground-support-heal 2020-10-30 12:37:33 -07:00
Leonwang4234
de483990ef formatting
Why do I always make these mistakes?

And I saw that I did the same thing in my incendiary-fire PR too...
2020-10-30 09:04:44 -07:00
Anuken
73035b9211 Merge branch 'master' into formatting 2020-10-30 09:26:51 -04:00
Anuken
1663497e6c Better save validation 2020-10-29 19:03:58 -04:00
summetdev
9a7e0fb45e Removed spaces in brackets 2020-10-27 21:54:48 +03:00
Anuken
e00daffe6d Bugfixes 2020-10-16 15:27:30 -04:00
abomb4
83756a6ea0 New feature: bullet homing delay 2020-10-17 00:05:19 +08:00
Leonwang4234
9b95b97568 (Should) prevent vela from setting fires to friendly tiles 2020-10-16 08:54:29 -07:00
Leonwang4234
69b7d15beb Merge remote-tracking branch 'upstream/master' into ground-support-heal 2020-10-16 08:49:55 -07:00
Leonwang4234
ba77f8e2aa implement content 2020-10-15 17:59:03 -07:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
Anuken
d61ad8d2ef Fixed #2895 2020-10-10 13:15:59 -04:00
Leonwang4234
e73a813d69 prevent from breaking other things 2020-10-08 19:27:01 -07:00
Leonwang4234
af5fd4551c true it is 2020-10-08 19:18:53 -07:00
Leonwang4234
0eb0f34908 add pierceCap 2020-10-08 19:14:05 -07:00
Anuken
e05ac5ae41 Cleanup 2020-10-08 13:08:49 -04:00
Anuken
30f5340a22 Mobile manual aiming / Mobile control changes [UNSTABLE] 2020-10-07 14:19:08 -04:00
Leonwang4234
d8a06da79a Should Compile Now 2020-10-05 19:08:23 -07:00
genNAowl
cba2fd4351 Merge branch 'master' into healbullets-bullets 2020-10-05 16:04:29 -07:00
Anuken
93e21c6bf9 Merge pull request #2806 from genNAowl/burning-affects-tiles
Incendiary Bullets Make Fires When Hitting Tiles
2020-10-05 16:35:13 -04:00
genNAowl
7722d697c6 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:52 -07:00
genNAowl
68e67ae0f2 Update core/src/mindustry/entities/bullet/BulletType.java
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-05 13:10:46 -07:00
Leonwang4234
e17f28b636 merge healbullets with bullettype 2020-10-05 11:49:12 -07:00
Leonwang4234
60d5048140 Update BulletType.java 2020-10-02 21:25:05 -07:00
Anuken
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Leonwang4234
e53a1d0472 Update BulletType.java 2020-10-02 19:47:47 -07:00
Leonwang4234
74c0d0d0fd Update BulletType.java 2020-10-02 19:33:11 -07:00
Leonwang4234
ca70b9c705 fix
(again)
2020-10-02 18:28:36 -07:00
Leonwang4234
5aa0ce97b8 fix 2020-10-02 18:27:33 -07:00
Leonwang4234
39e956c934 Update BulletType.java 2020-10-02 18:26:17 -07:00
Leonwang4234
88639fffc5 fix 2020-10-02 18:17:51 -07:00
Leonwang4234
e17ad7a429 Merge remote-tracking branch 'upstream/master' into burning-affects-tiles 2020-10-02 17:47:11 -07:00
Anuken
43936b536e Cleanup 2020-10-02 20:23:37 -04:00