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

10187 Commits

Author SHA1 Message Date
MEEPofFaith
1c3538321b acceptsPayload = true (PayloadAmmoTurret) (#7409) 2022-08-21 17:10:39 -04:00
MEEPofFaith
11e3f85242 Fix more things that hit non-hittable units (#7408) 
* hittable check for EMP

* hittable check for Damage#status

* why push if don't get hit
 2022-08-21 17:09:47 -04:00
zenonet
dde9f895cf Added autoPause config for servers (#7405) 
* Extracted the method ServerControl.setPauseState()

* Added a comment to EventType.PlayerLeave

* Added the `pauseWithoutPlayers` config

* Revert "Extracted the method ServerControl.setPauseState()"

This reverts commit 45f5b01547.

* Renamed pauseWithoutPlayers to autoPause,
fixed manual- and automatic pausing to interfere
and made the server pause when hosting a new game

* Added a dot to the config description of `autoPause` and added my name to the contributors list

* Refactoring

* Merged remote-tracking changed I guess

* More refactoring

* More refactoring

* Removed logging about autoPause

* Removed another log I forgot in the last commit

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-21 10:32:58 -04:00
Anuken
ae83779253 Merge remote-tracking branch 'origin/master' 2022-08-20 11:54:54 -04:00
Anuken
c97a6b2f39 Fixed #7403 2022-08-20 11:54:49 -04:00
MEEPofFaith
6ca54d4f6a Fix units that can't be hit being hit by some things. (#7391) 
* Hittable check in checkTarget

* Remove hittable() and checkTarget() overlap

* Make PointBulletType abide collision types

There should probably be a thing for jsonable `buildingFilter`s, in the case that you want something that doesn't target blocks.

* PointBulletTypes should not be reflectable

* oop

* Use targettable instead of hittable

* targetable check for Damage#linecast

* targetable check for defenderAI

* I shot, and then I hit something, but it was some invisible thing in the way, so I guess I missed
 2022-08-19 22:05:11 -04:00
Anuken
b9e633a10e Merge remote-tracking branch 'origin/master' 2022-08-19 20:08:12 -04:00
Anuken
a8900d28f9 Fixed #7401 2022-08-19 20:08:08 -04:00
MEEPofFaith
35923329a1 ParticleEffect line cap option (#7392) 2022-08-18 23:07:13 -04:00
Anuken
34674f2297 Merge remote-tracking branch 'origin/master' 2022-08-18 12:25:57 -04:00
Anuken
153b00fe40 Fixed #7390 2022-08-18 12:25:52 -04:00
BlackDeluxeCat
cc3f14100d Fixed reactor light (#7385) 
* Fixed nuclear reactor light

* .
 2022-08-17 21:05:01 -04:00
Anuken
43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
Anuken
a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
Anuken
a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
Anuken
ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
BlackDeluxeCat
6842daf8fb Fixed duct unloader works with core-linked storage (#7367) 2022-08-15 06:59:11 -04:00
Anuken
b88b5fa32a Merge remote-tracking branch 'origin/master' 2022-08-14 15:40:01 -04:00
Anuken
f15a620c45 Allow neoplasm on water/arkycite/etc 2022-08-14 15:39:56 -04:00
Phinner
4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Anuken
1f318306a7 Merge remote-tracking branch 'origin/master' 2022-08-13 10:56:24 -04:00
Anuken
dbabb07528 Gradle 7.5.1 2022-08-13 10:56:19 -04:00
MEEPofFaith
25388ffe5f Better Duplicate Op Support (json/hjson) + 1 more op (#7355) 
* Better support for duplicate ops

* 'Mathf.curve' op
 2022-08-13 06:52:46 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Luna
e28dbfad69 Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Anuken
e4c6822cca JSON payload stack support 2022-08-11 08:43:58 -04:00
MEEPofFaith
3f96799c2e Make PayloadAmmoTurret accept units (#7320) 2022-08-11 08:38:45 -04:00
Lucky Clover
b3f43dbc03 worldCell.targetable = false (#7345) 2022-08-11 07:23:11 -04:00
MEEPofFaith
3fc0957197 Shielded wall shield size (#7343) 2022-08-10 14:52:20 -04:00
BlackDeluxeCat
5e63b89f4f Fixed ucontrol approach not applied to ground units (#7340) 2022-08-10 08:06:12 -04:00
Epowerj
648a4b5e61 Tweaked tech tree for peaks 2022-08-09 19:45:51 -04:00
Epowerj
1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj
43937db6df Added peaks to tech tree 2022-08-09 15:50:45 -04:00
Epowerj
63cf6f6fb2 Reduced breach tungsten damage 2022-08-09 15:49:51 -04:00
Epowerj
2344cc442b Added peaks to code 2022-08-09 15:47:43 -04:00
Anuken
6e11418fa4 Fixed #7331 2022-08-09 09:11:11 -04:00
Epowerj
901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
Anuken
bae64cb98a Median error fix 2022-08-08 17:34:46 -04:00
Epowerj
f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Anuken
469a49b3d6 Cleanup 2022-08-08 14:27:10 -04:00
BlackDeluxeCat
0802941cb8 Fixed HeatCrafter Consumes Less Liquid (#7288) 2022-08-08 14:24:45 -04:00
Anuken
fae3360dfc Fixed #7327 2022-08-08 14:05:01 -04:00
Anuken
94d13267e8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-07 22:54:30 -04:00
Anuken
01c3738275 Misc cleanup 2022-08-07 22:54:05 -04:00
JniTrRny
6a2c6e3a74 the return of deselectable (#7319) 2022-08-07 13:10:12 -04:00
Anuken
a28601d91c Interplanetary accelerator beta info text 2022-08-06 17:31:21 -04:00
Anuken
39ebc046ad Fixed objectives dialog scaling 2022-08-06 14:06:24 -04:00
Anuken
ecdedf383a Merge remote-tracking branch 'origin/master' 2022-08-06 13:38:35 -04:00
Anuken
32f3190762 Less stacking in objectives dialog 2022-08-06 13:38:31 -04:00
Lucky Clover
e4255755ec liquidTank should be consistant as well (#7311) 2022-08-06 13:32:13 -04:00