Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,735 Commits 4 Branches 180 Tags
13d16f1883da0140e091aa6cc67bea2f4fb80ab5
Commit Graph

8046 Commits

Author SHA1 Message Date
Anuken
90d589939a PR cleanup 2021-10-12 14:15:28 -04:00
Anuken
da225d15c7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-10-12 14:14:56 -04:00
Ilya246
21549d2518 Add new fx (#6136) 
* Update Fx.java

* Update Fx.java

* Update Fx.java

* Update NetClient.java

* Update Fx.java
 2021-10-12 14:14:51 -04:00
Anuken
25c8623e30 router 2021-10-12 12:35:46 -04:00
Anuken
d5f7fc842c Fixed #6140 2021-10-12 08:25:00 -04:00
Anuken
da0fea5186 Merge remote-tracking branch 'origin/master' 2021-10-11 10:30:44 -04:00
Anuken
6abb458c27 Increased world stream chunk size 2021-10-11 10:30:40 -04:00
GlennFolker
9cc738d867 order (#6137) 2021-10-11 09:03:42 -04:00
Matthew Peng
4030e71b31 Customizable Force Projector Absorb Effect (#6102) 
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
 2021-10-10 17:06:59 -04:00
Anuken
9f070323c2 a 2021-10-10 14:11:12 -04:00
Anuken
c60bd6f0dc Customizable chat formatting (Closes #5387) 2021-10-10 12:37:07 -04:00
GlennFolker
758921c077 Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
buthed010203
c5ed535519 add javaPath variable (#6126) 2021-10-09 14:07:56 -04:00
Anuken
f5d6313399 Redundant effect paren cleanup 2021-10-09 12:54:20 -04:00
Anuken
04df23b88a Generation tweaks 2021-10-07 14:35:09 -04:00
Anuken
00be5b7fa5 Converted soundtrack to ogg 2021-10-07 12:07:26 -04:00
Anuken
d43157fd22 Fixed negative recoil 2021-10-06 13:29:31 -04:00
Anuken
60a430025a Merge remote-tracking branch 'origin/master' 2021-10-06 13:09:53 -04:00
Anuken
3f53315a07 Proper implementation of #6099 (untested) 2021-10-06 13:09:45 -04:00
Matthew Peng
a4963f351d Fix negative recoil (#6107) 2021-10-05 23:05:33 -04:00
Anuken
785ba7910d Merge remote-tracking branch 'origin/master' 2021-10-05 17:06:17 -04:00
Anuken
3030308f09 Make naval units only slow down on "shallow" water 2021-10-05 17:06:09 -04:00
Matthew Peng
bc3da30d45 Allow for dynamic laser absorption and insulation (#5047) 
* Allow for dynamic laser absorption

* Might as well do insulated as well

* null checks are important
 2021-10-05 12:36:29 -04:00
way-zer
6d49bd39be Fix #5702 (#6098) 2021-10-04 09:21:02 -04:00
Anuken
0d0fe394d3 Serpulo water tweaks 2021-10-03 13:12:20 -04:00
Anuken
aed57aaac3 Added InputHandler lock system 2021-10-03 11:21:53 -04:00
Anuken
b20cdb97c5 Reset chat font cache color 2021-10-02 13:01:54 -04:00
Anuken
d95662233c Fixed #6090 2021-10-02 12:05:02 -04:00
Anuken
db6b8abce6 Fixed #6089 2021-10-02 08:42:07 -04:00
Anuken
ee26f51d7a Cleanup 2021-09-30 18:32:31 -04:00
Anuken
0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken
9939d6065a Merge remote-tracking branch 'origin/master' 2021-09-30 17:33:23 -04:00
Anuken
c226127648 Display jump statement destination 2021-09-30 17:33:17 -04:00
Matthew Peng
e0b1c49e0b Fix weapon recoiling (#6083) 
Weapons recoil when the begin charging
 2021-09-30 17:01:24 -04:00
buthed010203
78a4572388 Add "infotable" name to hudfrag (#6082) 
In another attempt to make my client more compatible with mods, I am adding this so it can be found by name rather than by index
 2021-09-30 13:01:52 -04:00
Anuken
6f6590d5bb chargeShootEffect / Effect startDelay 2021-09-29 22:39:33 -04:00
EyeOfDarkness
efb9df7b1b Recoil Time and Improved Alternating (#6073) 
* Revamped recoil, and improved alternating

* i might have to make this more complicated later

* hhhhhhhhh

* proper description.
 2021-09-29 19:35:47 -04:00
Matthew Peng
a04b385f56 Fix spread + burst turrets (#6069) 
* Fix spread + burst turrets

* spread is 4 by default

set salvo spread to 0

* damnit
 2021-09-29 08:38:51 -04:00
Anuken
71543f2ab2 Improved Serpulo water edge generation 2021-09-28 17:20:20 -04:00
Anuken
7f415588f4 Cleaned up duplicate SettingsMenuDialog code 2021-09-28 14:41:35 -04:00
Anuken
c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken
d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
Matthew Peng
182dfc5f38 delta in reload for a LaserTurret isn't properly calculated (#6068) 2021-09-28 08:41:40 -04:00
Anuken
c814ef0012 Slightly increased item charge damage 2021-09-27 21:11:21 -04:00
Anuken
f5a0528c73 Merge remote-tracking branch 'origin/master' 2021-09-27 19:02:10 -04:00
Anuken
f5a2ed900d Make hint.presetLaunch more likely to show up 2021-09-27 19:02:06 -04:00
Matthew Peng
2f9bf6e13f collideTerrain (#6059) 
* collideTerrain

* Combine code
 2021-09-27 15:11:36 -04:00
Anuken
61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -04:00
TranquillyUnpleasant
dbd31b9031 Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
Matthew Peng
083c21ea3f Effect Rotate With Parent (#5999) 
* Effect Rotate With Parent

* Use Rotc

* Wording

* Base Rotation

* Rotate effect rotation with parent.
 2021-09-27 11:55:56 -04:00