Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-22 13:57:46 +03:00
Code Issues Projects Releases Wiki Activity
1,487 Commits 4 Branches 160 Tags 2.1 GiB
e3bee43163
Commit Graph

75 Commits

Author SHA1 Message Date
Anuken
2344fb910b Fixed server game-over crash 2018-06-27 14:58:14 -04:00
Anuken
5a135e108a Massive amount of bug/crash fixes, wave saving 2018-06-25 18:07:11 -04:00
Anuken
56bb23400a Moved over map generator / Fixed logic updating on both threads 2018-06-20 11:09:44 -04:00
Anuken
604f315a83 Switched to binary preference file for desktop 2018-06-15 12:13:52 -04:00
Anuken
fab3704dbd Moved over Streamable inner classes, added test map 2018-06-14 17:11:38 -04:00
Anuken
63d5539427 Updated uCore 2018-06-13 21:18:52 -04:00
Anuken
d0302cdbf3 Many fixes to admin/trace/UUID system 2018-06-13 17:52:31 -04:00
Anuken
690571eec0 Massive amount of fixes and changes with multiplayer/annotations 2018-06-08 22:43:23 -04:00
Anuken
917e2e40fb Memory optimizations, multithreading fixes, uCore updated 2018-06-05 14:03:08 -04:00
Anuken
a6225962b0 Updated uCore 2018-06-04 13:02: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
863c159fbb Fixed build errors 2018-06-01 13:24:11 -04:00
Anuken
c79c23899f
Merge branch 'master' into feature-blocklogsandrollback 2018-06-01 11:21:34 -06:00
Anuken
b434c37f01 Rewrite of all static initialization code 2018-05-29 15:24:47 -04:00
Anuken
3b0c66429c Fixed dedicated server crash 2018-05-21 11:27:06 -04:00
Commodore64x
68af32bc9f Added rollback into the admin menu, fixed a bug where players would crash upon trying to view their own logs on relog. 2018-05-19 13:37:44 +10:00
Commodore64x
b3adf7b331 Replaced ArrayLists with Arrays, overhauled requesting of logs from the server, improved rollback command and added log resetting. 2018-05-14 18:48:44 +10:00
Commodore64x
7f2c2d9d6b Added edit logging and whole world rollback 2018-05-12 18:34:44 +10:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
299c2af59b Added configurable anti-grief 2018-05-05 20:20:34 -04:00
Anuken
1f439b4b0c Made server write version on build 2018-05-03 13:04:30 -04:00
Anuken
8a83e0fc1a Fixed server compile errors, added resupply point block 2018-04-30 22:28:47 -04:00
Anuken
deefab8a5b Implemented ammo ressuplying 2018-04-24 21:38:57 -04:00
Anuken
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
Anuken
d396149521 Implemented passing of commands as arguments 2018-04-16 20:28:47 -04:00
Anuken
b715e0d34e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-14 20:45:46 -04:00
Anuken
b1ad8f917d Changed parameters of griefer command 2018-04-11 13:06:03 -04:00
Anuken
221f7be21b Added utility griefer scan command 2018-04-11 13:05:08 -04:00
Anuken
bed34c4cad Fixed typo in findip command / Tweaks to kicking criteria 2018-04-11 10:25:59 -04:00
Anuken
697e288de2 Fixed 'bans' server crash 2018-04-09 10:24:47 -04:00
Anuken
f61aa6068b Added additional server commands, fixed a crash 2018-04-08 12:33:13 -04:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
Anuken
0936fc6550 Multithreading crash fixes / Server 'find' command added 2018-04-01 11:33:30 -04:00
Anuken
3418979f4d Content class reorganization, beginning work on unit factory 2018-03-25 13:12:32 -04:00
Anuken
5c748fbe54 Upgrade purchase verification, various bugfixes for 3.5 2018-03-24 14:07:07 -04:00
Anuken
967dab21bc Extra conflict fixes 2018-03-23 22:49:07 -04:00
Anuken
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
Anuken
7d2fd514be Experimental power system changes 2018-03-23 20:17:35 -04:00
Anuken
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
0f8168324f Removed old maps, re-added map editor, broke compilation again 2018-03-18 22:30:33 -04:00
Anuken
ae89a004a6 Fixed port bug, possible random disconnect fix 2018-03-15 12:53:47 -04:00
Anuken
b0086082d0 Fixed server crashes, android client error, ping system rewrite 2018-03-08 18:59:11 -05:00
Anuken
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken
1038f35883 Moved TODO to Trello board 2018-03-05 17:00:02 -05:00
Gureumi
3d9f81d274
Fix typo mistake 2018-03-02 11:32:33 +09:00
Anuken
b67a4f3c14 Fixed dedicated server crashes 2018-02-27 20:30:55 -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