Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,924 Commits 4 Branches 180 Tags
1674b2dfd614732225582de846c0b80e00859217
Commit Graph
9989 Commits
Author SHA1 Message Date
Anuken bceb7b5809 Merge remote-tracking branch 'origin/master' 2021-01-15 11:16:12 -05:00
Anuken a342a7d638 Cleanup & bugfixes 2021-01-15 11:16:08 -05:00
MEEP of FaithandGitHub 956f4659c7 Sound stuff (#4332) 2021-01-15 10:13:41 -05:00
Anuken 593a7b060c Fixed #4334 2021-01-15 10:04:56 -05:00
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
彭瑞暄andGitHub 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 FaithandGitHub 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' MounierandGitHub 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
BlueWolfandGitHub 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
Slava0135andGitHub 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
BlueWolfandGitHub 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 AndrewandGitHub 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
xzarfsandGitHub 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
genNAowlGitHubLeonwang4234
 		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
彭瑞暄andGitHub 1be91961d6 core inc & boost meter (#4272) 2021-01-06 12:15:34 -05:00
Patrick 'Quezler' MounierandGitHub 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
VozDuhGitHubAnuken
 		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
Anuken 315cbaec47 progress 2021-01-05 11:17:20 -05:00
Patrick 'Quezler' MounierandGitHub 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' MounierGitHubYellOw139
 		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