Commit Graph

7115 Commits

Author SHA1 Message Date
Anuken
152a987c3a Experimental flow display 2020-03-26 17:19:18 -04:00
Prosta4okua
11723fdb2d
Update bundle_uk_UA.properties 2020-03-26 20:39:50 +02:00
Prosta4okua
c6f7da4e4e
Update bundle_ru.properties 2020-03-26 20:30:31 +02:00
Anuken
0f79017f02 Merge remote-tracking branch 'origin/master' 2020-03-26 12:39:59 -04:00
Anuken
d346442e86 Changed "global" -> "community" servers 2020-03-26 12:39:54 -04:00
Patrick 'Quezler' Mounier
975221f4cc
Revert "Revert "Revert "Revert "Revert "Repurpose branch to be played"""""
This reverts commit 164dd0c405.
2020-03-26 16:53:34 +01:00
GioIacca9
ec30b0fa94
Update bundle_it.properties (#1755) 2020-03-26 11:30:04 -04:00
Yoann Prot
379bef6b52
✏️ fix typo on tutorial for belgium translation (#829) 2020-03-26 11:23:37 -04:00
Anuken
f966489298 Various tweaks 2020-03-25 23:28:20 -04:00
whert-dev
1e1fbbc37b
Bind plasma sprite's size to reactor's size (#1754)
This will be useful for modded ImpactReactors that have different sizes. (Please correct my code if it is wrong).
2020-03-25 19:55:33 -04:00
Anuken
e7ffb0214f Fixed some invalid sectors 2020-03-25 16:04:19 -04:00
Anuken
3a7d3f4973 Merge remote-tracking branch 'origin/master' 2020-03-25 11:06:56 -04:00
Anuken
6cc2719ed7 Updated FBO method names 2020-03-25 11:06:52 -04:00
Anuken
51b03725a2 Oregen fixes 2020-03-25 10:41:26 -04:00
Anuken
4fb74d1e39 Cleanup 2020-03-25 00:18:40 -04:00
Fernando
70d7f68078
Update bundle_pt_BR.properties 2020-03-24 20:50:52 -03:00
Fernando
6ecee1e947
Update bundle_pt_BR.properties 2020-03-24 20:46:48 -03:00
Anuken
7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -04:00
Dexapnow
d18697a504
Update bundle_pl.properties (#1742)
Based of "missing tags"
2020-03-24 11:18:06 -04:00
Anuken
a1b64900ab 2 2020-03-24 00:33:59 -04:00
Anuken
2b4ce01fac Updated arc 2020-03-24 00:25:36 -04:00
Anuken
52b6e756bc Fixed some issues with scaled ninepatches 2020-03-24 00:22:28 -04:00
Anuken
74b6bc5dd3 Added distributed ore gen 2020-03-23 14:08:37 -04:00
Patrick 'Quezler' Mounier
104fd78966
Collapse while 2020-03-23 17:07:11 +01:00
Patrick 'Quezler' Mounier
6b27d19057
Alter comments 2020-03-23 17:05:03 +01:00
Patrick 'Quezler' Mounier
6228b5353f
Pack dump into conveyor rotation 2020-03-23 17:01:47 +01:00
Olexandr Nesterenko
75272c0a3e change scrap name 2020-03-23 12:30:39 +02:00
Anuken
2165a2af7d Better enemy spawn selection 2020-03-22 23:12:58 -04:00
Anuken
289cca3bf0 Cleanup 2020-03-22 13:16:11 -04:00
Anuken
53a6297b59 Better naval check 2020-03-22 11:30:15 -04:00
Anuken
ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken
ad45bebbdc Better spawn selection 2020-03-22 09:28:55 -04:00
Anuken
196a9dd77e Fixed incorrect plane projection 2020-03-21 19:11:13 -04:00
Anuken
148abaccd9 Cleanup 2020-03-21 16:40:39 -04:00
Anuken
4813d6c8ff More reasonable AI behavior 2020-03-21 14:29:00 -04:00
Anuken
3563c929af Cleanup 2020-03-21 12:08:21 -04:00
Anuken
d831fa7ba3 Added basic flying AI 2020-03-21 11:48:10 -04:00
Anuken
d673167477 Added basic ground AI 2020-03-21 10:49:38 -04:00
Anuken
c4d5314a1a Color script fixes 2020-03-19 20:15:41 -04:00
Anuken
d91ff744f2 Fixed color methods 2020-03-19 20:14:37 -04:00
Anuken
d2a2311cce Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/core/ContentLoader.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/entities/type/Player.java
#	core/src/mindustry/io/MapIO.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/ui/dialogs/HostDialog.java
#	core/src/mindustry/ui/dialogs/JoinDialog.java
#	core/src/mindustry/world/LegacyColorMapper.java
2020-03-19 20:07:45 -04:00
Anuken
966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken
f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
Anuken
6cbc42d9de Fixed unnecessary Color rgba methods 2020-03-19 20:00:04 -04:00
TheJaaju
998cc9535e
Update bundle_fi.properties
Titles
2020-03-19 22:54:08 +02:00
Anuken
c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
laohuaji233
da215425e9
Update bundle_zh_CN.properties 2020-03-19 15:53:38 +08:00
Anuken
6bf031d0f5 Planet render cleanup 2020-03-18 13:32:23 -04:00
TheJaaju
58a4ec1265
Update bundle_fi.properties 2020-03-18 08:42:16 +02:00