mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 04:28:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,136 Commits 4 Branches 160 Tags 2.3 GiB
2f6ef4cefe
Commit Graph

12791 Commits

Author SHA1 Message Date
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
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
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
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
Rex Aliis
62a3f30755
Update contributors (#7406) 2022-08-21 10:31:41 -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
ddc637eee6 Merge remote-tracking branch 'origin/master' 2022-08-17 10:34:39 -04:00
Anuken
43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
ManuWar73
5a2ba71198
Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Anuken
a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
Anuken
f9ba1c3e04 Merge remote-tracking branch 'origin/master' 2022-08-16 07:24:00 -04:00
Anuken
a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
Github Actions
b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24
dff0a8294e
Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions
03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄
1f57332091
Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas Widyantoko
287ccf7e84
Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan Josep
fd70598476
Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
Anuken
ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
K0baU
fe1d81b4d5
Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -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
Github Actions
522070be4b Automatic bundle update 2022-08-13 17:54:18 +00: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
Joan Josep
8132e1f3aa
Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions
1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
Phinner
935d096b26
French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00
Github Actions
f3154d606b Automatic bundle update 2022-08-11 16:07:20 +00:00
Anuken
8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Github Actions
2f7a646e2b Automatic bundle update 2022-08-11 15:37:24 +00:00
Luna
e28dbfad69
Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Anuken
1a85c85a22 Fixed assembler module input edge sprite 2022-08-11 10:44:11 -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
Epowerj
ce8d51e18e Work on peaks 2022-08-10 10:52:59 -04:00
BlackDeluxeCat
5e63b89f4f
Fixed ucontrol approach not applied to ground units (#7340) 2022-08-10 08:06:12 -04:00
Github Actions
44af0bc08b Automatic bundle update 2022-08-10 02:51:16 +00:00
ThatOneBepis
0fa21ce165
Previous "update bundle_sr.properties" but no Sine shenanigans (#7333) 
* Update bundle_sr.properties

* ln but with angles

* rollback

* you saw nothing
 2022-08-09 22:50:14 -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
bc38d71f98 Progress on peaks 2022-08-09 16:52:36 -04:00
Epowerj
9f9e854c5f Progress on peaks 2022-08-09 16:47:13 -04:00
Github Actions
75b5efd5e2 Automatic bundle update 2022-08-09 20:03:27 +00:00
Nunting
a31175377a
Update bundle_ko.properties (#7307) 
* Update bundle_ko.properties

Unification of reactor terms. 
원자로 -> 반응로 통일. 같은 의미이지만 어감이 다름.

Added detailed description of parallax for beginners. This is not official and can be removed at any time.
초보자를 위한 패럴랙스 디테일 추가. 공식 설명이 아니므로 제거될 수 있음.

* Update bundle_ko.properties

토륨/핵융합 반응로->원자로로 복원
 2022-08-09 16:02:28 -04:00
SUS
f01278cf72
Update bundle_uk_UA.properties (#7318) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)

* Update bundle_uk_UA.properties

Start...

* Update bundle_uk_UA.properties

1

* Update bundle_uk_UA.properties

2

* Update bundle_uk_UA.properties

3.1

* Update bundle_uk_UA.properties

4

* Update bundle_uk_UA.properties

5

* Update bundle_uk_UA.properties

6

* Update bundle_uk_UA.properties

7

* Update bundle_uk_UA.properties

8

* Update bundle_uk_UA.properties

Finally (I'm waiting)
 2022-08-09 16:02:19 -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
Epowerj
48cb99774a Added peaks 2022-08-09 15:46:32 -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
彭瑞暄
af503d1a50
Update bundle_zh_TW.properties (#7190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2022-08-07 21:38:00 -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
Epowerj
4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -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
Anuken
9d1c03ccd9 Merge remote-tracking branch 'origin/master' 2022-08-06 13:30:52 -04:00
Anuken
45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
SoMall-dumpling
aa5ba1a3aa
Update FlakBulletType.java (#7313) 
fix erekir core unit make flak bullets explode
 2022-08-06 13:29:47 -04:00
Anuken
e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00