Commit Graph

1391 Commits

Author SHA1 Message Date
juanjp600
1dc255bc2f Merge branch 'master' into dedicated-server
# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs
2017-06-23 10:21:02 -03:00
juanjp600
3b343899c0 "seed" command 2017-06-23 10:15:29 -03:00
juanjp600
ad1935fdcf Added commands to change sub, shuttle, gamemode & mission
Also fixed the exe icons
2017-06-22 21:42:09 -03:00
juanjp600
be2074b4f0 Added some convenient console commands 2017-06-22 19:51:19 -03:00
juanjp600
72d5cb227b Fixed EndGame not working properly + Fixed exception when clients disconnected during a round 2017-06-22 15:20:11 -03:00
juanjp600
5d5923ab28 Rebuilt freetype6.dll with Visual Studio 2015, statically linked runtime
Potential fix for issue #3?
2017-06-22 12:18:27 -03:00
juanjp600
c1780fa7b7 Server sleep time is slightly smarter + loading debug messages 2017-06-22 00:24:30 -03:00
juanjp600
6b65e94d41 Fixed map collider generation
I didn't realize the bodies were generated in the same method that generates the mesh triangles, TODO consider splitting that
2017-06-21 18:45:06 -03:00
juanjp600
7ab01b8237 Fixed linked subs not spawning
Turns out the game actually sets Screen.Selected to null when the game starts, so the server would break on EditMapScreen checks.
2017-06-21 14:51:36 -03:00
Joonas Rikkonen
de00eb2ab4 Some fixes to attachable items (buttons, signal items, etc):
- Syncing the attached/detached state of the items. This should fix the "received a position update for an item with no physics body " errors: midround-joining clients didn't get notified if an item had been detached, causing the error to appear every time it receives a position update.
- Detached items can be picked up just like any other item, instead of having to use a wrench and wait for the item to "detach".
- Wires can't be connected to items with a physics body (such as detached buttons).
2017-06-21 20:45:33 +03:00
juanjp600
0740579f62 Ingame syncing kinda works
Reminder to self: Submarines must spawn attached shuttles in Dedicated Server, must've been something I missed when moving over client-specific code
2017-06-20 22:28:18 -03:00
Joonas Rikkonen
db9a77fb25 Fix for IndexOutOfRange exceptions during map generation caused by very large wall cells near the entrance of the level (example seed: i1qecA7V) 2017-06-20 21:19:04 +03:00
juanjp600
7003214847 Console colors, begin RNG rework
This is gonna be a PAIN
2017-06-19 21:30:57 -03:00
juanjp600
384819c528 Merge branch 'dedicated-server' of https://github.com/Regalis11/Barotrauma into dedicated-server 2017-06-19 15:13:15 -03:00
juanjp600
fbe7dfc6fb Dedicated server actually works to some extent
Clients can connect and use chat, the sub list isn't synced properly and there's no way to start a game yet
2017-06-19 15:12:19 -03:00
Joonas Rikkonen
6f75a928ea Fixed a compilation error when the DEBUG symbol is defined 2017-06-19 19:51:22 +03:00
Joonas Rikkonen
d2ab71b07d "Explosion" debug command 2017-06-19 19:26:53 +03:00
juanjp600
16bc68d768 BarotraumaServer compiles
Cleanup + fixes coming up next
2017-06-18 22:41:44 -03:00
Juan Pablo Arce
8f37e14917 Split Machines ItemComponents
There's still a lot of work to do before we can get the server to compile
2017-06-18 14:36:11 -03:00
juanjp600
7168a534ed Further separation of client-specific code
Still not done here, just gonna push a commit now so I can pull this from elsewhere.
2017-06-16 16:02:07 -03:00
juanjp600
e4a878113f Fixed client compilation errors 2017-06-14 18:24:11 -03:00
juanjp600
96b08ed8aa Updated project files 2017-06-14 17:39:01 -03:00
juanjp600
7bc535780c Reducing usage of #if CLIENT / #elif SERVER
The server will implement some classes it probably shouldn't need because certain items or game states depend on them.
2017-06-14 17:30:40 -03:00
Joonas Rikkonen
5cd2a5a838 NetEntityEventManager stops writing events to a message if the MTU is about to be exceeded and leaves the remaining events for the next message.
Also got rid of the (now unnecessary) "maximum EntityEvent size exceeded" debug assertion; character spawn messages often went over the limit, causing issues when running debug builds.
2017-06-13 20:47:15 +03:00
Joonas Rikkonen
f469041363 Fixed exceptions in NetLobbyScreen.UpdatePlayerFrame if job preferences contain jobs that aren't in the list of job prefabs 2017-06-11 18:49:48 +03:00
Joonas Rikkonen
bf14882136 Merge pull request #10 from CommanderMark/master
Job preferences are now saved in config.xml.
2017-06-11 18:43:40 +03:00
juanjp600
389a9512d9 Removed default Program.cs from BarotraumaServer project 2017-06-11 03:58:41 -03:00
juanjp600
5636d1cdf9 Reorganized project to start work on dedicated server 2017-06-11 03:48:08 -03:00
CommanderMark
cc6e220691 Moved the execution of the save coroutine to JobNamePreferences' setter.
Juanjp pointed out that it would run the coroutine if you modified changes in the settings without yet pressing "Apply".

