mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 20:33:50 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,980 Commits 4 Branches 160 Tags 2.3 GiB
79a095faa8
Commit Graph

6980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
 2020-03-17 20:03:12 -04:00
Anuken
12d4aab48a Tweaks 2020-03-17 20:02:38 -04:00
Anuken
71f20f928a
Update build.gradle 2020-03-17 20:01:44 -04:00
TheJaaju
b874eecd5f
Update bundle_fi.properties 
+ translations
 2020-03-18 01:40:29 +02:00
Ali-C-Ila
0d19068219
Update bundle_zh_TW.properties (#1718) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-03-17 12:02:56 -04:00
TheJaaju
b0dddb2a7c
Update bundle_fi.properties (#1720) 
added translations and fixed a typo
 2020-03-17 12:02:47 -04:00
Anuken
0ed21a1d5f Bugfixes, cleanup / Created stub processor class 2020-03-17 11:51:33 -04:00
Anuken
08488857da Removed DoubleTurret, merged functionality 2020-03-17 11:02:10 -04:00
Anuken
2c7ff64511 Fixed some variable shadowing 2020-03-17 10:28:18 -04:00
Anuken
24f5921863 Bugfixes 2020-03-17 09:07:31 -04:00
Prosta4okua
9d24a47b01
Update bundle_uk_UA.properties 2020-03-17 13:01:31 +02:00
Prosta4okua
bc0104b0cc
Update bundle_uk_UA.properties 2020-03-17 09:31:16 +02:00
Anuken
32ffacf8f6 Added sector deployment UI 2020-03-16 23:09:07 -04:00
Anuken
928812142a Bugfixes & liquid unit tests 2020-03-16 10:41:32 -04:00
Olexandr Nesterenko
567eb1e9dd revert some fix 2020-03-16 16:01:23 +02:00
Olexandr Nesterenko
660e27f002 fix uk 2020-03-16 13:24:18 +02:00
Olexandr Nesterenko
f23177fddc Update uk 2020-03-16 12:12:14 +02:00
Olexandr Nesterenko
9a529fc40b Fix uk translation 2020-03-16 11:54:37 +02:00
Patrick 'Quezler' Mounier
164dd0c405
Revert "Revert "Revert "Revert "Repurpose branch to be played"""" 
This reverts commit 8caa9ed548.
 2020-03-16 09:15:44 +01:00
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
Petr Gašparík
ad6d819b8f Czech translation - fixed typo 2020-03-16 00:06:39 +01:00
Petr Gašparík
0749120df3 Czech - update translations for 104.x 2020-03-16 00:05:20 +01:00
Petr Gašparík
865397983b Czech - ud to date translation 2020-03-15 23:43:52 +01:00
Petr Gašparík
b6f1b7570b Merge branch 'master' of https://github.com/Anuken/Mindustry into v104 2020-03-15 23:30:37 +01:00
Vanguard
11b6ae58d7
1 new line, 1 changed line 
New:
rules.deconstructrefundmultiplier

Changed:
stat.deconstructed
 2020-03-16 00:34:58 +03:00
Patrick 'Quezler' Mounier
8caa9ed548
Revert "Revert "Revert "Repurpose branch to be played""" 
This reverts commit 4b08cfd2b7.
 2020-03-15 22:04:10 +01:00
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7
Revert "Revert "Repurpose branch to be played"" 
This reverts commit 9df875354a.
 2020-03-15 22:00:45 +01:00
ma44
ec34e27102
map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
Anuken
1e3326fb8a Cleanup 2020-03-15 09:02:14 -04:00
Anuken
cd019ab329 More bugfixes 2020-03-14 18:19:07 -04:00
Anuken
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
Anuken
808615a77c Bugfixes 2020-03-13 22:33:37 -04:00
laohuaji233
377ac2be90
Update bundle_zh_CN.properties 2020-03-12 22:48:34 +08:00