Commit Graph

9283 Commits

Author SHA1 Message Date
Anuken
81ce3a28a1 More distinct plastanium sprite 2021-01-14 13:46:27 -05:00
Anuken
32070a37f7 Fixed #4325 2021-01-14 11:26:16 -05:00
Anuken
95c04eb085 Minor sector damage calculation changes 2021-01-13 17:09:18 -05:00
Anuken
c2602fe6a0 Fixed #4319 2021-01-13 10:43:04 -05:00
Anuken
9ce5164a7e Merge remote-tracking branch 'origin/master' 2021-01-12 11:53:04 -05:00
Anuken
ee79bc5501 Replaced waves.never with ∞ 2021-01-12 11:52:51 -05:00
彭瑞暄
3dc70be516 Update zh-TW translations (#4290)
* Update zh-TW bundle, surge correction

Changed surge ammo characteristic "shock".
Thought "shock" as in only stunning or making the enemy flinch.
It means shocking the enemy with electricity and deal bonus damage when the unit is covered in water.

* Launch max UI

* Minor correction wave spawning
2021-01-12 11:25:41 -05:00
Anuken
e44c3899e8 Merge remote-tracking branch 'origin/master' 2021-01-12 10:19:36 -05:00
Anuken
e7885a405e Removed 3.5 map image message
Reasoning: 3.5 images and most other map images won't work in the editor. If you try to import a random image, it will give you an empty map. Only maps that were exported as images previously will work correctly.
2021-01-12 10:19:30 -05:00
MEEP of Faith
c6b60a2620 shootLength for other turrets that aren't PointDefenceTurrets (#4312) 2021-01-12 09:39:27 -05:00
Anuken
9b6c44757a Merge remote-tracking branch 'origin/master' 2021-01-11 16:07:55 -05:00
Anuken
0cbc4c0cc5 Fixed #4311 2021-01-11 16:07:46 -05:00
Patrick 'Quezler' Mounier
e83cfe6cab Display unit cap modifier for core blocks (#4163)
* Display unit cap modifier for core blocks

* Move maxUnits stat from crafting to general

* Omit string formatting
2021-01-11 14:30:58 -05:00
Anuken
912ea94828 Merge remote-tracking branch 'origin/master' 2021-01-11 10:14:28 -05:00
Anuken
6417073a82 Corrected parallax target check 2021-01-11 10:14:23 -05:00
BlueWolf
994194452d fix a comment typo (#4307) 2021-01-11 10:13:28 -05:00
Anuken
c716c16746 Fixed #4305 / Fixed #4309 2021-01-11 10:11:31 -05:00
Anuken
f188563052 Sort mod browser entries by date 2021-01-10 16:59:02 -05:00
Slava0135
2927348a6c power info fixes (#4303)
* power info fixes

* a better solution

* one little detail
2021-01-10 15:46:29 -05:00
Anuken
21f05c9d8a Merge remote-tracking branch 'origin/master' 2021-01-10 15:39:11 -05:00
Anuken
9b1c66ba15 #4298 2021-01-10 15:39:00 -05:00
BlueWolf
8b9b11f77f 1mil source output (#4299) 2021-01-10 15:33:31 -05:00
Anuken
9c846bd2c9 Invasion chance tweaks (#4297) 2021-01-10 15:27:17 -05:00
Anuken
7372bf37c2 Fixed #4301 2021-01-10 15:23:15 -05:00
Anuken
0a5a301573 Save building enabled state 2021-01-09 22:13:41 -05:00
Anuken
462a5b941e Merge remote-tracking branch 'origin/master' 2021-01-09 10:31:52 -05:00
Anuken
21fd20ea5b Targetp support for allied targets 2021-01-09 10:31:44 -05:00
Antsiferov Andrew
a0c7b33ff1 Add ModMeta#toString (#4292) 2021-01-09 10:06:12 -05:00
Anuken
b762a5028b Merge remote-tracking branch 'origin/master' 2021-01-08 12:22:46 -05:00
Anuken
2f83ba7f5c Logic battery control + Slight swarmer range buff 2021-01-08 12:22:32 -05:00
xzarfs
ff84d788a6 Changes to finnish translation (#4144)
Made existing translations more user friendly and added new translations. There are still big areas the translation is lacking, e.g. the tutorial.
2021-01-07 17:11:06 -05:00
Anuken
4c2f330e51 Merge remote-tracking branch 'origin/master' 2021-01-07 15:18:49 -05:00
Anuken
bd0f47c325 Faster weapon copy 2021-01-07 15:18:44 -05:00
genNAowl
13fbcb9ba8 Launch UI Max Button (#4238)
* max

* Add @Nullable

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-07 13:38:31 -05:00
Anuken
f231849a42 UnitCreateEvent / UnitDeployEvent split 2021-01-07 10:08:28 -05:00
Anuken
c420ad1a16 Merge remote-tracking branch 'origin/master' 2021-01-06 16:25:09 -05:00
Anuken
99aec4ad15 Fixed #4277 2021-01-06 16:25:05 -05:00
彭瑞暄
1be91961d6 core inc & boost meter (#4272) 2021-01-06 12:15:34 -05:00
Patrick 'Quezler' Mounier
f4bf8fd998 Add boost bars to overdrive projectors (#4255)
* Add boost bars to overdrive projectors

* Add bar.boost to bundle

* Intelij lied to me
2021-01-05 15:32:43 -05:00
VozDuh
5516435619 Custom Launch Pad Pod Textures (#4203)
* Custom Launch Pad Pod Textures

* Facepalm

* Fix

* Fix

* Fix

Co-authored-by: Anuken <arnukren@gmail.com>

* Fix

Anuke!

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-05 15:17:18 -05:00
Patrick 'Quezler' Mounier
fdf08ed51d Highlight all linked inventories on core selection (#4256)
* Highlight all linked inventories on core selection

* Loop cores instead of storage blocks
2021-01-05 10:43:36 -05:00
Patrick 'Quezler' Mounier
42fb6ffa0d Add core incineration to custom rules dialog (#4264)
* Update CustomRulesDialog.java

* Update bundle.properties

* Update core/assets/bundles/bundle.properties

Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>

Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
2021-01-05 10:37:37 -05:00
Anuken
0c4750781a Sound cleanup 2021-01-04 19:50:49 -05:00
Anuken
69eb8faf67 Fixed #4261 / Basic rotation shine effect 2021-01-04 17:22:18 -05:00
Anuken
0ab4f01d5d Better suicide bomb trigger check 2021-01-04 11:20:01 -05:00
Anuken
6361b7e57d Merge remote-tracking branch 'origin/master' 2021-01-04 11:06:19 -05:00
Anuken
961331c832 Minor turret targeting fix 2021-01-04 11:06:11 -05:00
彭瑞暄
6bd8f99be3 Updated Search Bar cleanup for zh-TW (#4186)
* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

* Merge down (#16, post 122)

* Fixed #4108

* [QoL] Chat modes (#3869)

Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).

* add new io server (#4109)

soon to be up gamemode

* typo (#4110)

* Fixed mined item flashing on clients

* Block Forge improvements (#4112)

* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot

* Up-to-date zh-TW translations (#4083)

* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>

* Higher power source output

* Update servers_v6.json (#4095)

* Update servers_v6.json

the ip changed to not make users confuse

* Update servers_v6.json

* Fixed #4120

* Fixed #4121

* Fixed #4122

* Better build beam visuals

* Don't render weather in full map screenshots

* Building priority fix

* Fixed #4128

* SearchBar class - add search bars to mods (#3267)

* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>

* Search bar cleanup

* Block (un)loader major improvements (#4127)

* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>

* "Search bar cleanup" update

* Hope this fixes merge conflict

* Delete servers_v6.json

* pain

* Sync (#21)

* Fixed #4108

* [QoL] Chat modes (#3869)

Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).

* add new io server (#4109)

soon to be up gamemode

* typo (#4110)

* Fixed mined item flashing on clients

* Block Forge improvements (#4112)

* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot

* Up-to-date zh-TW translations (#4083)

* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>

* Higher power source output

* Update servers_v6.json (#4095)

* Update servers_v6.json

the ip changed to not make users confuse

* Update servers_v6.json

* Fixed #4120

* Fixed #4121

* Fixed #4122

* Better build beam visuals

* Don't render weather in full map screenshots

* Building priority fix

* Fixed #4128

* SearchBar class - add search bars to mods (#3267)

* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>

* Search bar cleanup

* Block (un)loader major improvements (#4127)

* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled

* bugfixes, call me the mother of the block forge (#4135)

(anuke is the father)

* Fixed #4141 / Fixed #4136

* Faster power graph reload / Fixed iOS editor margin

* Remove 4 square blocks from the accelerator (#4139)

* Normalize rule comment line endings

Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself.

* Add files via upload

* Add files via upload

* Use sector preset name for maps if possible

* Fixed #4147

* Update servers_v6.json (#4148)

changed the port number for our attack server.
sorry for the inconvenience, i don't have control over the port number of this "alexmindustryattac.ddns.net" hosted server.

* Removed packed sprite section from CONTRIBUTING.md (#4152)

* Return large launchpad item costs (#4134)

* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.

* Sector damage tweaks

* Block loader/unloader progress bar changes (#4138)

* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down

* Draw reconstructor in region during placement & unconnected (#4143)

* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders

* Bugfixes

* Fixed #4164 / Fixed #4159

* fix german translation for editor.unsaved (#4169)

* update KO bundles (#3956)

* Update steam description for 6.0 update

* Update achievements.vdf

* oops.

* Update full_description.txt

* Update summary.txt

* add recent changelog

* Update bundle_ko.properties

* last update on this week

(well, sunday)

* upload android recent change-log

* critical fix

* [KO] Small fix (#4133)

* why

* Update bundle_ko.properties

* bundle_hu.properties (#4170)

I'am continue translating and adding lines to v6.

* [Bundle][RO] Translation update (#4115)

* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 43757a247e
- Typo fixes & various other improvements

* no

* yet another in_ID translation update (#4086)

* yet another in_ID translation update

* more id translate

Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>

* Cleanup

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com>
Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com>
Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com>
Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>

* Update gradle.properties

* Update bundle_zh_TW.properties

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com>
Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com>
Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com>
Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com>
Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com>
Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>
2021-01-04 10:38:18 -05:00
Antsiferov Andrew
4b71b4f80a Make mod browser case insensitive (#4258) 2021-01-04 10:33:43 -05:00
Anuken
5712190dab cleanup 2021-01-03 18:01:44 -05:00