mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,303 Commits 4 Branches 160 Tags 2.1 GiB
3874d2c7a1
Commit Graph

15303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Epowerj
8bc05be30e Tweaks on peaks :) 2022-08-25 01:13:34 -04:00
Epowerj
b8349bae19 Tweaks on peaks :) 2022-08-25 00:53:49 -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
Epowerj
94690b6edd Tweaks to marsh 2022-08-24 21:49:13 -04:00
Github Actions
7b63ec203e Automatic bundle update 2022-08-24 17:49:15 +00:00
OSP
cc15703e2d
XCore ip change (#7440) 2022-08-24 13:48:22 -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
3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Github Actions
bef1b51ed2 Automatic bundle update 2022-08-24 14:39:08 +00:00
Anuken
eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
Anuken
e284be8be4 Fixed #7438 2022-08-24 10:27:49 -04:00
Epowerj
4ed4399e54 Progress on peaks 2022-08-23 23:09:43 -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
- MV -
f0300dcdde
TRANSLATION (it) (#7381) 2022-08-23 08:33:46 -04:00
Tima_Happy
cb5e784fcc
Moving CyanDustry into EradicationDustry (#7426) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v7.json

* Update servers_v7.json
 2022-08-23 08:11:11 -04:00
Anuken
d2894a14a0
Update servers_v7.json 2022-08-23 08:09:29 -04:00
MEEPofFaith
0cc1f97450
Fix non-continuous bullets being removed (#7423) 2022-08-23 08:04:35 -04:00
Anuken
b3e94c8425 Merge remote-tracking branch 'origin/master' 2022-08-22 22:06:45 -04:00
Anuken
976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Epowerj
9a0713523d Progress on peaks 2022-08-22 20:38:23 -04:00
Epowerj
14da646c57 Progress on peaks 2022-08-22 18:42:39 -04:00
키에르
88927b4cf5
Add Javadoc UTF-8 Encoding (#7418) 2022-08-22 15:59:47 -04:00
Anuken
a2798ae53c Robovm upgrade 2022-08-22 15:36:24 -04:00
Anuken
400a6a28c1 Fixed #7417 2022-08-22 14:39:08 -04:00
Anuken
4f8add37fd Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-22 13:45:37 -04:00
Anuken
fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
JarrerLog
a620485c89
Update servers_v7.json (#7415) 
I want everyone to know about my server
 2022-08-22 13:22:41 -04:00
JarrerLog
2754b7c0ba
Update servers_v7.json (#7414) 
I want my server to be known to everyone
 2022-08-22 11:38:39 -04:00
Volas171
908e1e9af9
Update servers_v7.json (#7413) 2022-08-22 11:16:32 -04:00
Anuken
39d215e148 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-22 10:27:52 -04:00
Anuken
450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Brandons404
fd2511af12
updated v6 and v7 server lists (#7411) 2022-08-22 07:32:35 -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