Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,325 Commits 4 Branches 180 Tags
9aa5460688cf3ffc192c82d008bcdbdd89b139af
Commit Graph

408 Commits

Author SHA1 Message Date
Anuken
b10fa9e5b2 Added carry traits 2018-06-04 21:15:40 -04:00
Anuken
2a5118326a Added item drops, fixed various bugs 2018-06-04 16:17:24 -04:00
Anuken
01f4a9b23b Changed too many things to fit in commit log 2018-06-04 12:47:08 -04:00
Anuken
3202d62a92 Further targeting improvements for AI 2018-06-03 20:03:53 -04:00
Anuken
270dc351a1 Unit system rewrite, new drone AI 2018-06-03 12:12:18 -04:00
Anuken
12c746a4e4 Fixed build errors, AI improvements 2018-06-03 00:09:41 -04:00
Anuken
a116a2a553 Fixed crash caused by lack of multithreading 2018-06-02 22:08:37 -04:00
Anuken
9555b10b97 Bugfixes, cleanup, optimization 2018-06-02 21:45:07 -04:00
Anuken
3fe7e4e8da mess cleanup 2018-06-02 00:47:22 -04:00
Anuken
ba805739b0 one painful merge later 2018-06-02 00:46:40 -04:00
Anuken
1bc4b16d38 Added map import button 2018-06-01 14:45:55 -04:00
Anuken
c79c23899f Merge branch 'master' into feature-blocklogsandrollback 2018-06-01 11:21:34 -06:00
Anuken
a04e432aea Fixed multithreading 2018-06-01 13:11:40 -04:00
Anuken
c4ae6121b4 Implemented loading map/save files on launch (Android) 2018-06-01 12:20:16 -04:00
Anuken
23d07600f7 Bugfixes, added saving/loading maps in editor for web version 2018-05-31 23:49:43 -04:00
Anuken
418467e467 Fixed bad app-data directory being provided 2018-05-31 21:24:04 -04:00
Anuken
e60b3880ce MapEditor tweaks, fixed file browser on Android w/ permissions 2018-05-31 20:27:13 -04:00
Anuken
92acf009b0 Fixed FileChooser conflict 2018-05-31 17:04:26 -04:00
Anuken
a141df434c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Platform.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
 2018-05-31 17:00:47 -04:00
Anuken
13b0c8880d Implemented block breaking on Android 2018-05-31 16:27:30 -04:00
Anuken
277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
Anuken
857b76980b Fixed shaky camera, many other small bugs 2018-05-30 23:51:42 -04:00
Anuken
fae7bfa8c5 Dynamic layout for unlocking blocks 2018-05-30 22:41:52 -04:00
Anuken
e9e7d2e289 Place menu scrolling, fixed some settings menu bugs 2018-05-30 18:32:01 -04:00
Anuken
b5966afe25 Removed unnecessary UI fragments, began work on Desktop input 2018-05-30 00:32:20 -04:00
Anuken
1cf91c0ce3 Added rotation to Android placement 2018-05-29 23:18:31 -04:00
Anuken
b434c37f01 Rewrite of all static initialization code 2018-05-29 15:24:47 -04:00
Anuken
4655bd5502 Massive input refactoring 2018-05-29 00:15:24 -04:00
Anuken
fcb74d4fba Removed additional info from mac version 2018-05-28 16:55:46 -04:00
Anuken
2bf7d06a91 Scrapped current place menu 2018-05-28 16:23:23 -04:00
Anuken
ce68c2a3e9 Documentation, added Content/ContentDatabase classes 2018-05-28 15:20:46 -04:00
Anuken
e58194ac3c Confined Mac users to Downloads/ directory 2018-05-28 12:34:01 -04:00
Anuken
0b28f97d8f Bullet refactoring 2018-05-27 15:17:35 -04:00
Anuken
86360049c3 Updated FileChooser dir 2018-05-25 01:09:18 -04:00
Anuken
f524be6738 Added native file choosers for importing/exporting save 2018-05-24 23:16:03 -04:00
Anuken
9693de8885 Added new screen for managing and viewing maps, many editor fixes 2018-05-23 21:40:59 -04:00
Anuken
d096a7ceb1 Merge fixes 2018-05-23 10:37:14 -04:00
Anuken
fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
 2018-05-23 10:36:59 -04:00
Anuken
c920fa6740 Added all export/import menus, fixed bad icons for editor blocks 2018-05-22 23:56:29 -04:00
Anuken
b4088dcfbc Some more revisions to iOS version 2018-05-22 14:30:54 -07:00
Anuken
b20f026c7b Added dialogs for saving/loading maps directly, work on web support 2018-05-22 17:28:21 -04:00
Anuken
37afb46957 Deprecated Draw.color(String), switched to type-safe usage 2018-05-21 13:37:16 -04:00
Anuken
241b86d704 Updated item transfer visuals, centered block inventory 2018-05-21 12:03:49 -04:00
Anuken
8f137eadf0 New ItemTransfer entity 2018-05-21 11:25:41 -04:00
Anuken
93353ff900 Removed action-based item transfer animation 2018-05-21 11:05:10 -04:00
Anuken
26e1ad51ff Documentation, cleanup, incremental resource usage, core seeking 2018-05-20 20:41:10 -04:00
Anuken
c1a5482ad2 Major refactoring of building, sound, inventory 2018-05-20 17:59:52 -04:00
Anuken
94896451ac Merge remote-tracking branch 'origin/master' 2018-05-20 11:47:32 -04:00
Anuken
0e35bb4852 Fixed scrolling player menu causing panning on mobile 2018-05-20 11:47:20 -04:00
Anuken
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -07:00