Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,309 Commits 4 Branches 180 Tags
a116a2a5537e99267a1f53a41d7b73e2283429b8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 ae6b4211b9 Added mining 2018-06-02 11:13: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 89d8aa99ac Updated uCore 2018-06-02 00:23:08 -04:00
Anuken 5b65c2e27e Fixed MapIO not reading map stream fully 2018-06-02 00:19:31 -04:00
Anuken 6f9b712230 Fixed trail appearing behind player mech 2018-06-01 18:35:14 -04:00
Anuken ca3bfa2239 Merge remote-tracking branch 'origin/master' 2018-06-01 18:25:39 -04:00
Anuken 35a3a89d2d Changed Discord RPC version to 2.0.0 2018-06-01 18:25:23 -04:00
Anuken be8632d94b Added Android automatic shooting 2018-06-01 18:23:45 -04:00
Anuken 1bc4b16d38 Added map import button 2018-06-01 14:45:55 -04:00
Anuken 863c159fbb Fixed build errors 2018-06-01 13:24:11 -04:00
AnukenandGitHub a647efe3fd Merge pull request #125 from hellomouse/feature-blocklogsandrollback 
Added edit logging and whole world rollback
 2018-06-01 11:21:48 -06:00
AnukenandGitHub 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 5c120e532f Added support for Mac file association; minor optimizations 2018-06-01 13:01:05 -04:00
Anuken cfa95eef39 Fixed a few mime-type problems 2018-06-01 12:22:39 -04:00
Anuken a327b9cfa8 Fixed iOS map/save loading 2018-06-01 12:20:57 -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 32201dda72 Implemented nuclear reactor 'heating' 2018-05-31 16:45:45 -04:00
Anuken 13b0c8880d Implemented block breaking on Android 2018-05-31 16:27:30 -04:00
Anuken 24e7d755eb Added respawn animation on game start 2018-05-31 11:48:07 -04:00
Anuken e534a6b7fc Merge remote-tracking branch 'origin/4.0' into 4.0 2018-05-31 11:41:38 -04:00
Anuken 277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
AnukenandGitHub 278a10cf61 Merge pull request #127 from cloud9350/patch-3 
Update bundle_ko.properties
 2018-05-31 09:12:24 -06: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 e3cbe118c5 Done with desktop breaking 2018-05-30 13:43:49 -04:00
Anuken 9d05cfba36 Implemented desktop line placement 2018-05-30 12:40:51 -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 0f09a0b152 New shaders, remake of Android placement partially done 2018-05-29 22:03:43 -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 857f36e01a Re-definition of all ammo and new turrets 2018-05-28 12:28:50 -04:00
Anuken 83c3a80766 Definition of all bullet types listed on trello 2018-05-27 19:12:01 -04:00
Anuken 736552f3b1 Removed all usage of drawBullet, switched to BasicBulletType 2018-05-27 15:49:01 -04:00
Anuken 0b28f97d8f Bullet refactoring 2018-05-27 15:17:35 -04:00
Anuken 47b627d669 Added sprites for all ammo types 2018-05-25 23:04:48 -04:00
Anuken b051a296fc Added definitions for all bullet types 2018-05-25 21:56:23 -04:00
Anuken 908a569413 Added all dummy ammo types, added ItemType class 2018-05-25 11:45:47 -04:00
Anuken 31f83dfb40 Merge remote-tracking branch 'origin/master' 2018-05-25 01:10:31 -04:00
Anuken 022b16c8e6 Updated Platform.java 2018-05-25 01:10:12 -04:00
Anuken d462d9c89b Removed JavaFX usage 2018-05-25 01:09:47 -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 519d2c1714 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/sprites/icon.icns
 2018-05-24 21:14:10 -04:00
Anuken c19fcb831f Added native file chooser, fixed macOS prefs errors 2018-05-24 21:13:31 -04:00
Anuken ff6268e616 Updated icns file 2018-05-24 21:12:41 -04:00
Anuken b0f1ad63ee Changed prefs directory definition 2018-05-24 17:20:37 -04:00
Anuken a7b017f307 Merge remote-tracking branch 'origin/master' 2018-05-24 16:13:19 -04:00
Anuken 29c3df8ba7 Changed bundle identifier script 2018-05-24 16:12:12 -04:00
Anuken 570226a051 Renamed all turrets 2018-05-24 15:40:36 -04:00
Anuken 96cfb51bd8 Sprite changes 2018-05-24 13:30:56 -04:00
Anuken ba0c7907ca Merge remote-tracking branch 'origin/master' 2018-05-24 11:21:16 -04:00
Anuken 4c6ae83d4b Build 40 release 2018-05-24 11:19:03 -04:00
Anuken e4231e012d Fixed a few minor bugs with scrolling in editor 2018-05-23 22:23:52 -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 3f1389818c Changed TextArea padding 2018-05-23 10:28:47 -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 f0fa126e7b Changed map edit menu, added map info dialog 2018-05-22 14:16:12 -04:00
Anuken 2999694f48 Fixed brush not respecting multiblock rules 2018-05-22 12:33:42 -04:00
Anuken fcc60957c1 Made DrawOperation non-disposable 2018-05-22 12:09:18 -04:00
Anuken 4781351184 Testing github webhook 2018-05-22 12:07:33 -04:00
Anuken d97a585eba Added undoing for map editor 2018-05-22 00:02:43 -04:00
Anuken 2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -04:00
Anuken 3b5a9c0a10 Added IndexedRenderer color, block team indicator 2018-05-21 18:49:00 -04:00
Anuken f6184004e5 Implemented editor multiblock support 2018-05-21 17:45:12 -04:00
Anuken d70dd05221 Fixed 'permission denied' open error on iOS 2018-05-21 15:06:20 -04:00
Anuken 5602cb8920 Added basic enemy spawning, fixed turret base sprite, input place lag 2018-05-21 15:03:34 -04:00
Anuken 4a250b4e27 Fixed brush size layout, added map resize button 2018-05-21 13:59:35 -04:00
Anuken 37afb46957 Deprecated Draw.color(String), switched to type-safe usage 2018-05-21 13:37:16 -04:00
Anuken 9708d3183f Implemented multiblock replacement, upgrade-safe building 2018-05-21 12:20:23 -04:00
Anuken 433cb99eab Removed outdated 3.2 itch.io GIF from readme 2018-05-21 12:05:02 -04:00
Anuken 241b86d704 Updated item transfer visuals, centered block inventory 2018-05-21 12:03:49 -04:00
Anuken 3b0c66429c Fixed dedicated server crash 2018-05-21 11:27:06 -04:00
Anuken 8f137eadf0 New ItemTransfer entity 2018-05-21 11:25:41 -04:00
AnukenandGitHub 468a6c1dca Delete MANIFEST.MF 2018-05-21 11:07:54 -04:00
AnukenandGitHub f9597569ba Delete annotations-release.jar 2018-05-21 11:07:47 -04:00
Anuken 93353ff900 Removed action-based item transfer animation 2018-05-21 11:05:10 -04:00
Anuken ed7e77b2db New breaking animation and colors 2018-05-21 00:27:01 -04:00
Anuken 2108aab523 Added usage of OS.getAppDataDirectory() 2018-05-20 21:52:45 -04:00
Anuken 75f01099ee Re-added resource harvesting from blocks 2018-05-20 20:51:56 -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