Also reworded the job descriptions.
2017-06-10 23:24:51 -04:00
CommanderMark
ed5039c43c The ordering of job preferences in net lobby are saved in config.xml.
- Added a coroutine which will save the current settings to the config.xml file if no further changes to the preferences are applied after 10 seconds.

-The default ordering is now Engineer, Mechanic, Captain, Security, Doctor and Assistant.
2017-06-10 22:17:16 -04:00
Joonas Rikkonen
9b0d7c1020 Added a method for changing a client's controlled character. Clients now get back control if their character is revived via the debug console.
+ It's possible to give clients control of monsters, which should add some new gameplay possibilitie. ;)
2017-06-10 15:07:10 +03:00
Joonas Rikkonen
8886409d56 Respawning characters get ID card tags for both the shuttle and the main sub 2017-06-07 21:14:38 +03:00
Joonas Rikkonen
9527d53558 Fixed exceptions in CharacterNetworking.WriteStatus if a characters stun timer goes over 60.0 2017-06-07 20:20:14 +03:00
Joonas Rikkonen
4395179afa v0.6.0.2 2017-06-05 21:56:22 +03:00
Joonas Rikkonen
2433a4d7fb Teleport command can be used on remote players, fixed launcher.csproj 2017-06-05 21:56:12 +03:00
Joonas Rikkonen
c71af56e78 Added teleport console command 2017-06-05 20:11:19 +03:00
Joonas Rikkonen
46957684f3 Clients and server limit the number of chat messages included in a message if their byte size exceeds the MTU 2017-06-05 19:30:31 +03:00
Joonas Rikkonen
acad7980f2 Added some null checks 2017-06-05 18:40:25 +03:00
Joonas Rikkonen
892d28fd39 Items can be fixed in single player again 2017-06-05 18:18:30 +03:00
Joonas Rikkonen
da3731bae6 Fixed nuclear shells exploding immediately when launched 2017-06-05 18:11:38 +03:00
Joonas Rikkonen
e3016fbbcf Legalese version of the EULA 2017-06-04 21:24:36 +03:00
Joonas Rikkonen
72ecba8e5b Fixed message fragmentation issues caused by initial lobby syncing. The size of the initial message exceeds MTU if the host has a large number of subs, and apparently Lidgren doesn't attempt to handle fragmenting by default when sending the messages with the unreliable delivery method. Now the initial syncing message is sent only once with the reliable delivery method which should be able to handle fragmented messages. 2017-06-04 19:56:57 +03:00
Joonas Rikkonen
55cb56da59 Server ends the round if all characters are either dead or unconscious when autorestart is on (instead of waiting for everyone to be dead) 2017-06-04 18:04:37 +03:00
Joonas Rikkonen
24424cfb51 IP address is logged in all login error messages and the errors are logged to both the debug console and the server log 2017-06-04 17:55:11 +03:00
Joonas Rikkonen
0864505fda Skill level syncing isn't dependent on the order of a character's skills. The skills are sorted in a descending order based on the skill level, which may cause the order to differ between the server and the clients after the initial random skill levels have been assigned. 2017-06-04 16:21:58 +03:00
Regalis
ce69e155fd Fixed GUITickBoxes appearing unchecked if they're set to the checked state when interaction with the box has been disabled (or vice versa) 2017-06-04 16:03:41 +03:00
Regalis
1ec3961fad Merge branch 'master' of https://github.com/Regalis11/barotrauma 2017-06-04 15:01:23 +03:00
Regalis
94c6a8ea1b Renamed project folders from Subsurface to Barotrauma 2017-06-04 15:00:53 +03:00
Joonas Rikkonen
3ec108b3f7 Added readme.md 2017-06-04 14:50:25 +03:00
Regalis
ad03c8bf0d EULA + readme update 2017-06-04 14:48:15 +03:00