mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
881 Commits 4 Branches 160 Tags 2.3 GiB
e5656896e7
Commit Graph

881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
 2018-03-03 18:06:57 -05:00
Anuken
70b104c936 Cleanup of Tile 2018-03-03 18:03:15 -05:00
Anuken
3653135bb0 Fixed bugs with web version connections 2018-03-03 17:43:50 -05:00
Anuken
8c53cf4150 Updated to build 30 2018-03-03 11:48:30 -05:00
Anuken
2a41453bc8 Crash fixes 2018-03-03 11:31:17 -05:00
Anuken
ba46dacfdc Removed servtesting code 2018-03-03 10:44:32 -05:00
Anuken
2122d04f78 Completely new continuous collision system to prevent piercing 2018-03-03 01:14:14 -05:00
Anuken
94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken
e37cdf6040 Updated uCore 2018-03-02 09:11:02 -05:00
Anuken
827f72f595 Added canDump for vaults, better vault icon 2018-03-02 09:04:44 -05:00
Anuken
5faff6260e Implemented multiblock output, broke router chaining 2018-03-01 23:36:48 -05:00
Anuken
830c3dcec6 Merge remote-tracking branch 'origin/master' 2018-03-01 22:19:09 -05:00
Anuken
278d80a627 A variety of crash and bugfixes 2018-03-01 22:19:04 -05:00
Anuken
bb1d0e1f0d
Merge pull request #96 from cloud9350/patch-1 
Fix typo mistake
 2018-03-01 22:13:30 -05:00
Gureumi
3d9f81d274
Fix typo mistake 2018-03-02 11:32:33 +09:00
Anuken
41ee817d18 More server debugging changes. 2018-03-01 17:57:42 -05:00
Anuken
23457830ee Added more debugging info to server 2018-03-01 08:54:33 -05:00
Anuken
59e8a85c7e Added Edges class, broke tiles and saving 2018-02-28 23:16:35 -05:00
Anuken
7f044ea275 Made dedicates server exit on bad connection found for testing 2018-02-28 16:17:48 -05:00
Anuken
7e20b493ea Fixed high-FPS slow water/no block sounds 2018-02-28 15:11:35 -05:00
Anuken
b67a4f3c14 Fixed dedicated server crashes 2018-02-27 20:30:55 -05:00
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