Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,845 Commits 4 Branches 180 Tags
f91910e84f7adb8c4866140ed7001af136ccf678
Commit Graph
10845 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny KimandGitHub f91910e84f conductsTo() returning whether to conduct itself to adjacent builds (#4354) 
* conductsTo

* insulated block no longer conducts

* moved both checks to be symmetrical
 2021-01-18 17:45:45 -05:00
Joshua FanandGitHub 2da128678a Always allow zoom while controlling unit that can't build (#4371) 2021-01-18 17:44:01 -05:00
genNAowlGitHubLeonwang4234
 		18a382b07a Draw Conveyor Items under Blocks (#4372) 
* Draw Conveyor Items under Blocks

* Remove new layer in favor of subtraction

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-01-18 17:34:17 -05:00
Anuken 83a4f56679 Fixed #4368 2021-01-18 17:23:16 -05:00
Anuken ffad9cb9a9 Merge remote-tracking branch 'origin/master' 2021-01-17 15:54:49 -05:00
Anuken 6a63956b71 Anuken/Mindustry-Suggestions/issues/1808 / Less fire in rain 2021-01-17 15:54:43 -05:00
Patrick 'Quezler' MounierandGitHub 32a1d91faf Use Player.deathDelay + 1 instead of magic number (#4344) 2021-01-17 15:33:19 -05:00
Anuken 634d9d1a40 Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343 2021-01-17 15:31:22 -05:00
Anuken f9adcfeed1 Ground units: Avoid stepping onto dangerous/deep floor 2021-01-17 09:21:11 -05:00
Anuken 02ef633529 Removed redundant parens 2021-01-15 17:10:38 -05:00
Patrick 'Quezler' MounierandGitHub f3b1ef02e3 Scale impact reactor warmup time with boost (#4317) 2021-01-15 17:09:39 -05:00
Anuken 2d3a9b605a Fixed #4337 / Fixed #4336 2021-01-15 17:09:12 -05:00
Anuken 718a40d742 More pattern matching 2021-01-15 16:04:26 -05:00
Anuken 650d47991e Formatting 2021-01-15 12:43:37 -05:00
Anuken 6ec76409ef Fixed #4335 2021-01-15 12:38:42 -05:00
Anuken 136c8cfcd2 Cleanup + Generic cross rendering 2021-01-15 11:34:33 -05:00
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
Anuken 07e8b4334b Merge remote-tracking branch 'origin/master' 2021-01-10 16:33:27 -05:00
Anuken c0e955dc1f Updated to Gradle 6.8 2021-01-10 16:33:20 -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
MilanandGitHub 96c8e0f415 add resolveDependencies gradle task (#4302) 2021-01-10 15:39:50 -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