mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 09:47:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,234 Commits 4 Branches 160 Tags 2.3 GiB
9693de8885
Commit Graph

1234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken
468a6c1dca
Delete MANIFEST.MF 2018-05-21 11:07:54 -04:00
Anuken
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
Anuken
ed232248a2 Updated polish bundle 2018-05-20 16:05:24 -04:00
Anuken
e215324292 Updated spanish bundle, added missing formatted text 2018-05-20 15:50:01 -04:00
Anuken
a8bc2f10e4 Fixed iPad share crash, updated iOS version to 3.5 2018-05-20 12:27:23 -07:00
Anuken
b64cbc223f Updated icons again 2018-05-20 15:16:44 -04:00
Anuken
de40df7f7b Fixed place mode not overwriting old queue 2018-05-20 13:05:25 -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
cd30b1d9b3 Fixed bad scaling on ipad devices 2018-05-20 08:40:36 -07:00
Anuken
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -07:00
Anuken
8ca861360b Changed sharing mechanism again 2018-05-19 21:06:12 -04:00
Anuken
410db16160 Fixed iOS app errors 2018-05-19 17:52:29 -07:00
Anuken
1c1df81341 Added sharing for iOS saves, fixed icons 2018-05-19 17:13:04 -07:00
Anuken
66a1cc7b71 Updated iOS map sharing 2018-05-19 18:25:20 -04:00
Anuken
0543569315 Merge remote-tracking branch 'origin/master' 2018-05-19 15:01:55 -07:00
Anuken
e5a94bd140 Grid updates 2018-05-19 15:01:18 -07:00
Anuken
adfebdb3f6
Merge pull request #122 from Prosta4okua/patch-1 
Update bundle_ru.properties[Work in progress]
 2018-05-19 15:58:41 -06:00
Prosta4okua
dbe06b0a93
Update bundle_ru.properties 2018-05-19 22:50:50 +03:00
Anuken
e8305d1245 Updated map editor with better placement preview 2018-05-19 11:53:01 -07:00