Anuken
8f4251db3a
Merge remote-tracking branch 'origin/master'
2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91
Fixed #7484
2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a
Merge branch 'map1'
2022-08-30 15:53:09 -04:00
Epowerj
26dc90e5a2
Hold back slag heater unlock until [4]
2022-08-30 14:56:58 -04:00
Epowerj
953b43e041
Tweaks to afflict research cost
2022-08-30 14:52:37 -04:00
Epowerj
9dbdb05ede
Rearranged tech tree for turrets
2022-08-30 14:43:47 -04:00
Epowerj
19ca24825c
Tweaks to surge block research costs
2022-08-30 14:05:05 -04:00
Epowerj
9996f3b6f5
Set a capture wave for ravine
2022-08-29 20:06:27 -04:00
Anuken
2f6ef4cefe
Merge remote-tracking branch 'origin/master'
2022-08-29 18:57:27 -04:00
Anuken
55c54b34f9
Fixed #7477
2022-08-29 18:57:20 -04:00
Epowerj
715dfb16ca
Adjusted tech tree for ravine
2022-08-29 18:46:34 -04:00
Epowerj
697e6d503f
Added ravine to campaign list
2022-08-29 17:44:19 -04:00
MEEPofFaith
2703c0cbc4
alwaysShooting ( #7475 )
2022-08-29 17:23:20 -04:00
Anuken
0d3c27dd59
Minor bundle tweaks
2022-08-29 14:26:29 -04:00
Anuken
e4fe73b332
Minor balance tweak
2022-08-29 13:40:15 -04:00
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