mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-26 23:50:18 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,763 Commits 4 Branches 160 Tags 2.3 GiB
f0f7b5aaf7
Commit Graph

194 Commits

Author SHA1 Message Date
Anuken
6a5bf08d55 Implemented local server configs 2018-11-16 22:28:27 -05:00
Anuken
cf50d558ba Fixed many various things 2018-11-07 22:37:34 -05:00
Anuken
5f1addc54d Local crash saving 2018-11-04 09:57:12 -05:00
Anuken
19d34779a0 New sector dialog done 2018-11-04 00:08:06 -04:00
Anuken
6508f1541b Added server logs / Kick messages / Ban messages 2018-10-31 13:51:45 -04:00
Anuken
0f00074f77 Consistent yellow text 2018-10-28 18:22:14 -04:00
Anuken
eb20ec1556 Removed useless content logging, > 2018-10-28 18:17:46 -04:00
Anuken
32f9da0724 Merge remote-tracking branch 'origin/master' 2018-10-28 18:04:15 -04:00
Anuken
968be8eb8f Fixed server run error 2018-10-28 18:04:07 -04:00
Skybbles // L5474
d7e05cde42 Added timestamps and output type labels (#283) 
* Added timestamps and output type labels

* Corrected initial 'build version, client checking' warning, which is why warn exists in the first place.
 2018-10-28 18:01:51 -04:00
Anuken
f144dda8b5 Fixed errors 2018-10-28 16:30:15 -04:00
Anuken
80aed31135 Broke and cleaned up server commands 2018-10-28 14:26:58 -04:00
Anuken
f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken
dd2c71fe61 Removed sandbox from shuffle list / duplicate maps / mobile mech pickup 2018-10-18 18:20:07 -04:00
Anuken
870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken
87c8293c78 Various bugfixes 2018-10-10 08:39:25 -04:00
Anuken
54488564f3 Added sector complete event / Patched up server sector completion 2018-10-09 23:24:27 -04:00
Anuken
0b168376ed Fixed build errors 2018-10-08 17:02:16 -04:00
Anuken
916a4cfc73 Added dialog for graphics startup errors 2018-10-06 17:23:43 -04:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
7488a6d42b Usage of ExtendedPreferences 2018-10-04 12:19:05 -04:00
Anuken
c82fd9ead5 Added unit tests 2018-10-03 20:58:35 -04:00
Anuken
b6c0fe8bf7 Build fix / Improved map contour 2018-09-24 23:12:13 -04:00
Anuken
a1a6a3ab81 Tutorial sector prototype / New mission display 2018-09-21 23:14:26 -04:00
Anuken
7b4e6128ce Server build fix 2018-09-12 11:01:20 -04:00
Anuken
d65beea179 Removed debug menu / Crash fix / Ship speed warp fix / String locale fix 2018-09-12 10:07:10 -04:00
Anuken
d9eb4c1296 Server build fix / Debug hook 2018-09-10 19:33:12 -04:00
iczero
abfaa47db2 Add version type/number/modifier to crash reports (#221) 2018-09-09 14:38:29 -04:00
Anuken
e98457c540 Fixed server build error 2018-09-08 11:57:57 -04:00
Anuken
2c8962cf5f pain and suffering of various kinds 2018-09-05 20:25:50 -04:00
Anuken
9c36026991 Data clearing / Bugfixes 2018-09-05 10:24:47 -04:00
Anuken
389034bf1a Fixed PvP matches not ending / Removed PvP core shield 2018-09-05 09:36:25 -04:00
Anuken
baa7cb3a10 Flux speed buff / Server drowning / Delta buff 2018-09-04 19:02:40 -04:00
Anuken
6ad70ceee3 Typo fix 2018-09-03 17:17:32 -04:00
Anuken
6c5eff1143 Crash fix / Cleanup 2018-09-03 17:04:11 -04:00
Anuken
3b63f60462 Fixed some junction issues / Improved server crash reporting 2018-09-02 22:40:23 -04:00
Anuken
99e54cc214 Fixed server connect crash 2018-09-02 11:22:05 -04:00
Anuken
56ae47cd8d Fixed server build error / Possible crash fix 2018-09-02 11:00:14 -04:00
Anuken
5cb50d57ec Reduced reflection usage / Improved event system 2018-08-31 16:14:14 -04:00
Anuken
dda3afe9fa now with waifus 2018-08-30 21:39:27 -04:00
Anuken
febc1e53b6 Added dedicated server crash reports 2018-08-30 09:05:15 -04:00
Anuken
06ad35d934 Fixed jittery snapshots / Fixed misaligned unit bullets 2018-08-26 17:38:22 -04:00
Anuken
864c4f6bc3 Added custom port support 2018-08-26 10:25:23 -04:00
Anuken
74d7b43d0f Fixed game-over state / Recipe balance 2018-08-25 15:35:35 -04:00
Anuken
b745d88299 Player State reset / Improved messages / Round end time 2018-08-21 17:23:17 -04:00
Anuken
3aedc07ad0 Initial continuous server implementation 2018-08-21 16:37:57 -04:00
Anuken
fb8becca99 Minor ban fix 2018-08-17 14:09:31 -04:00
Anuken
8850a89e30 Fixed game-over sector algorithm 2018-08-15 21:25:07 -04:00
Anuken
4f72011cf7 Fixed markup crash / setsector command fixed / Drone crash fixed 2018-08-15 21:00:40 -04:00
Anuken
36c01fde94 Updated uCore / Minor server tweak 2018-08-15 17:46:33 -04:00
Anuken
d4d9d59fe4 Server sector commands / World data compression / Snapshot sent w/ world 2018-08-15 17:25:19 -04:00
Anuken
15778b2ca5 Server hotfix 2018-08-08 22:37:52 -04:00
Anuken
2aee72b47b Improved host command 2018-08-08 20:57:24 -04:00
Anuken
aa5348f37e Auto-play server sectors / Difficulty decrease / Improved d/c messages 2018-08-08 20:52:51 -04:00
Anuken
57019b6e20 Fixed oil extractor desync / Buffed thermal genenerator / Typo fix 2018-08-08 16:00:33 -04:00
Anuken
f8def04653 Overall difficulty decrease / Crash fix / Server fillitems command 2018-08-08 15:02:51 -04:00
Anuken
91552a3a2b Various bugfixes 2018-08-08 12:22:47 -04:00
Anuken
81c78eafa6 Biomass compressor fix / Crash fix / Removed spawners in waves 2018-08-08 10:43:03 -04:00
Anuken
49e19ab34d Removed 'in' class 2018-07-26 15:40:35 -04:00
Anuken
71016f0d7c Updated uCore / Added hidden sector saves 2018-07-17 12:47:11 -04:00
Anuken
d552f37daf Added conveyor autotiling / Fixed autotile update bug 2018-07-15 22:33:14 -04:00
Anuken
9e3af13efc Added build version warning for servers 2018-07-15 14:51:03 -04:00
Anuken
cfecdae970 Class package refactoring 2018-07-14 12:11:48 -04:00
Anuken
baaeb229cf Formatting 2018-07-12 20:37:15 -04:00
Anuken
d2a739262d Added admin wave sending / Admin system fixes / Build fix 2018-07-04 11:57:04 -04:00
Anuken
76d0285e3f Added freebuild / Power system fix / Net packet pool fix / Crash fixes 2018-07-04 11:38:59 -04:00
Anuken
60deb9205b uCore update / Kick packet priority / Custom client lock / Net fixes 2018-07-03 19:48:29 -04:00
Anuken
359a392cca Fixed various bugs and crashes 2018-07-03 15:53:06 -04:00
Anuken
c9b77e4e23 Crash fixes 2018-07-03 12:27:37 -04:00
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