Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,358 Commits 4 Branches 180 Tags
e60fff43bdb4e91d22233c3887bd7232a430b245
Commit Graph

13809 Commits

Author SHA1 Message Date
MEEPofFaith
1314dfe53e Don't set lighting if the preset has noLighting = true (#8519) 
* Don't set lighting if the preset has noLighting = true

Allows lighting in the preset or world processors to take over instead of being forced to disable lighting.

* Less confusing style
 2023-04-21 21:56:16 -04:00
Anuken
05f158fd51 Fixed #8523 2023-04-21 21:29:39 -04:00
Anuken
13297023fe Fixed #8525 2023-04-21 21:24:18 -04:00
Anuken
9cc392a9ed Merge remote-tracking branch 'origin/master' 2023-04-21 11:44:05 -04:00
Anuken
eb1d0b8362 Fixed minimap update lag 2023-04-21 11:44:00 -04:00
Anuken
7a01be6dba splashDamagePierce 2023-04-20 01:03:18 -04:00
MEEPofFaith
6a3b243937 Erekir payload conveyor sprite consistency (#8506) 
* Erekir payload conveyor sprite consistency

* Better blending from conveyor to factory

* Better blending for the 5x5
 2023-04-18 16:37:34 -04:00
MEEPofFaith
b2f5312bf5 Add overlays to render updates (#8514) 2023-04-18 10:14:07 -04:00
Anuken
6a3638c3c2 Fixed #8513 2023-04-18 10:10:11 -04:00
Anuken
3ca3eb5951 Load saves in parallel 2023-04-18 09:35:29 -04:00
Anuken
2db90408fe Use schematic/map names for filenames 2023-04-16 12:09:02 -04:00
Anuken
f62096dbd1 Merge remote-tracking branch 'origin/master' 2023-04-15 22:24:45 -04:00
Anuken
dbfbb08aaa Fixed #8509 2023-04-15 22:24:40 -04:00
Github Actions
c54a76fc8a Automatic bundle update 2023-04-16 02:21:40 +00:00
Anuken
3d013fc09c Merge remote-tracking branch 'origin/master' 2023-04-15 22:17:51 -04:00
Anuken
b83f5c66ca Fixed #8507 2023-04-15 22:17:46 -04:00
MonoDx
288080eeac Rework (#8488) 
* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties
 2023-04-15 22:16:44 -04:00
Anuken
e47806b9b8 Minimap attack indicators 2023-04-15 15:54:33 -04:00
Anuken
4ae8a51676 Display camera on map + right-click to pan 2023-04-15 14:39:41 -04:00
Anuken
e8fbfe536e Merge remote-tracking branch 'origin/master' 2023-04-09 18:16:30 -04:00
Anuken
b86ca1d12f Fixed #8496 2023-04-09 18:16:25 -04:00
MEEPofFaith
1629afe491 Ammo obliteration (#8498) 
* alwaysShooting for turrets

similar to alwaysShooting for weapons

* Weapon alwaysShooting takes shootCone into account

Speaking of untested PRs...
 2023-04-09 16:12:24 -04:00
Anuken
df87b03e57 Fixed #8495 2023-04-09 16:07:34 -04:00
Anuken
a8b18bea2f Fixed #8494 2023-04-09 16:01:35 -04:00
Anuken
cdf14bb381 Fixed objectives disappearing for no reason 2023-04-08 21:55:20 -04:00
Anuken
b692c071ba Fixed shoot pattern overrides not working in mods 2023-04-08 21:37:33 -04:00
Anuken
34b22f292c PR cleanup 2023-04-08 10:52:53 -04:00
Anuken
11ad5a0373 Reset UI scale to 100% when broken 2023-04-08 10:29:42 -04:00
Anuken
f4fabecce7 Fixed #8483 (meep why did you make the minimum 5%) 2023-04-07 11:05:26 -04:00
Anuken
60fc2fb5cd Doubled server object buffer size 2023-04-07 10:43:59 -04:00
Anuken
04eba618d2 Merge remote-tracking branch 'origin/master' 2023-04-06 19:13:41 -04:00
Anuken
ac7b694e91 Better item display rates 2023-04-06 19:13:36 -04:00
Github Actions
4fcb338d94 Automatic bundle update 2023-04-06 23:08:17 +00:00
JniTrRny
6dc3b7e729 More Dark UI in stats display (#8473) 
* The Dark UI Menace

* Attack of the Dark UI
 2023-04-06 19:07:24 -04:00
code-explorer786
cdb9fa0d7d Add PlayerChatEvent on clients (#8432) 
* Add PlayerChatEvent on clients

d32dd01097

Co-authored-by: buthed010203 <naguiar010203@gmail.com>

* Only fire when valid. (Currently deciding on whether or not to add ChatEvent without the player.)

---------

Co-authored-by: buthed010203 <naguiar010203@gmail.com>
 2023-04-06 18:16:04 -04:00
Anuken
2b11e1fb1e Fixed #8480 2023-04-06 12:15:12 -04:00
Anuken
697c6a927a Merge remote-tracking branch 'origin/master' 2023-04-06 10:46:57 -04:00
Anuken
72b456fca2 Optimized imports 2023-04-06 10:46:52 -04:00
Github Actions
f67e2c71e7 Automatic bundle update 2023-04-06 13:56:07 +00:00
Nunting
bee977cadc Update bundle_ko.properties (#8479) 2023-04-06 09:55:06 -04:00
MonoDx
183ebb33b7 Update bundle_be.properties (#8478) 
Update logical translate.

Work monoDx.
Thanks
 2023-04-06 09:54:48 -04:00
Anuken
97390d25c0 Removed pointless code 2023-04-05 19:51:16 -04:00
Anuken
3f1d957e28 New duo animation 2023-04-04 11:02:47 -04:00
Anuken
e62a5888ef Fixed some possible crashes 2023-04-03 16:40:12 -04:00
MEEPofFaith
6d71bcd2eb Multi shotgun fix (#8460) 
* Multi-barrel shotgun fix

* multi-recoil support

* @Nullable for everything
 2023-04-03 16:38:10 -04:00
buthed010203
2075a226e1 Fix multiline messages being cut off (#8471) 
I'm not fixing this properly
 2023-04-03 15:37:09 -04:00
MEEPofFaith
f55363a932 Fix janky sublimate ammo display (#8469) 2023-04-03 10:03:24 -04:00
Anuken
1413b479ef Classmap auto-update 2023-04-02 22:44:44 -04:00
MEEPofFaith
b322b1165f Parse singular consumes (#8466) 
* Parse singular `Consume`s

* Proper coolant parsing

* Temporary manual update of ClassMap

Does not include all consume types.

I don't know what gradle command to run to update `ClassMap`. I've tried `tools:updateScripts` but that just cleared everything.
 2023-04-02 19:53:19 -04:00
Anuken
fa02d8d280 Merge remote-tracking branch 'origin/master' 2023-04-02 13:28:53 -04:00