Commit Graph

4468 Commits

Author SHA1 Message Date
Anuken
da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken
58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Anuken
2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Anuken
c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken
713dbccf74 Bugfixes 2020-04-16 11:30:42 -04: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
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
Anuken
8a01b87c99 Cleanup 2020-04-15 23:12:18 -04:00
Anuken
79c8548171 Better conveyor animations 2020-04-15 19:05:18 -04:00
Anuken
a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
Anuken
0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Anuken
51226d6c88 Arc compat 2020-04-14 20:29:59 -04:00
Olexandr Nesterenko
95d603a035 Separate the use of map name and player name (#1863)
* change use 'name'

* remove schematic.name
2020-04-14 10:04:05 -04:00
Anuken
c717084cb9 Cleanup 2020-04-13 18:07:00 -04:00
Anuken
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Anuken
a240c00ebf Set cleanup 2020-04-12 17:42:09 -04:00
Blockzilla101
501253d13a added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog (#1846)
* added name of player to baning/kicking/vote-kicking/admining

* slight tweaks

* fixed redundant things
2020-04-12 10:52:05 -04:00
Anuken
603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
Patrick 'Quezler' Mounier
9e811be477 Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Anuken
f163601262 Better unit control effects 2020-04-11 11:34:51 -04:00
Anuken
b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
2020-04-11 10:37:52 -04:00
Anuken
3bb2b646db Networked unit control / Mimic AI prototype 2020-04-11 10:03:47 -04:00
Anuken
7dca6b2a30 Other tweaks 2020-04-10 19:17:40 -04:00
Anuken
758ace353e Laser turret behavior changes 2020-04-10 19:15:14 -04:00
Anuken
67a084a5e7 Cleanup 2020-04-10 13:49:36 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken
aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
Anuken
1efbd9dcf2 Faster shaders (?) 2020-04-09 20:50:11 -04:00
Anuken
2a74bb742b Added landing sound 2020-04-08 22:06:43 -04:00
Anuken
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken
7b25b09c18 Bugfixes 2020-04-07 14:08:42 -04:00
Anuken
5fbe925429 Revert "Moved launch button"
This reverts commit 83bc3e4e
2020-04-07 11:29:23 -04:00
Anuken
83bc3e4e8d Moved launch button 2020-04-05 14:26:15 -04:00
Anuken
a7b80f025c Bugfixes 2020-04-04 15:08:08 -04:00
Anuken
85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken
191d7fe1ef Cleanup 2020-04-03 19:40:45 -04:00
Anuken
e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
Patrick 'Quezler' Mounier
68c20ae728 Complete me senpai (#1810) 2020-04-03 10:48:51 -04:00
Anuken
d611dd107a Bugfixes 2020-04-02 22:45:13 -04:00
Anuken
d0b2f63553 Tweaks 2020-04-02 14:56:53 -04:00
Anuken
a26cd46a7e Reflective planet water 2020-04-02 12:32:55 -04:00
Anuken
19239a6890 More cleanup 2020-03-31 19:39:14 -04:00
Anuken
77447c59f6 Cleanup 2020-03-31 15:01:22 -04:00
Anuken
f1fd072400 Game state cleanup 2020-03-31 14:16:38 -04:00