1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 04:47:14 +03:00
Commit Graph

15016 Commits

Author SHA1 Message Date
Anuken
7680b4e0c5 Merge remote-tracking branch 'origin/master' 2022-07-17 21:48:37 -04:00
Anuken
4b0bc6fe5c Fixed Serpulo cores being used on Erekir 2022-07-17 21:48:33 -04:00
Github Actions
32871920b2 Automatic bundle update 2022-07-18 00:36:56 +00: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
Github Actions
ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky Clover
93f12a5544
Update bundle_zh_CN.properties (#7135)
* Update bundle_zh_CN.properties

* 部分补充

* 光彩统一改成光效

* Update bundle_zh_CN.properties

Thanks @SoMall-dumpling for review

* Suggestions from @xem8k5, @Cry0flu1d and more

* thanks mi2/xerxer

* miner fix

* Corrections from SoMall-dumpling

* Update suggestions from  @nanmenyangde

* liquid翻译讨论确定:液体->流体

* from @nanmenyangde

* suggestion from @SoMall-dumpling & @BlackDeluxeCat
2022-07-17 09:21:53 -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
8d63e22fd4 Merge remote-tracking branch 'origin/master' 2022-07-16 12:29:31 -04:00
Anuken
f13f69633e Fixed android deploy task 2022-07-16 12:29:27 -04:00
Github Actions
4ac7254842 Automatic bundle update 2022-07-16 15:32:30 +00:00
ThatOneBepis
4c80cf90cc
Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00
Ilya246
f34ec77312
distributorium rename to .pl (#7182)
this has already been discussed by us and does not need comment confirmation
2022-07-16 11:31:20 -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
830a771a90 Merge remote-tracking branch 'origin/master' 2022-07-15 19:28:40 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00: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
9eacbb45d1 glenn what did you do 2022-07-15 17:14:57 -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
98fb7bd41d Merge remote-tracking branch 'origin/master' 2022-07-15 16:18:15 -04:00
Anuken
f1917fea3e Misc formatting 2022-07-15 16:18:11 -04:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00: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
BetaEridani
d72d663219
Update bundle_fi.properties (#7164)
Swapped the places of two text lines to correct a mistake.
2022-07-14 23:37:14 -04:00
RlCCJ
5191dc1bd7
Fix: The flying unit has no crash damage (#7173) 2022-07-14 23:36:32 -04:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49
german erekir & v7 translation (#6869)
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-14 23:33:26 -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
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -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
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj
f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00