Commit Graph

598 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
1195b6c541 Updated uCore 2018-02-27 19:36:25 -05:00
Anuken
f72fd01050 More bugfixes 2018-02-27 19:13:08 -05:00
Anuken
828dd78611 Fixed some GWT bugs and errors 2018-02-26 23:31:29 -05:00
Anuken
bbe3115186 Updated to 3.4 2018-02-26 22:13:36 -05:00
Anuken
17b17222b6 Fixed some admin bugs 2018-02-26 22:05:07 -05:00
Anuken
00c204b589 Made break mode get set to 'none' when collapsing 2018-02-26 19:10:15 -05:00
Anuken
13e592a758 Cleanup 2018-02-26 18:42:06 -05:00
Anuken
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
Anuken
c90395ee2b Fixed placement teleporter crash, invalid packet handling 2018-02-26 10:06:36 -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
9985a19e6a Better net error messages, bugfixes, new command handler 2018-02-23 21:42:05 -05:00
Anuken
de340255fe Updated to build 28 2018-02-23 15:11:42 -05:00
Anuken
2adacccf7d Fixed a few more crashes 2018-02-23 15:01:32 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
07aab732b7 Better tunnel debugging, improved keybind dialog controller info 2018-02-23 13:59:21 -05:00
Anuken
2518564f92 Added Vault block 2018-02-23 10:26:47 -05:00
Anuken
9ff9684a04 Updated uCore, fixed some crashes 2018-02-22 23:19:03 -05:00
Anuken
56b3b469f6 Fixed two major crashes 2018-02-22 20:16:55 -05:00
Anuken
81de9875d3 New resources, blocks, core no longer accepts fuel materials 2018-02-22 20:12:20 -05:00
Anuken
eae07c15a7 Added pulverizer, new temporary laser graphics, debug power blocks 2018-02-21 23:28:02 -05:00
Anuken
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
Anuken
7ee01f19fe Updated uCore 2018-02-21 19:50:27 -05:00
Anuken
04865350e1 Added LiquidTurret class 2018-02-21 19:23:36 -05:00
Anuken
621ec4ee0f A few minor bugfixes, updated version to 3.3 release 2018-02-21 15:07:49 -05:00
Anuken
26a472d31d Updated version 2018-02-21 14:43:51 -05:00
Anuken
f2a952fcfe Possible build upload script fix 2018-02-20 19:40:19 -05:00
Anuken
d52d9bec81 Added warning message for upgrading users of the game 2018-02-19 20:44:14 -05:00
Anuken
1397ed2d06 Possible junction clog fix 2018-02-19 20:13:45 -05:00
Anuken
2208198aa8 "Fixed" items quantities jumping around due to lag 2018-02-19 15:08:05 -05:00
Anuken
5cc092f58c Fixed some more synchronization bugs 2018-02-19 14:57:43 -05:00
Anuken
ffabdba119 Fixed incorrect discord presence updating 2018-02-19 14:45:18 -05:00
Anuken
edc124c90d Added better block debugging 2018-02-19 14:31:35 -05:00
Anuken
03079e9611 Updated uCore, recorder fix 2018-02-19 12:47:57 -05:00
Anuken
cba42d2f19 Fixed 32-bit version not working due to Discord integration 2018-02-19 11:31:43 -05:00
Anuken
6f55870a1f Updated version, teleporter tweaks 2018-02-18 12:49:59 -05:00
Anuken
fb97d00756 Fixed teleporter loop crash 2018-02-18 12:26:18 -05:00
Anuken
39db04872c Minor cleanup 2018-02-18 11:33:38 -05:00
Anuken
1c3bad0aca Fixed StackOverFlow exception thrown with certain block designs 2018-02-18 11:31:09 -05:00
Anuken
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
Anuken
a79dfe29ef Synchronized tile modification with updating 2018-02-17 16:04:09 -05:00
Anuken
30d0d7715a Version update 2018-02-17 14:21:32 -05:00
Anuken
05f7bc256b Made server send wave and map data on websocket ping 2018-02-17 13:21:22 -05:00
Anuken
26fc1c1fb0 Many crashes fixed, added server run script 2018-02-17 12:06:57 -05:00
Anuken
fe3eb356fa Partial teleporter item stacking fix. 2018-02-16 11:32:01 -05:00
Anuken
b70f5b82ee Changed teleporter validity system 2018-02-15 19:22:39 -05:00
Anuken
71ce6d0bec Version update, GWT error fix 2018-02-15 18:15:25 -05:00
Anuken
d117225877 Made server log stop command, partial teleporter fix 2018-02-15 17:00:59 -05:00
Anuken
008889966f Fixed incorrect mode selection, updated TODO 2018-02-14 17:50:44 -05:00