Commit Graph

20 Commits

Author SHA1 Message Date
Anuken
d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
2018-02-27 19:58:34 -05:00
Anuken
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
Anuken
7429d029f3 Added admins with in-game icons and permissions; untested 2018-02-25 23:44:35 -05:00
Anuken
9f5f6ae382 Security changes: placement verification, banning, unfinished admins 2018-02-25 22:32:12 -05:00
Anuken
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
Anuken
714a4895bf Minor UI fixes 2018-02-07 23:25:03 -05:00
Anuken
c0a9cfc6b2 Fixed zoom/web save export/liquid crafter/menu button scale bugs 2018-01-26 14:01:16 -05:00
Anuken
c5211121cd Implemented player list for android 2018-01-16 15:37:38 -05:00
Anuken
f4635b2882 Added server browser 2018-01-13 13:41:11 -05:00
Anuken
4d44fc3855 Minor UI changes for pause button 2018-01-04 15:18:38 -05:00
Anuken
2939c30d8d Rebalancing of drills to slow down progression 2018-01-04 12:12:31 -05:00
Anuken
20eea3b385 Switched to different Kryonet fork; full Android support 2018-01-01 16:09:17 -05:00
Anuken
036a246769 Finished most of new save system, added new localized strings 2017-12-29 15:54:59 -05:00
Anuken
b25c611c33 More character support, made menus collapsible 2017-12-27 23:05:10 -05:00
Anuken
42909abf53 Converted almost everything to an I18nBundle 2017-12-26 17:58:20 -05:00
Anuken
40bb499eeb Fixes to shader code, collapsible placement menu 2017-12-26 12:57:56 -05:00
Anuken
ea63451f49 Fixed GWT build errors and rotation axis bug 2017-12-24 11:55:08 -05:00
Anuken
a83e06f9cd Added basic controller support 2017-12-23 17:57:51 -05:00
Anuken
c6dd1c29ff Add drop shadow to icon 2017-12-20 00:46:01 -05:00
Anuken
9e298bde03 heck 2017-12-19 19:17:17 -05:00