Commit Graph

124 Commits

Author SHA1 Message Date
Cubical box
93d2f60b56
Boss music for non-wave guardians (#9964)
* why do I hear guardian music

* Update contributors

* format

* switch up

* switch up

* why

* no traces left behind
2024-06-20 10:50:01 -04:00
Jason
f26b03dc6c
Map rule for air spawns (#9922)
* air use spawns

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add the rule

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add rule in ui

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* bundle

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* tie it to rules.waves

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* :)

Contributing.md says yes

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* indent

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
2024-06-16 00:34:47 -04:00
CoCo
e23602f580
Update Name (#9904)
I have changed my name recently and so it's up-to-date.
2024-05-31 09:31:28 -04:00
Andrey Andreyevich Bienkowski
08429b5492
Add turret ammo capacity to the in-game help (#9777)
* Add turret ammo capacity to the in-game help

* Rename max shots to ammo capacity

* Rename ammo multipier to ammo per item
2024-05-03 14:11:23 -04:00
ApsZoldat
999a63c5f4
Minor fixes (#9467)
* Minor fixes

* Change javadoc for statusSpeed()

* 🧠🔨
2024-01-31 16:12:49 -05:00
Redstonneur1256
7440f195ba
Allow markers to use any texture (#9455) 2024-01-14 21:55:37 -05:00
summoner001
0f3b5d155e
Update bundle_hu.properties (#9340)
* Update bundle_hu.properties

Translations, and follow the updates

* Update contributors

I'm Here :)

* Update bundle_hu.properties

add missing charachters

* Update bundle_hu.properties

update

* Update bundle_hu.properties

updates

* Update bundle_hu.properties

correction of uppercase and lowercase letters
other reformulations
filling in missing texts and words

* Update bundle_hu.properties

fixing mistakes from the previous updates
2024-01-03 17:02:44 -05:00
BalaM314
35df3202ae
Add config option to disable logging trace requests (#9401)
* Add config option to disable logging trace requests

* Actually, just remove the trace logging

* Might as well
12 (soon 13) merged PRs
2023-12-23 09:16:48 -05:00
OpalSoPL
6b04f7eb1c
PL translation of missing texts (#9040)
* translation of most of the missing translations

* Update contributors
2023-09-09 19:34:47 -04:00
Anuken
95a7a181e0
Update contributors 2023-06-25 13:36:03 -04:00
Somka000
a20ca67527
Update contributors (#8748)
I did several Polish translations (I also helped translators since 2018), reported many bugs, had my own server, encouraged many people to play mindustry etc.
2023-06-22 17:15:07 -04:00
夜狐
aefcb7746a
Turn Issue Templates into Issue Forms for better structure (#8734)
* Turned Issue Template into an Issue Form

* Bug Fix in Form

* Added Yoru Kitsune to credits

(I did some translations and bug fixes)
2023-06-20 13:22:08 -04:00
red
a650018b6e
Update bundle_pt_BR.properties (#8687)
* Update bundle_pt_BR.properties

i translated the rest of the stuff to brazilian portuguese :D

* Update contributors

* Update bundle_pt_BR.properties

* Fixed color translation

* i fixed the miss conjugated verbs and translated one more line

---------

Co-authored-by: red <80164245+Redgabriel13-red13@users.noreply.github.com>
2023-06-16 20:12:59 -04:00
SITUVNgcd
d09f4c0db5
Update Vietnamese translation (#8663)
* Update Vietnamese translation

- Fixed mistake in #8654: Changed new line to `\n` instead of `\r\n`.
- Update and translate new strings.

* Add SITUVNgcd as contributor
2023-06-03 01:00:29 -04:00
WayZer
0496d2108c
fix NPE in SpawnGroup.write (#8584)
* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
2023-05-11 22:21:05 -04:00
xStaBUx
a3dbbe63c4
Better planet selection (#8572)
* Better AboutDialog

* I'm there!

* New Planet Select UI

* fix

* Better Planet Selection

* no
2023-05-10 12:54:18 -04:00
JniTrRny
eba58c73e6
Update bundle_th.properties (#8532)
* 6 months of doing nothing

* Why am I up there

* More lore to the descriptions

* RIP original item description

* revenge of the item details

* new vocabulary just dropped

* cancel transliteration

sounds kinda lame, so might revert it later.
2023-04-28 10:40:32 -04:00
Xasmedy
c30cbc0f20
Update contributors (#8450) 2023-03-31 16:30:14 -04:00
Phinner
d3a90d68d1
Update bundle_fr.properties (reopen of #7883) (#7918)
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀
2023-01-07 13:22:58 -05:00
Даркнесс#3729
fcca002823
[Translation] RU V7 translation (#7785)
* [Translation] RU V7 translation

* Категории процессоров

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 👀

* Update bundle_ru.properties

* скилл исьюше

* Подсказки для командного режима

* Немного перевел цели секторов

* попробовал сделать описания юнитов :/

* Update bundle_ru.properties

* Update bundle_ru.properties

* дрели

* Create bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* нагрев -> тепло

* Подсказки

* Update contributors

* Update bundle_ru.properties

* скилл иссуе

* Update bundle_ru.properties

Co-authored-by: Evgenij <86189625+Kowkodivka@users.noreply.github.com>
Co-authored-by: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
2022-11-10 08:22:10 -05: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
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
BlackDeluxeCat
cc3f14100d
Fixed reactor light (#7385)
* Fixed nuclear reactor light

* .
2022-08-17 21:05:01 -04:00
GlennFolker
695c19d0b0
Tree-like objective node structure (#7152)
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
2022-07-15 10:41:18 -04:00
Alex25820
6323c926f8
Update bundle_sv.properties (#7077)
* Update bundle_sv.properties

* Update contributors

Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-03 14:47:26 -04:00
1stvaliduser
d4bd6796fc
Update bundle_uk_UA.properties) (#7102)
* Update bundle_uk_UA.properties

A lot of stuff

* :)
2022-07-01 11:48:24 -04:00
smol
1c1b1295d1
changes (#7089)
* a

* i guess so

* despawnUnitCount, which i forgot to include

* changes + despawnUnitRadius field

* enter?

* no

* can

you not
2022-06-29 12:39:10 -04:00
KayAyeAre
b72702957b
Selectable mod releases (#7079)
* filterable power node connections

* selectable mod releases

* Update contributors

* selectable mod releases

* Update contributors

* Revert "Merge branch 'master' of https://github.com/KayyAyeAre/Mindustry"

This reverts commit 1f210a898a, reversing
changes made to 8ba6d4b2aa.

* move the release selection to a new button
2022-06-27 09:56:45 -04:00
Goobrr
625f7e9936
LStatement categories + improved UI (#7046)
* LStatement categories + improved UI

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>

* annihilate LStatement#color

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>
2022-06-19 10:57:49 -04:00
Rex
104e65a868
Update contributors (#6856)
At a request
2022-06-08 11:38:23 -04:00
xem8k5
f8de42d111
Update contributors (#6866)
Co-authored-by: Anuken <arnukren@gmail.com>
2022-06-08 09:22:35 -04:00
BlueWolf
38b0a664f4
so i made a slag heater (#6925)
* Add slag fueled heater

* i have no idea why i have to do this but i do

Co-authored-by: Blue <415bluewolf@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2022-06-08 09:20:35 -04:00
ErrorInCode
1b9089aa30
Stats for New Blocks (#6913)
* Stats added

* Fix bug + add WallCrafter speed

* Add more stats

* Update contributors
2022-06-08 09:03:37 -04:00
Rex
19d5170137
Update contributors (#6836) 2022-05-11 20:13:47 -04:00
Goobrr
0f3780dbb2
GameOverDialog rework (#6783)
* GameOverDialog rework

* cleanup
2022-05-08 09:26:49 -04:00
Anuken
b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
2022-04-20 14:16:20 -04:00
Qendolin
2dae8fdef4
Use sprites instead of polygons (#6725)
Lines.circle is quite expensive and used for some minor effects. This has been changed to use sprites in certain places.
2022-04-20 14:15:35 -04:00
YozoZChomutova
ee3911cceb
Updated bundle_cs.properties (#6716)
* Updated bundle_cs.properties

All unstraslated words I've found were translated. Spacing between lines were synchronized with bundle.properties. +Added self to contributors file.

* Updated bundle_cs.properties

Replaced with shorters words, fixing issue with multilined text in buttons.
2022-04-20 10:48:13 -04:00
Jerzozwierz
41b22ba6a6
Update Contributors (#6689)
Translation, I would also like to translate later versions of game :)
2022-04-01 15:29:21 -04:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
2022-01-27 14:58:44 -05:00
CPXMC
30070ce759
Change my main name in Contributors (#6513)
CPXMC to PCX-LK
2022-01-21 20:05:48 -05:00
Anuken
d1206d2e2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
2022-01-17 15:44:09 -05:00
Paweł Stolarski
6a75d84f48
Evolveye (polish translator of 3.x version) (#6502) 2022-01-17 14:53:35 -05:00
Anuken
1c49bcc3b1 Added tech font attribution 2021-12-06 18:06:38 -05:00
hortiSquash
134ef9e00e
hortiloaders hotfix randomness (#6283)
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
2021-11-01 17:34:40 -04:00
Fernando
c15f82297d
Update bundle_pt_BR.properties (#6127)
* Update bundle_pt_BR.properties

Add missing translations

* Update contributors

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* h

* Update bundle_pt_BR.properties
2021-10-27 14:39:30 -04:00
hortiSquash
c9eed5a936
horti and the better unloaders (#6201)
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
2021-10-22 10:57:16 -04:00
Darkness6030
d254d971a9
Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00