Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,814 Commits 4 Branches 180 Tags
4b0bc6fe5c01391293f82e8339529fc3831a64b2
Commit Graph
5684 Commits
Author SHA1 Message Date
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
GoobrrandGitHub 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
GlennFolkerandGitHub 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
nullandGitHub 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
RlCCJandGitHub 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
Anuken cd67e70ada Fixed tests 2022-07-14 15:40:21 -04:00
Anuken 67da71b0f0 Merge branch 'maps' of https://github.com/Anuken/Mindustry 2022-07-14 15:32:33 -04:00
Anuken f32e39fb86 WIP unit tether component 2022-07-14 15:32:23 -04:00
Epowerj b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj 251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Anuken 9dce4f36f7 Collaris tweaks 2022-07-14 10:06:15 -04:00
Anuken 62332fbebb WIP chnages to collaris weapon 2022-07-13 22:57:13 -04:00
Epowerj e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
Anuken a734f8423c Fixed #7167 2022-07-12 13:50:02 -04:00
Epowerj 352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Anuken fc5e40a857 Crash fix 2022-07-11 21:57:53 -04:00
Epowerj b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Anuken 4230e3b8c2 ConsumeGenerator liquidOutput -> outputLiquid 2022-07-11 18:44:49 -04:00
Epowerj 4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Anuken 72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Epowerj 9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Anuken 2fd8134700 First phase of generator cleanup 2022-07-11 16:59:07 -04:00
Anuken 411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
Epowerj 1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Anuken 4ea1e26c73 Merge remote-tracking branch 'origin/master' 2022-07-10 07:37:06 -04:00
Anuken 55e78c9dce Minor bugfixes & requirement tweaks 2022-07-10 07:37:01 -04:00
code-explorer786andGitHub 29085b95b7 Fix setblock block not accepting @air (#7160) 2022-07-09 21:21:29 -04:00
Mythril382andGitHub af80db0dfd SwitchBlock clickSound (#7158) 2022-07-09 11:29:39 -04:00
Anuken 311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00