Commit Graph

10197 Commits

Author SHA1 Message Date
xStaBUx
0cd80b70b7 Water in cryofluid mixer & cultivator (#7244)
* criofluid mixer, cultivator & spore press liquids fix

water and oil now displayed in cryofluid mixer, cultivator and spore press

* 1

* 2
2022-07-28 09:43:52 -04:00
BlackDeluxeCat
df1df66c6c Update FilterOption.java (#7248) 2022-07-28 09:42:52 -04:00
RlCCJ
311cd86e47 Why is it here? (#7240)
BlockProducer already has buildSpeed.
2022-07-28 09:42:33 -04:00
BalaM314
d18579b59a Allow printflushing to null (#7243)
* Allow `printflush`ing to null

* Dumb
2022-07-28 09:41:31 -04:00
hortiSquash
02c4e905a5 More Optimized Unloaders (Serpulo) (#7249)
* Update Unloader.java

* some comments

* deleted highUnloadPriority
2022-07-28 09:41:11 -04:00
Anuken
c1971cb5b1 Fixed #7241 2022-07-28 09:30:19 -04:00
Anuken
5fb7c2a916 Fixed #7239 2022-07-28 09:26:28 -04:00
Anuken
fa3bd6dbc6 Fixed #7227 2022-07-23 13:15:54 -04:00
Anuken
ca04c85b92 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-23 13:09:17 -04:00
Anuken
50530e7534 Improved drillable stat display 2022-07-23 13:08:51 -04:00
RlCCJ
4ba91b56b5 Restrict the ipt (#7226) 2022-07-23 13:04:17 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
RTOmega
9a3a6c31b3 Adding Block: Heat Source (#6855)
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-22 13:59:32 -04:00
rly4498
f16894592f onShoot on StatusFieldAbility (#7221)
* onShoot on StatusFieldAbility

allows for more JSON gaming

* hmm
2022-07-22 13:43:37 -04:00
Anuken
00d86e81a4 completely unfinished class that I might finish later 2022-07-22 13:04:31 -04:00
Anuken
3b0729b64e Fixed #7222 2022-07-22 04:48:02 -04:00
Anuken
687d0b4f00 Misc minor bugfixes
at 4 AM
2022-07-22 03:51:24 -04:00
Anuken
5ae204dd22 Fixed #7218 2022-07-21 21:23:02 -04:00
Anuken
1476c4dacd Fixed #7213 2022-07-21 07:56:09 -04:00
Anuken
25a1d125c8 Fixed #7207 2022-07-20 15:58:24 -04:00
Anuken
4fbad2356d Mobile boosting unit fix 2022-07-19 11:34:44 -04:00
Anuken
90e9d37a9a Fixed #7201 2022-07-19 10:59:07 -04:00
Anuken
f1dc769b1f Fixed #7195 2022-07-19 07:42:58 -04:00
Anuken
606cdff17d Fixed #7198 2022-07-19 07:38:34 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Anuken
2c6b2a6fa9 Fixed #7193 2022-07-18 10:01:24 -04:00
Anuken
4b0bc6fe5c Fixed Serpulo cores being used on Erekir 2022-07-17 21:48:33 -04:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
26fbf4c71e Fixed NaN liquid efficiency 2022-07-17 19:12:57 -04:00
Anuken
1e7219f7d1 Merge remote-tracking branch 'origin/master' 2022-07-17 10:27:31 -04:00
Anuken
ebf9e82146 Crash fixes / Mod browser >=136 filter 2022-07-17 10:27:27 -04:00
Goobrr
764ec34ff5 Objective Editor UI Rework, Part 1 (#7179)
* Objective tile ui

* Fancier connectors

* New ninepatches

* Button styles
2022-07-17 09:21:31 -04:00
Anuken
c4d5126ac2 Minor bugfixes 2022-07-17 08:48:10 -04:00
Anuken
4fa3f4d8dd Intersect attack fix 2022-07-17 00:18:40 -04:00
Anuken
88e4ca4992 Fixed some portrait layout bugs 2022-07-16 15:30:02 -04:00
Anuken
8383d151a3 fixed release script but it's too late 2022-07-16 11:04:44 -04:00
Anuken
d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Anuken
f6093c864f Fixed map-3 waves 2022-07-15 18:57:01 -04:00
Anuken
47e639be28 Fixed more objective bugs 2022-07-15 17:26:43 -04:00
Anuken
926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Anuken
9a505753b0 Fixed block break particles not showing 2022-07-15 16:26:48 -04:00
Anuken
f1917fea3e Misc formatting 2022-07-15 16:18:11 -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
Anuken
3b1c8baca9 Merge remote-tracking branch 'origin/master' 2022-07-15 10:35:57 -04:00
Anuken
ee2ed4c469 Better color picker 2022-07-15 10:35:51 -04:00
null
0711d7075e Add a drawSelect to shockwave towers (#7172)
* add hover range display

* absolute buffoon

* so the local one works but that didn't

* newline
2022-07-15 08:45:05 -04:00
RlCCJ
5191dc1bd7 Fix: The flying unit has no crash damage (#7173) 2022-07-14 23:36:32 -04:00
Anuken
25e82d927f Fixed unit legs not resetting properly 2022-07-14 21:56:29 -04:00
Anuken
5ce95d7fc7 Added Android API level logging 2022-07-14 17:33:06 -04:00