Commit Graph

1776 Commits

Author SHA1 Message Date
Anuken
fc4f8619f8 progress (purge) 2020-04-22 16:17:43 -04:00
Anuken
c5f93139bd progress 2020-04-22 16:06:26 -04:00
Patrick 'Quezler' Mounier
561198f517 Fix issue with uneven dumping 2020-04-18 13:39:12 +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
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
361a540ed3 Merge branch '6.0' into crater 2020-04-16 19:10:10 +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
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
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
Patrick 'Quezler' Mounier
7254204ae5 [6.0] fix build requirement check for sandbox (#1873)
* Fix not being able to start building in 6.0 sandbox

* Make 〃 more logical
2020-04-16 09:11:23 -04:00
Patrick 'Quezler' Mounier
5c28985ee6 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/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +02:00
Anuken
51226d6c88 Arc compat 2020-04-14 20:29:59 -04:00
Anuken
a240c00ebf Set cleanup 2020-04-12 17:42:09 -04:00
Anuken
3bb2b646db Networked unit control / Mimic AI prototype 2020-04-11 10:03:47 -04:00
Anuken
758ace353e Laser turret behavior changes 2020-04-10 19:15:14 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken
e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
Anuken
9081f3ff03 Fixed antialiasing 2020-03-30 12:00:08 -04:00
Anuken
152a987c3a Experimental flow display 2020-03-26 17:19:18 -04:00
Anuken
f966489298 Various tweaks 2020-03-25 23:28:20 -04:00
Anuken
7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -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
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
0ed21a1d5f Bugfixes, cleanup / Created stub processor class 2020-03-17 11:51:33 -04:00
Anuken
928812142a Bugfixes & liquid unit tests 2020-03-16 10:41:32 -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
ade989aecb Removed Shader#end 2020-03-10 10:32:40 -04:00
Anuken
876d193379 Bugfixes 2020-03-09 11:16:57 -04:00
Anuken
12c4395508 Added basic respawning 2020-03-07 23:24:22 -05:00
Anuken
7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken
f8b554aff8 Fixed some basic crashes 2020-03-06 15:30:51 -05:00
Anuken
77f406e9b8 Fixed core errors 2020-03-06 15:22:13 -05:00
Anuken
4358658889 Down to less than 100 errors 2020-03-06 14:55:06 -05:00
Anuken
73c0ebb75f Fixed most errors in block package 2020-03-06 14:41:38 -05:00
Anuken
4744465986 More cleanup, nearing completion of block refactor 2020-03-06 12:19:26 -05:00
Anuken
1c48c1a43e Cleanup 2020-03-05 23:23:10 -05:00
Anuken
2e19504b65 it begins 2020-03-05 20:27:42 -05:00
Anuken
5a0d079a78 oh no 2020-03-05 18:05:59 -05:00