vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
606 Commits 5 Branches 2 Tags
95118ed6abcabdf39198dfebbcd603126e795eb9
Commit Graph

513 Commits

Author SHA1 Message Date
juanjp600
95118ed6ab Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Barotrauma.csproj
 2016-09-05 13:28:21 -03:00
Regalis
98b04f1147 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 
Conflicts:
	Subsurface/Barotrauma.csproj
 2016-09-04 19:24:00 +03:00
Regalis
3b394976e4 A new monster, some changes to fish animation logic (creatures don't need to have a head, more pronounced swimming movement, option to select the position where steering forces are applied) 2016-09-04 19:18:44 +03:00
juanjp600
bbc4a53e78 Merged branch master into new-netcode 2016-09-03 21:39:03 -03:00
juanjp600
ef49a946c9 Fixed whitelist crashing server init when not enabled in file 2016-09-03 21:38:02 -03:00
juanjp600
2ec26d783c Merged branch master into new-netcode 2016-09-03 19:00:40 -03:00
juanjp600
73bdd77c08 The same name can be added more than once to whitelist 2016-09-03 19:00:07 -03:00
juanjp600
2116a1a93a Fixed rangeban 2016-09-03 18:15:36 -03:00
juanjp600
6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
 2016-09-03 17:54:33 -03:00
juanjp600
d0efbe14f3 Whitelist saving 2016-09-03 17:51:10 -03:00
juanjp600
efa8b4da51 Removed per-user password from whitelist 2016-09-03 17:18:44 -03:00
juanjp600
ef2b0d8721 Whitelist + conflict resolve 2016-09-03 14:57:36 -03:00
Sebastian Broberg
400084f9e5 BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages 
Changed "topshaft"
 2016-09-03 18:05:26 +02:00
juanjp600
4b10ca21c4 Ban before disconnecting client 2016-09-02 22:49:40 -03:00
juanjp600
03948d5f58 Merged branch new-netcode into new-netcode 2016-09-02 22:25:01 -03:00
juanjp600
e3433c725e Server name, message and submarine list syncing 2016-09-02 22:24:14 -03:00
Regalis
cf77a59c97 Implemented some of the itemcomponent read/write methods, made submarines server serializable 2016-09-02 17:59:08 +03:00
juanjp600
e0b6642767 Minor fixes and tweaks 2016-09-01 22:22:45 -03:00
juanjp600
51dd858af1 Client reads lobby chat from server 2016-09-01 22:05:13 -03:00
juanjp600
028c3a8bc1 Added lobby chat syncing 2016-09-01 20:45:43 -03:00
juanjp600
fc457e0f18 Detect disconnect while password box is open 2016-09-01 15:43:27 -03:00
Regalis
0d68467464 Separate interfaces for entities that the clients/server can send updates for (+ placeholder implementations) 
May or may not be useful
 2016-09-01 20:39:52 +03:00
juanjp600
f845a21de8 Fixed login process 
Time to get the lobby working
 2016-09-01 13:45:46 -03:00
juanjp600
104ac73b97 Added login process to client 
Doesn't work yet, gotta figure this out.
 2016-09-01 11:42:21 -03:00
juanjp600
db0d4b1cd6 Fixed server kicking clients who request auth after validation 2016-08-31 21:11:27 -03:00
juanjp600
795efd82ab Added missing auth response header 2016-08-31 19:44:29 -03:00
juanjp600
a4a6046013 Fix banned packets being read 2016-08-31 18:49:51 -03:00
juanjp600
f5bd5fe0d3 Extra ban check for data packet type 2016-08-31 18:48:45 -03:00
juanjp600
f3b826a371 Added new function calls in server ReadMessage loop 2016-08-31 18:47:16 -03:00
juanjp600
b9a246ca68 New login process + a little bit of cleanup 
No reliability required :) Will get to the client soon
 2016-08-31 18:26:17 -03:00
Regalis
2c51ba50a8 v0.5.1.2: spawnitem console command, "spawn inside" always spawns characters in the main sub, a new music clip, modified the topwindow sprite a bit 2016-08-31 22:06:05 +03:00
juanjp600
d561805010 More netcode cleanup 
how much more is there :/
 2016-08-30 21:35:05 -03:00
juanjp600
33dc22da05 Merge remote-tracking branch 'refs/remotes/origin/new-netcode' 
Conflicts:
	Subsurface/Source/Networking/GameClient.cs
 2016-08-30 21:34:11 -03:00
juanjp600
55a2db7c70 Removed more networking code 2016-08-30 21:33:10 -03:00
juanjp600
2b110588b8 Removed more networking code 2016-08-30 21:30:31 -03:00
juanjp600
7bdcc51bae Made game compilable 
Networking functionality is fully disabled now.

I think it's time to start rewriting everything. OH BOY
 2016-08-30 21:13:36 -03:00
juanjp600
0a0f8e19b4 Merged branch new-netcode into new-netcode 2016-08-30 20:37:12 -03:00
juanjp600
1b418a0fda Re-enabling coroutines 
Changed my mind about this
 2016-08-30 20:36:44 -03:00
juanjp600
807c265652 Re-enabling coroutines 
Changed my mind about this
 2016-08-30 20:29:34 -03:00
juanjp600
9416eb64d7 Completely destroyed game 
Looks like a lot more than just netcode is getting rewritten. Removing coroutines because there are better ways of handling asynchronous tasks, removing filestream because that's to be reimplemented later
 2016-08-30 19:59:14 -03:00
juanjp600
37ffd64490 Disabled networkevent 
Changing the way each item handles its own network updating
 2016-08-30 19:28:32 -03:00
juanjp600
6e83ef7626 Merge remote-tracking branch 'refs/remotes/origin/master' 
Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
 2016-08-30 18:04:49 -03:00
Sebastian Broberg
8142cc734e Small rewrite of the Coroutine logic to stop it from going out of bounds and crashing. 2016-08-30 22:51:40 +02:00
juanjp600
9c116fc268 Merged branch master into master 2016-08-30 17:36:11 -03:00
juanjp600
52270e3a35 Hacked clients can't send chat messages from other characters anymore 
Also added sendername as userdata in chat messages, for now it's not used for anything but we'll probably find something where this is useful
 2016-08-30 17:35:58 -03:00
Regalis
2e2043bf7f Chat messages are added to the server log even if the host's character is out of range, message senders are shown in the server log, fixed multi-line log entries overlapping 2016-08-30 19:06:15 +03:00
Regalis
7ed95c430b Option to choose which character to control with the console command when there are multiple characters with the same name 2016-08-30 19:04:06 +03:00
juanjp600
af220dbc2a Removed Fill/ReadNetworkData 
These functions needed to be replaced because they rely heavily on reliability.

Instead, new functions called (Write/Read)Data(Server/Client) will be added. 

Separating client and server code into completely separate functions will help ensure that proper security checks are performed.
 2016-08-29 20:02:46 -03:00
juanjp600
6bb6f63dd7 Hacked clients can't change their character name 
Also made spam filter's aggressiveness consistent
 2016-08-29 19:45:21 -03:00
juanjp600
df0b064899 Hacked client can't join full server anymore 
Not sure how they can get around lidgren's checking, but this should do the trick
 2016-08-29 19:02:37 -03:00