Commit Graph

17 Commits

Author SHA1 Message Date
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
25b22b4f93 Duplicate IP prevention / Removed overflow inventories 2021-01-18 20:17:59 -05:00
Anuken
05dcd7622b Campaign tweaks 2020-10-31 14:52:03 -04:00
Anuken
bf1268bb6e Shooting -> Function category / Dialog cleanup 2020-10-23 10:39:01 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken
f60afc39f1 Replaced '$' formatting with '@' 2020-08-04 10:18:01 -04:00
Anuken
c25ea81926 Better UI for certain dialogs 2020-06-03 22:40:43 -04:00
Anuken
d988b4b5c9 Method refactoring / Cleanup 2020-05-30 12:11:00 -04:00
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -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
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
Patrick 'Quezler' Mounier
9e811be477 Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Anuken
aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
Anuken
c61fed884b Bugfixes 2020-01-17 22:40:02 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00