mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,512 Commits 4 Branches 160 Tags 2.3 GiB
148abaccd9
Commit Graph

6512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Anuken
6bf031d0f5 Planet render cleanup 2020-03-18 13:32:23 -04: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
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
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
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04: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
Anuken
06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken
930c342fb6 Shader cleanup 2020-03-10 19:48:38 -04:00
Anuken
25bbce2e10 Fixed a crash 2020-03-10 15:13:28 -04:00
Anuken
9398ac5088 GL fixes 2020-03-10 12:40:24 -04:00
Anuken
860efdc052 GL Optimization 2020-03-10 12:10:53 -04:00
Anuken
ade989aecb Removed Shader#end 2020-03-10 10:32:40 -04:00
Anuken
876d193379 Bugfixes 2020-03-09 11:16:57 -04:00
Anuken
f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
Anuken
1dc4fd0800 FX cleanup and installation 2020-03-08 22:45:32 -04:00
Anuken
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
Anuken
863c7ae2bc Removed unit factory limit 2020-03-08 17:49:19 -04:00
Anuken
7ae0192a09 Crash fix 2020-03-08 12:12:06 -04:00
Anuken
12c4395508 Added basic respawning 2020-03-07 23:24:22 -05:00
DeltaNedas
9ef394a99e
set current mod to required mod (#1684) 
or you will need to prefix mod name in requires of the required mod
instead you now need to prefix current mods name after youve required from another mod
 2020-03-07 22:47:12 -05:00
Anuken
7aa71f38c3 Merge remote-tracking branch 'origin/master' 2020-03-07 14:36:50 -05:00
Anuken
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Anuken
7b144cbec6 Attribute tweaks 2020-03-07 13:56:57 -05:00