mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,148 Commits 4 Branches 160 Tags 2.1 GiB
1f62892e10
Commit Graph

427 Commits

Author SHA1 Message Date
Anuken
e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
Anuken
c449302d28 Fixed tests 2019-12-26 19:57:24 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
9016c12d16 Made team a separate class 2019-12-25 19:07:04 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
b806a22a0a Fixed #1237 2019-12-22 22:04:41 -05:00
Anuken
26881fbdb9 Added server mod error check 2019-12-17 10:58:43 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
047f479a2f Fixed server 2019-12-15 14:00:07 -05:00
Anuken
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Anuken
aeb6e6498e Minor server tweaks 2019-12-10 17:00:49 -05:00
Anuken
9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken
803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken
9f4d44f0f3 Cleanup / Added server support for scripting 2019-12-08 11:00:59 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
iczero
7dd7ccf698 Add gradle property jvmArgs (#1161) 
Allows specifying additional arguments for the vm, which would
make using tools such as HotSwapAgent and dcevm easier
Example: run -PjvmArgs='["-XXaltjvm=dcevm"]'
 2019-12-04 20:05:01 -05:00
Anuken
a087df0771 Added experimental server block syncing 2019-12-04 17:03:49 -05:00
Anuken
b8e3b70fcc Made 'custom' the default shuffle mode for backwards compat 2019-11-21 20:42:57 -05:00
Anuken
134fea445c Custom map providers / Added next map specification command 2019-11-18 18:56:49 -05:00
Anuken
a90f2545d9 Disable reactor explosions on servers by default 2019-11-16 16:43:31 -05:00
Anuken
f9ffb78b33 Added configurable global server rules 2019-11-16 15:51:35 -05:00
Anuken
b795d97d0e Merge remote-tracking branch 'origin/master' 2019-11-15 19:49:48 -05:00
Anuken
ec7379cc86 Updated to gradle 6.0 2019-11-15 19:48:26 -05:00
Richard Wardin
43fe6be13e Display the server status on gameover (map, players, wave, etc) (#1068) 2019-11-15 19:37:26 -05:00
Patrick 'Quezler' Mounier
326b1e9f62 Let server console know which map was randomly picked (#980) 2019-11-02 11:24:43 -04:00
Maximilian
6148a931d3 Improve server host command (#967) 
* Improve server host command

* remove spaces
 2019-11-01 20:26:29 -04:00
Anuken
e103d62b75 Bugfixes / Rework of save discovery system 2019-10-27 14:58:26 -04:00
Anuken
f971061ef4 Bugfixes 2019-10-24 18:52:42 -04:00
Anuken
955dc5f48d Bugfixes / Copy over plugins to mod folder 2019-10-24 18:04:39 -04:00
Anuken
eaaf3a9e60 Fixed compilation 2019-10-24 08:21:37 -04:00
Anuken
ab199633f8 Check version when connecting 2019-10-23 21:47:08 -04:00
Anuken
d39ceb1f5e Respawn players on restart 2019-10-22 09:22:06 -04:00
Anuken
d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken
f1b0ba039c plugins -> mods 2019-09-29 16:26:13 -04:00
Anuken
c05fb7ebf1 oh no 2019-09-29 10:05:54 -04:00
Anuken
4f9ed73a59 Added mod file tree, bundle loading 2019-09-28 21:13:44 -04:00
Anuken
b3666ed2a8 More mod setup 2019-09-27 22:20:16 -04:00
Anuken
70ab102d8c Mods branch 2019-09-27 19:51:46 -04:00
Anuken
d79ec83817 Possible javelin fix 2019-09-25 20:04:24 -04:00
Anuken
f19dfe9d70 Server shuffle fix 2019-09-25 16:54:43 -04:00
Anuken
fd69241de9 Bugfixes 2019-09-25 16:44:55 -04:00
Anuken
47e723c557 Removed logging 2019-09-25 16:32:36 -04:00
Anuken
48bf88f99d More testing 2019-09-25 16:23:37 -04:00
Anuken
289ab44ed5 ? 2019-09-25 16:14:46 -04:00
Anuken
8ec465319b server debug 2019-09-25 16:10:00 -04:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
f71c3af2e1 Plugin config file creation 2019-09-15 21:03:41 -04:00
Anuken
369c3b569c Bugfixes, game startup connection 2019-09-15 12:44:30 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken
4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
a7bfe18f4a Player limit / Server mode display / Crash fixes / More save info 2019-09-03 19:14:33 -04:00
Anuken
316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
Anuken
5f361413bb /sync command 2019-08-31 10:14:26 -04:00
Anuken
9bfbd7c953 Typo fix 2019-08-28 22:34:55 -04:00
Anuken
57924afa3f Moved plugin files 2019-08-28 22:12:25 -04:00
Anuken
5f9370da9a Server plugins + clientside commands 2019-08-28 20:38:12 -04:00
Anuken
865c3f28d5 Server plugins branch 2019-08-28 18:23:43 -04:00
Anuken
5134aca723 Put zone previews into atlas 2019-08-27 19:33:41 -04:00
Anuken
bd15287420 Better loading screen / Fixed unit tests 2019-08-27 17:44:25 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
a3d8586199 Improvements to version scripts 2019-08-25 22:02:00 -04:00
Anuken
fd973038bb mnet was a mistake 2019-08-24 18:29:21 -04:00
Anuken
5f9000db92 MNet cleanup 2019-08-23 15:04:31 -04:00
Anuken
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
Anuken
014e2ac8b8 Bugfixes 2019-08-20 19:42:39 -04:00
Anuken
492cb49805 bugfixes 2019-08-18 22:52:46 -04:00
Anuken
ac27b484fa Updated Mac icon 2019-08-16 12:05:00 -04:00
Anuken
17b17979ab Release preparations 2019-08-16 11:00:15 -04:00
Anuken
89ee04c942 Machine ambient sounds 2019-08-15 13:32:36 -04:00
Anuken
c9178c3f2f Fixed power nodes in multiplayer 2019-08-13 22:47:31 -04:00
Anuken
84786c12d8 Bugfixes 2019-08-13 18:15:40 -04:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
4ef60af4a8 Fixed maps not being able to override gamemode-specific settings 2019-08-10 11:43:28 -04:00
Anuken
8ef1d54a16 Bugfixes 2019-08-06 09:17:26 -04:00
Anuken
04c8ecf4af New team colors 2019-08-02 10:10:37 -04:00
Anuken
ec94267b8e
Update ServerControl.java 2019-06-08 09:23:15 -04:00
Anuken
d3ad113bf5
Update ServerControl.java 
;
 2019-06-08 09:18:39 -04:00
Anuken
8d7242a1ef
Update ServerControl.java 2019-06-08 09:08:49 -04:00
Anuken
c8ce195522 Reverted buffers / Added Dexapnow's fixed zone maps [untested] 2019-06-07 14:07:32 -04:00
Anuken
4458ae042e hhh 2019-06-07 11:18:06 -04:00
Anuken
54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken
b2341bf75c Added map default rule editing 2019-05-13 11:31:25 -04:00
Anuken
c4c4b473e5 Server cleanup 2019-05-13 00:43:06 -04:00
Anuken
83bfad3546 Fixed server compilation 2019-05-12 20:01:59 -04:00
Anuken
962f413421 Cleanup 2019-05-10 16:16:21 -04:00
Anuken
51f9ad5a2c many things 2019-05-06 14:34:21 -04:00
Anuken
8d6afbd80d Trim console output even more 2019-05-04 14:22:13 -04:00
Anuken
c46fa206f6 Removed unnecessary logging 2019-05-04 14:01:06 -04:00
Anuken
e8da206389 Enable heap dump on server crash 2019-05-04 13:17:31 -04:00
Anuken
b2b8cf2357 Server local command handling from sockets 2019-05-04 12:36:24 -04:00
Anuken
fb724514f3 Fixed portrait custom game dialog 2019-04-29 11:27:15 -04:00
Anuken
617bdf9910 New zone maps / Dark map border / Tweaks 2019-04-28 20:25:41 -04:00
Anuken
e7ad797d4e Fixed unit tests 2019-04-26 11:23:41 -04:00
Anuken
b7759c8151 Better shared crash handling 2019-04-22 12:00:47 -04:00
Franciszek Zaranowicz
af91979d4c New custom games and custom rules screen (#464) 
* New waves and limited respawning option.

Added ability to manipulate number of respawns per wave. Added option to hold counting for next wave until all enemies are destroyed

* Critical bug fixed

Fixed frozen wave timer when rules.waitForWaveToEnd was enabled

* Requested changes

* Missed Import

* New custom game and custom rules screen

RulePreset is now a Gamemode (because each of them has a different goal).
New button under Gamemode selection which opens a dialog to modify rules of gamemode.
Now without any mutually exclusive options

* Requested changes

* Applied some text sugestions

* Wrong waveInProgress message displaying fixed

* Unwanted text

* Text changes

* I broke git

* Fixed chrash

* More fixes

New rule : manyCores; needed for sanbox mode

* Visual fix

* Requested changes #1 : small oversights

* Moved respawning logic to Player

and another imports cleanup

* manyCores in now attackMode

* UI changes

* Given back waves to sandbox and integer input in custom rules

* Renamed functions in CustomRulesScreen

* SPACES... Actually one space...
 2019-04-20 14:19:17 -04:00
Anuken
01e1438382 Switched to ArcNet networking extension 2019-04-17 21:59:26 -04:00
Anuken
392dcf3092 Made frozen forest less constricted / Tree block fix / Server crash fix 2019-04-13 17:32:49 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
efed11eb97 stuff 2019-04-05 09:26:31 -04:00
Anuken
2d18df2011 Multiplayer bugfixes / Balancing 2019-04-04 14:46:41 -04:00
Anuken
0b08eb72a6 Bugfixes 2019-03-29 18:15:22 -04:00
Anuken
f7aa58e385 Many small tweaks / Custom rules / Server run files / Balance 2019-03-24 16:29:25 -04:00
Anuken
83a5a82e18 Fixed server map find bug 2019-03-21 11:22:10 -04:00
Anuken
8f5f27755d Bugfixes / Allow placing blocks in shallow liquids 2019-03-21 10:16:37 -04:00
Anuken
886b62bbad Too many things to list in a single line commit log 2019-03-20 22:40:47 -04:00
Anuken
f2662045ed New item bars / Map bugfixes / Stub wave editing 2019-03-13 21:26:53 -04:00
Anuken
e8204fc983 Fixed misc compile errors 2019-03-12 13:46:40 -04:00
Anuken
20427fdffa Implemented correct map loading, legacy format support 2019-03-12 10:36:04 -04:00
Anuken
a0905d5695 Faster, smaller server / Bundle check cleanup 2019-03-09 19:12:54 -05:00
Anuken
64533de597 Bugfixes / Font changed / Zone tweaks 2019-03-08 19:07:23 -05:00
Anuken
976b39414f Fixed: missing spawns / incorrect ranks / jittery movement / tests 2019-02-23 15:08:07 -05:00
Anuken
d74887eaa1 More bugfixes 2019-02-22 23:16:50 -05:00
Anuken
5e2a455045 a 2019-02-17 01:36:46 -05:00
Anuken
cb9616a381 Fixed waves not spawning in custom maps 2019-02-11 22:44:51 -05:00
Anuken
533ddb874e Fixed various mobile bugs / Automatic map folder creation 2019-02-09 11:07:51 -05:00
Anuken
56bcabedf7 Balancing / Bugfixes / Badly antialiased turret outlines 2019-02-07 23:06:43 -05:00
Anuken
25658f2a0a Fixed build shader / Server now displays map directory 2019-02-06 13:59:10 -05:00
Anuken
0dd9d2b460 Moved entity package from Arc / Entity code cleanup 2019-02-02 15:53:35 -05:00
Anuken
5a3ec8f407 Fixed server crash / Struct annotation begins 2019-01-28 15:43:33 -05:00
Anuken
76aa409f89 Changed unnecessary server output to 'debug' log level 2019-01-24 16:36:48 -05:00
Anuken
6229f99a2e Fixed tests / Various build tools updated 2019-01-22 15:01:30 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken
75709a7812 Fixed android version / Smooth zoom 2018-12-28 16:05:49 -05:00
Anuken
3fc278c7b7 Fixed most main menu bugs 2018-12-27 17:14:07 -05:00
Anuken
db546412f1 Arc compatibility update 2018-12-27 15:47:17 -05:00
Anuken
44e4ffbe62 Fixed most things besides drawing 2018-12-22 22:17:28 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
7795a690ed Fixed fillitems command 2018-11-21 21:17:45 -05:00
Milinai
03268a5575 Update ServerControl.java (#339) 
* Update ServerControl.java

Hopefully made core fill for teams.

* Fixed compile errors and incorrect team handling
 2018-11-17 12:57:10 -05:00
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