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

10218 Commits

Author SHA1 Message Date
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken
d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -04:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
router
91440e7055 drill mined item sensing (#7460) 
* add drill sensing

* PROPERLY
 2022-08-27 11:18:14 -04:00
Mythril382
32c8167b7c drawSelect for RepairTower (#7447) 2022-08-26 08:07:59 -04:00
Anuken
82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken
3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken
8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
xStaBUx
47d335b629 Better Discord dialog (#7445) 2022-08-25 14:46:49 -04:00
Epowerj
9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Anuken
276a59b874 Fixed #7441 2022-08-25 00:49:11 -04:00
Epowerj
c6ec64cde2 Changed ship refabricator research cost 2022-08-25 00:02:49 -04:00
Epowerj
07d7eda4c8 Chemical combustion chamber buff 2022-08-24 22:08:43 -04:00
Anuken
7a8155965a Merge remote-tracking branch 'origin/master' 2022-08-24 22:08:15 -04:00
Anuken
550d76e372 Minor shockwave tower buff 2022-08-24 22:08:10 -04:00
Epowerj
a2dbe20885 Made citadel core locked behind peaks for now 2022-08-24 21:57:36 -04:00
Epowerj
3b239ee368 Changed sublimate research requirements 2022-08-24 21:56:46 -04:00
MEEPofFaith
7ac00d0aaf Move damageMultiplier to BulletType (#7436) 
* Move bullet damage multiplier to bulletType

* Is this better?

I don't know much about optimization, is this any better than before?

* Revert "Is this better?"

This reverts commit b83723701f.
 2022-08-24 13:48:06 -04:00
Anuken
e284be8be4 Fixed #7438 2022-08-24 10:27:49 -04:00
Anuken
1dc910afe9 Merge remote-tracking branch 'origin/master' 2022-08-23 09:10:20 -04:00
Anuken
ebf2094950 LaserTurret sound fix 2022-08-23 09:10:15 -04:00
MEEPofFaith
0cc1f97450 Fix non-continuous bullets being removed (#7423) 2022-08-23 08:04:35 -04:00
Anuken
976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Anuken
400a6a28c1 Fixed #7417 2022-08-22 14:39:08 -04:00
Anuken
fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
Anuken
450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Anuken
57c07b7ebb More turret SFX 2022-08-21 23:53:07 -04:00
Anuken
f88ff59d49 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-21 20:44:12 -04:00
Anuken
2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
MEEPofFaith
9811aa03ec Stay warmed up while charging (#7410) 
* Stay warmed up while charging

* Same with unit weapons

also add lenearWarmup
 2022-08-21 17:11:13 -04:00
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