mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-04 16:09:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,467 Commits 4 Branches 160 Tags 2.4 GiB
8ea28e1ced
Commit Graph

6393 Commits

Author SHA1 Message Date
ian
b758b69243
Partially add to and fix swedish translations (#2052) 2020-05-13 14:37:05 -04:00
Anuken
c432639dfa Bugfixes 2020-05-12 21:41:45 -04:00
Anuken
ab49825d35 Merge remote-tracking branch 'origin/master' 2020-05-12 21:34:40 -04:00
Anuken
6a22d45320 Prototype unit cap mechanic 2020-05-12 21:34:27 -04:00
Summet
fea5142955
Replaced all upper-case colors to lower-case (#2044) 2020-05-12 20:03:35 -04:00
Alberto Galera
4910afbc82
Fix translation typo (#2045) 
* Fix translation typo

* typo
 2020-05-12 20:03:23 -04:00
Anuken
fe9df51721 Upgraded to 'implementation' / 'api' 2020-05-12 12:31:09 -04:00
Anuken
0663d8067a Merge remote-tracking branch 'origin/master' 2020-05-12 09:41:12 -04:00
Anuken
27ffefa0cd Added sprites 2020-05-12 09:41:07 -04:00
zethnest
3c4c046e1f
align opacity check with ItemBridge (#2036) 
* align opacity check with ItemBridge

* align opacity check with ItemBridge
 2020-05-12 09:38:27 -04:00
Anuken
f6d8658ee2 Fixed #2040 / Fixed #2039 / Fixed #2038 / Fixed #2037 / Fixed #2035 2020-05-12 09:34:26 -04:00
Anuken
7f3f1d7d76 Merge remote-tracking branch 'origin/master' 2020-05-11 23:40:34 -04:00
Anuken
43642ff546 Bugfixes / Cleanup 2020-05-11 23:40:23 -04:00
sk7725
911424b2e2
Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Anuken
8e50228df2 Merge remote-tracking branch 'origin/master' 2020-05-11 13:20:38 -04:00
Anuken
9cca79adaa Fixed #2032 2020-05-11 13:20:27 -04:00
Lapis
130eee35ec
Update bundle_ja.properties (#2029) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix
 2020-05-11 10:46:34 -04:00
Anuken
03d0849538 Merge remote-tracking branch 'origin/master' 2020-05-11 00:41:39 -04:00
Anuken
3ea2360290 Removal of unused assets/classes 2020-05-11 00:41:35 -04:00
TheMainOne
a5b235d829
Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec
Update bundle_ja.properties (#2026) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties
 2020-05-10 22:48:14 -04:00
Anuken
a344c1a5d0 Better sun 2020-05-10 19:17:08 -04:00
Anuken
686c451ea6 Minor tweaks 2020-05-10 17:22:13 -04:00
Anuken
c7d2be5a7f Selection tweaks 2020-05-10 13:58:04 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd
Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Summet
c62a87e81a
Deleting a block in the editor by right-clicking (#2021) 
* Deleting a block in the editor by right-clicking

* Small fix

Co-authored-by: Anuken <arnukren@gmail.com>

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-05-10 10:44:54 -04:00
Anuken
dabc891791 Cleanup 2020-05-10 10:37:36 -04:00
Anuken
0adc2811bb Bugfixes 2020-05-10 09:14:13 -04:00
Anuken
d6412bf19c Static cleanup 2020-05-09 22:25:19 -04:00
Anuken
fce89d4db5 Fixed #2015 2020-05-09 22:24:13 -04:00
Anuken
1fdd9dd124 Merge remote-tracking branch 'origin/master' 2020-05-09 16:29:07 -04:00
Anuken
f0d2f7b728 "grabage struct" 2020-05-09 16:29:01 -04:00
Lapis
53d60e9cf6
Update bundle_ja.properties (#2013) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo
 2020-05-09 10:21:34 -04:00
Anuken
bc658f9f45 Synced weather 2020-05-08 21:55:40 -04:00
Anuken
95a1d84eb9 Support for weather in rules / Sector weather 2020-05-08 21:51:17 -04:00
Anuken
d7eb365446 Merge remote-tracking branch 'origin/master' 2020-05-08 20:22:16 -04:00
Anuken
8d5cd7b814 Serialization that makes more sense 2020-05-08 20:22:11 -04:00
valtsu41
dcaf0dded5
Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0
Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
Anuken
aab97fefc8 Fixed puddles not appearing / Overdrive tweaks 
- Bridges, routers and junctions can (probably) be overdrived now, untested
 2020-05-08 16:41:59 -04:00
Anuken
bcec6261d1 Added rain, better snow implementation 2020-05-08 16:13:49 -04:00
Anuken
cda3c3743b Merge remote-tracking branch 'origin/master' 2020-05-08 09:30:48 -04:00
Anuken
4f3cf9466e Less water 2020-05-08 09:30:40 -04:00
laohuaji233
e5e325b25b
Update bundle_zh_CN.properties (#2007) 2020-05-08 09:20:44 -04:00
MEEP of Faith
739ce75154
Customizable Fragging Angle (#2006) 
* Customizable Fragging Angle

* I did it wrong.

* Undo that last change.

* Anuke told me to make it just forwards

* Thanks Anuke

My inexperience is very evident.
 2020-05-07 21:53:00 -04:00
Anuken
639738754a Removed startup dialog 2020-05-07 21:40:18 -04:00
Anuken
372b1311f7 Merge remote-tracking branch 'origin/master' 2020-05-07 21:37:54 -04:00
Anuken
2b9d618bd2 Implemented various suggestions 
- Pathfinding weighs walls more
- C disables all HUD
- Unloader doesn't store items
- Some bugfixes
 2020-05-07 21:37:41 -04:00
Lapis
1fd22f6d10
Small fix bundle_ja.properties (#1992) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f
Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
Anuken
d51a8611c3 Better exception output 2020-05-07 14:33:01 -04:00
Anuken
047652154e Cleanup 2020-05-07 14:08:27 -04:00
Anuken
542555d721 Merge remote-tracking branch 'origin/master' 2020-05-07 14:05:31 -04:00
Anuken
6ea8a0f583 cleanup 2020-05-07 14:04:58 -04:00
Anuken
561e94617c Better screen res support 2020-05-07 14:04:22 -04:00
Anuken
5aa2860fa4 Mobile support 2020-05-07 12:51:52 -04:00
Patrick 'Quezler' Mounier
018ef5daf4
Change baseunit pred variable from b to u (#2002) 2020-05-07 11:28:42 -04:00
Patrick 'Quezler' Mounier
8a48a8bf3d
Fix only the output of the last chat filter mattering (#1997) 2020-05-07 09:41:16 -04:00
Anuken
5aec051d9b progress 2020-05-06 19:07:37 -04:00
Anuken
8b5adca750 Early prototype loading screen 2020-05-05 23:01:12 -04:00
Anuken
346ac88009 Merge remote-tracking branch 'origin/master' 2020-05-05 14:28:51 -04:00
Anuken
07074046e6 Cleanup 2020-05-05 14:28:37 -04:00
LFlicker
735187e78a
Update bundle_ko.properties (#1986) 
* Update bundle_ko.properties

Typo correction

* Update bundle_ko.properties

* Update bundle_ko.properties

Typo Correction
 2020-05-05 11:06:32 -04:00
Anuken
4161698bb8 Removed quote requirement for events 2020-05-04 18:05:47 -04:00
Anuken
a4bd1dcc6d Mod event support 2020-05-04 17:57:08 -04:00
Anuken
8876c673f7 Bullet fix 2020-05-04 17:06:53 -04:00
Anuken
25178d0531 Merge remote-tracking branch 'origin/master' 2020-05-04 10:58:04 -04:00
Anuken
ea2adbd63b Editor fixes 2020-05-04 10:57:57 -04:00
Patrick 'Quezler' Mounier
f10bdbf775
Swap bottom & top liquid block regions (#1982) 2020-05-04 10:07:29 -04:00
Patrick 'Quezler' Mounier
19649104a7
Fix pump ohno liquid texture (#1979) 2020-05-04 10:04:18 -04:00
Patrick 'Quezler' Mounier
8280d11054
Move pump fluid sprite from production to liquid (#1980) 2020-05-04 10:04:00 -04:00
Patrick 'Quezler' Mounier
440226fecc
Scale stack conveyor edge regions for requests (#1981) 2020-05-04 10:03:50 -04:00
Koteyka_by
c920902481
Update bundle_be.properties (#1977) 
Fix a errors in a translate
 2020-05-04 09:09:58 -04:00
Anuken
90505a8e19 Fixed #1978 2020-05-04 09:09:40 -04:00
Anuken
23cb249c19 Possible scroll fix 2020-05-04 08:59:56 -04:00
Anuken
07a4b64b8a Removed unnecessary functional methods / Script cleanup 2020-05-04 00:01:45 -04:00
Anuken
834c15a808 client/server separation 2020-05-03 21:45:46 -04:00
Anuken
bdb1e29c85 Mod packet support 2020-05-03 21:28:51 -04:00
Anuken
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04:00
Anuken
bd4f3c039c Merge remote-tracking branch 'origin/master' 2020-05-03 18:14:25 -04:00
Anuken
b399ed1ed6 cleanup 2020-05-03 18:01:56 -04:00
xetrov05
c83ae5d34c
Translation to ZH_TW (#1974) 2020-05-03 17:50:57 -04:00
Anuken
ea753f2f83 cleanup 2020-05-03 17:49:21 -04:00
Anuken
85503a7a95 Fixed item bridges 2020-05-03 12:56:14 -04:00
Anuken
80a13237f4 Merge remote-tracking branch 'origin/master' 2020-05-03 12:08:15 -04:00
Anuken
f188fbb567 Config previews 2020-05-03 12:08:11 -04:00
Summet
63d2d32fd8
Update bundle_ru.properties (#1972) 2020-05-03 11:45:41 -04:00
Anuken
de77d80dab Save config when picking blocks 2020-05-03 11:35:58 -04:00
Anuken
5c00ced1e3 Better API for saving block configs 2020-05-03 11:32:46 -04:00
Anuken
8eeb668945 Merge remote-tracking branch 'origin/master' 2020-05-03 10:06:51 -04:00
Anuken
53e7c03730 Enabled flow rates by default 2020-05-03 10:06:47 -04:00
zethnest
9af3cf7a13
double-click disconnect mass driver (#1970) 2020-05-03 09:48:07 -04:00
Anuken
50e8586dc2 cleanup 2020-05-03 00:49:34 -04:00
Anuken
dd68241d1f Bugfixes 2020-05-02 23:15:36 -04:00
Anuken
cb6920b8be Commander unit component 2020-05-02 21:34:37 -04:00
Anuken
dce8b8faa1 Cleanup / Functioning formation 2020-05-02 17:58:12 -04:00
Anuken
3e87fff9db Cleanup 2020-05-02 14:54:01 -04:00
Anuken
b9aa8edf78 Added steering AI classes 2020-05-02 14:13:47 -04:00
Anuken
25f07e7bcb Docs 2020-05-02 12:58:54 -04:00
Anuken
fed4d10ec6 Cleanup 2020-05-02 12:30:29 -04:00
Anuken
fd62125862 Implementation of new region system 2020-05-02 12:28:50 -04:00
Anuken
069d572a97 New region loading system for blocks 2020-05-02 11:47:27 -04:00
Anuken
f9129170a1 Merge remote-tracking branch 'origin/master' 2020-05-02 10:53:52 -04:00
Anuken
342523a7de Fixed #1959 / Indication of selected units 2020-05-02 10:53:48 -04:00
Patrick 'Quezler' Mounier
969eb4c57f
Add missing super load call to StackConveyor (#1964) 2020-05-02 10:13:12 -04:00
Ali-C-Ila
e7c3c3f199
Update bundle_zh_TW.properties (#1965) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-05-02 10:13:01 -04:00
Anuken
b9d16d9fd9 Merge remote-tracking branch 'origin/master' 2020-05-02 00:51:49 -04:00
Anuken
ef42f022c7 Cleanup 2020-05-02 00:51:42 -04:00
Lapis
33d9501dd2
Update bundle_ja.properties (#1963) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag
 2020-05-01 23:55:22 -04:00
Anuken
c16c64b049 Trail experiment 2020-05-01 21:15:34 -04:00
Anuken
cc04537355 Merge remote-tracking branch 'origin/master' 2020-05-01 20:38:46 -04:00
Anuken
39f6bc30b7 Unit factory tweaks / AI fixes 2020-05-01 20:38:12 -04:00
MEEP of Faith
9e9776971f
I was told I made a mistake (#1962) 2020-05-01 20:32:16 -04:00
MEEP of Faith
9def4eaba4
Unjank Plated Conduit Background Transparency (#1961) 
The background transparent part was for some reason 3-6 different colors. Invisible, but still there.
 2020-05-01 18:09:39 -04:00
MEEP of Faith
941d2d0f39
Support custom bottom color (#1960) 
Should work similarly to flameColor on the GenericSmelter.
 2020-05-01 18:08:49 -04:00
Anuken
35bd6a40c5 Better unit factory implementation 2020-05-01 18:07:37 -04:00
Anuken
676ee8beda Merge remote-tracking branch 'origin/master' 2020-05-01 16:49:10 -04:00
Anuken
df63ce411d Cleanup / Removed collision process 2020-05-01 16:48:36 -04:00
Anuken
41754fc100 Minor optimization 2020-05-01 16:46:38 -04:00
Anuken
135b87fdb2 Cleanup, optimization 2020-05-01 16:35:18 -04:00
Anuken
3101fc8056 a performance disaster, part 2 2020-05-01 14:49:58 -04:00
Anuken
64bacea3c7 a performance disaster, part 1 2020-05-01 14:36:33 -04:00
zethnest
1608bfd038
Clear Selection with Double Click (#1958) 
* add onConfigureTileTapped method

* code cleanup

* Update ItemSource.java

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-05-01 12:30:07 -04:00
키에르
211be67e0e
Update bundle_ko.properties (#1948) 2020-05-01 12:24:01 -04:00
Anuken
cdc8d2bfe4 Removed experimental tag 2020-05-01 11:31:25 -04:00
Anuken
c1e1e3c25b Merge remote-tracking branch 'origin/master' 2020-05-01 11:23:44 -04:00
Anuken
e75d1a51a6 More accurate resource display / Server fix 2020-05-01 11:23:36 -04:00
Patrick 'Quezler' Mounier
c0e149f5f3
Finetune itemsmoved stat on stack conveyors (#1954) 2020-05-01 10:17:14 -04:00
DarkenWizMan
f8a24bc3a1
fixed more misspells, added new words (#1956) 
unit factory and drone changed to lithuanian counterparts
 2020-05-01 10:06:16 -04:00
Anuken
d99946df77 Fixed daggers not shooting 2020-04-30 23:54:04 -04:00
Anuken
52a3e17ec5 Natives 2020-04-30 22:56:43 -04:00
Anuken
3b340f7164 Better physics 2020-04-30 22:09:42 -04:00
Anuken
273f4590df Physics 2020-04-30 21:58:48 -04:00
Anuken
8de0ca7d6e Async logic framework, box2D dependencies 2020-04-30 20:03:11 -04:00
Anuken
626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
Anuken
c5859eb03a Fixed #1947 2020-04-30 17:34:29 -04:00
Anuken
3397557737 Sprites 2020-04-30 16:04:43 -04:00
Patrick 'Quezler' Mounier
a226cd390c
Cleanup stack conveyor code (#1946) 
- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
 2020-04-30 15:16:19 -04:00
Anuken
d50092e9a2 Merge remote-tracking branch 'origin/master' 2020-04-30 14:46:30 -04:00
Anuken
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
DarkenWizMan
864d6977ff
fixed mispels, added new words (#1945) 
Removed some capital letters, because in lithuanian names of things don't have capital letters in all words, only first word (unless each word gets it's own row). I was too unsure if I should change machine name capital letters.
Also changed uncorrectly used words.
Added new words.
NOTE: I haven't looked through all stuff, so, I may have missed something.
 2020-04-30 12:34:02 -04:00
Anuken
5887169f90 Cleanup 2020-04-29 19:54:20 -04:00
Anuken
ec5c060574 Merge remote-tracking branch 'origin/master' 2020-04-29 18:29:27 -04:00
Anuken
b66c1c2649 Many buildscript changes 2020-04-29 18:29:19 -04:00
Ali-C-Ila
d3c9689fff
Update bundle_zh_TW.properties (#1940) 2020-04-29 10:21:50 -04:00
Anuken
414b538e6b Merge remote-tracking branch 'origin/master' 2020-04-28 19:34:03 -04:00
Anuken
2ee99b3290 Cleanup 2020-04-28 19:33:59 -04:00
TheSlaylord
ae472fb03d
Update bundle_ru.properties (#1931) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2020-04-28 15:05:41 -04:00
Kittiskov
58cbfa599a
Update(Not complete yet) (#1381) 
I didn't update all these yet, because I have to sleep (yawn).

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-04-28 14:16:40 -04:00
Anuken
d4163f2d1c Merge remote-tracking branch 'origin/master' 2020-04-28 13:15:45 -04:00
Anuken
3ccf2ecc24 Projector visualization 2020-04-28 13:15:40 -04:00
Daan Breur
40ea1c865d
[LANG] NL Some Small Changes (#1546) 2020-04-28 12:32:09 -04:00
Lapis
1836cf9582
Update bundle_ja.properties (#1930) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-28 12:27:07 -04:00
GioIacca9
eef4137a59
Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Prosta4okua
ab0cb0c019
Ukrainian translation (#1924) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (fixed)

confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (yet again)

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Стан з гілки master взято

* Оновлено на 26.04.2020

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-04-28 12:26:52 -04:00
sk7725
14de9d7f5f
6.0 unit and block Korean Translation #1 (#1936) 2020-04-28 12:25:31 -04:00
Wina
621fa7862c
Updated Spanish Bundle (#1937) 
* Minor fixes

* Added Plastanium Conveyor Translation
 2020-04-28 12:25:11 -04:00
Anuken
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken
a4d49f5d17 Automatic assignment of entities 2020-04-27 01:31:41 -04:00
Anuken
2f3c098b50 Unit status cleanup 2020-04-26 23:24:05 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Patrick 'Quezler' Mounier
5fc8901e0b
Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Lapis
02fbc56137
Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Anuken
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
08f8323465 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
 2020-04-25 22:49:38 -04:00
Anuken
9b74b69950 Unit tweaks 2020-04-25 22:49:30 -04:00
MEEP of Faith
46762ab0e1
New power cells for everything (#1915) 
* Ground Unit Power Cells

* Flying Unit Cells

* Player/Mech Cells
 2020-04-25 22:48:58 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
MEEP of Faith
c7c638caa6
Copy code from UnitType.java (#1916) 
Support custom bottom region without scripting.
 2020-04-25 21:10:36 -04:00
Anuken
c875bb3f55 Merge remote-tracking branch 'origin/master' 2020-04-25 17:34:39 -04:00
Anuken
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Gdeft
9260cdee95
Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
d97d971cf6
Update bundle_ja.properties (#1908) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties
 2020-04-25 13:38:00 -04:00
Anuken
30d8737f67 Bugfixes 2020-04-25 12:49:19 -04:00
Anuken
9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken
838e12cc0a stop 2020-04-25 12:30:18 -04:00
sk7725
02394973b0
Fix inconsistencies in Korean Translation (#1912) 
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
 2020-04-25 12:24:56 -04:00
Patrick 'Quezler' Mounier
14c9050103
Remove power usage from phase bridge endpoints (#1910) 2020-04-25 10:32:00 -04:00
Anuken
81af481d3a Removed sleep 2020-04-25 10:12:37 -04:00
Anuken
2e2c8ceab4 Bugfixes 2020-04-25 00:04:14 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
32a182cd01 Unit parsing cleanup 2020-04-24 15:45:57 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken
5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken
1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Anuken
018fe5dea2 Added lights for laser turret projectiles 2020-04-24 09:50:40 -04:00
Anuken
eeb88df5f6 Bugfixes 2020-04-23 17:45:12 -04:00
Patrick 'Quezler' Mounier
cf186e0219
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites2.png
 2020-04-23 21:15:11 +02:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken
87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken
b68b3a1837 Layer tweaks 2020-04-23 14:04:31 -04:00
Anuken
2aa05f989b Merged in sprite sorting 2020-04-23 14:00:55 -04:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken
c738dcb42e progress 2020-04-23 12:52:16 -04:00
Anuken
1bf5b19889 progress 2020-04-23 12:35:49 -04:00
laohuaji233
37240478b8
Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Anuken
c6e4bf1fa4 progress 2020-04-23 11:06:58 -04:00
Anuken
71e8c088a6 progress 2020-04-23 11:01:14 -04:00
Anuken
989ee895e8 Functional sorting 2020-04-23 10:25:46 -04:00
Anuken
2538273402 progress 2020-04-23 00:41:18 -04:00
Anuken
18b68fefed how did this compile 2020-04-23 00:16:41 -04:00
Anuken
362846bd68 progress 2020-04-23 00:03:03 -04:00
Anuken
6cf422eebf progress 2020-04-22 17:23:30 -04:00
Álvaro Manzanas
cf69fa1d7c
Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Anuken
fc4f8619f8 progress (purge) 2020-04-22 16:17:43 -04:00
Anuken
c5f93139bd progress 2020-04-22 16:06:26 -04:00
Anuken
9beb23b0e4 progress 2020-04-22 15:19:39 -04:00
Anuken
d154361e75 Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting 2020-04-22 14:34:34 -04:00
Anuken
67d87f023b Cleanup 2020-04-22 14:22:33 -04:00
Anuken
da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken
a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Anuken
58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Patrick 'Quezler' Mounier
561198f517
Fix issue with uneven dumping 2020-04-18 13:39:12 +02:00
Patrick 'Quezler' Mounier
16a1483f55
Require 4 loading docks to saturate a belt 
Which encourages using them right from the factory, instead of simply connecting it up to a full titanium belt.
 2020-04-18 13:28:32 +02:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300
Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340
Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
da99286826
Remove obsolete valid check 2020-04-16 20:33:52 +02:00
Patrick 'Quezler' Mounier
79a095faa8
Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Anuken
2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Patrick 'Quezler' Mounier
a05f4338c5
Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0
Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier
361a540ed3
Merge branch '6.0' into crater 2020-04-16 19:10:10 +02:00
Patrick 'Quezler' Mounier
a83546bc9d
Call bumps & upstreams from the objects themselves 2020-04-16 19:01:27 +02:00
Patrick 'Quezler' Mounier
e66a1a92c3
Phase out the need for isSleeping 
Thanks to knowledge gained from the previous commit.
 2020-04-16 18:56:00 +02:00
Patrick 'Quezler' Mounier
b599bafd5e
Override isvalid for sleeping craters 2020-04-16 18:48:38 +02:00
Patrick 'Quezler' Mounier
589d4c92d1
Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier
b9b8a4a2f7
Move update function up 
It felt wrong to put it down below.
 2020-04-16 18:17:00 +02:00
Patrick 'Quezler' Mounier
7df44ec060
Implement anuke’s size calculation 2020-04-16 18:12:51 +02:00
Patrick 'Quezler' Mounier
83511368f6
Stash shadow draft 2020-04-16 17:44:43 +02:00
Anuken
c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken
713dbccf74 Bugfixes 2020-04-16 11:30:42 -04:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Anuken
ea0358d570 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-04-16 09:44:36 -04:00
Anuken
42f227195c Better payload framework 2020-04-16 09:44:31 -04:00