Commit Graph

47 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
1dad6b27c7 GWT compilation fixes 2018-01-19 12:38:07 -05:00
Anuken
3b8b3dc345 Added language select menu 2018-01-18 22:13:45 -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
79e18f7f4d Implemented basic client/server connection and title font 2017-12-30 18:40:02 -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
Anuken
ed59e7c7cb Finish all editor features 2017-12-19 18:01:16 -05:00
Anuken
a6e72c93f0 Finish map editor core functionality 2017-12-19 00:05:41 -05:00
Anuken
7953a21073 Scale waves based on difficulty; improve map editor 2017-12-18 17:37:14 -05:00
Anuken
1a8fdda421 Add basic map editor, change map system 2017-12-17 23:51:55 -05:00
Anuken
7ecbd3afd0 Add Discord link and fix more placement bugs 2017-12-16 17:04:38 -05:00
Anuken
93f58bb458 Changes to break/place system 2017-12-16 10:47:06 -05:00
Anuken
8fb001a693 Fixes for new placement system 2017-12-15 20:54:32 -05:00
Anuken
9c0d9f4e13 Finished new placement controls 2017-12-15 20:28:11 -05:00
Anuken
64439126a3 Major bugfix, new incomplete placemodes 2017-12-15 01:39:54 -05:00
Anuken
b5c57e5957 Implemented Google Play donations 2017-12-12 11:31:35 -05:00
Anuken
6e111f1e80 Many bugfixes and tweaks, added doors 2017-12-02 12:46:02 -05:00
Anuken
01b431801d Increased number of save slots, UI colors tweaked 2017-12-02 00:29:44 -05:00
Anuken
8455d48693 Filled map list, added more blocks 2017-11-30 21:57:10 -05:00
Anuken
8abe4a9cee Added new blocks, maps, and a temporary editor 2017-11-30 19:11:54 -05:00
Anuken
c0d28eca65 Updated build.gradle, changed scroll dialog, UI tweaks 2017-11-27 22:23:47 -05:00
Anuken
4c53b720c6 Added RTG generator 2017-11-19 19:53:21 -05:00
Anuken
06baed836a Improved menu, small fixes 2017-11-19 15:53:53 -05:00
Anuken
4ffbeacb07 Mobile and desktop UI changes 2017-11-10 19:47:57 -05:00
Anuken
4a9fbf080e Many UI changes, WIP main menu rework 2017-11-09 23:05:47 -05:00
Anuken
7e3e34ffe1 Implemented new enemy spawning, sorter, teleporter and others 2017-11-06 23:05:22 -05:00
Anuken
9c0b8c7e54 Added uranium and oil refinery 2017-10-24 14:11:58 -04:00
Anuken
03a26f74c2 Added oil block, power section, more block types 2017-10-23 23:13:07 -04:00
Anuken
41720e2e3f Moved block types into subpackages 2017-10-22 21:58:05 -04:00
Anuken
70693ffdd3 Cleaned up UI, merged atlases, added GLProfiling 2017-10-22 16:24:49 -04:00