Commit Graph

100 Commits

Author SHA1 Message Date
2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -04:00
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
f7e0dc4818 Changed music back 2018-05-05 13:50:32 -04:00
b496f51afc Added turk bundle, updated wrapping, added fastshoot kick message 2018-05-05 13:45:04 -04:00
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -04:00
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
941ebd39bf Added new royalty-free music 2018-04-28 13:44:46 -04:00
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
2018-04-21 18:47:43 -04:00
0e50fbf3f2 Fixed rendering and other issues. 2018-04-16 09:08:44 +10:00
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
59530909d6 Added terrain exporting and importing 2018-03-25 00:44:25 -04:00
8eb2a13efd Added host/join info text 2018-03-24 12:25:56 -04:00
9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00
5846af9453 Finished new menu layout, added submenu for playing 2018-03-16 19:36:44 -04:00
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
b9f565f5fc Minor cleanup of gamemode description PR 2018-03-16 00:39:39 -04:00
4dff6d834a add an info button for descriptions of the game mode. 2018-03-15 21:18:06 +01:00
b4ec2ccb90 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-15 12:57:03 -04:00
ae89a004a6 Fixed port bug, possible random disconnect fix 2018-03-15 12:53:47 -04:00
0b2a933faa Fixed startup crash, implemented basic player animations 2018-03-14 23:03:27 -04:00
ea9b3cc7dd Fixed some minor bugs with teleporters an changelog 2018-03-13 13:40:57 -04:00
9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
2018-03-09 20:58:21 -05:00
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
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
13e592a758 Cleanup 2018-02-26 18:42:06 -05:00
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
9f5f6ae382 Security changes: placement verification, banning, unfinished admins 2018-02-25 22:32:12 -05:00
81de9875d3 New resources, blocks, core no longer accepts fuel materials 2018-02-22 20:12:20 -05:00
eae07c15a7 Added pulverizer, new temporary laser graphics, debug power blocks 2018-02-21 23:28:02 -05:00
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
d52d9bec81 Added warning message for upgrading users of the game 2018-02-19 20:44:14 -05:00
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
757f4f5a53 Reduced multithreaded conveyor corruption, improved interpolation 2018-02-07 21:06:26 -05:00
460558bc87 Implemented toggling of multithreading 2018-02-07 14:47:39 -05:00
1c9395ed43 Added 'block info' tool, fixed sorter corruptions 2018-02-03 21:49:43 -05:00
83ce2329f4 Made save difficulty display in dialog 2018-02-01 18:42:10 -05:00
f396190fcf Added polish lang, fixed conveyor stacking bug 2018-01-31 10:20:52 -05:00
0c4f3dc612 Fixed bugs with player list, rturret description and deserialization 2018-01-30 22:11:54 -05:00
aaa9f85206 Added fullscreen, player outlines, better weapon display 2018-01-29 15:24:10 -05:00