juanjp600
fc8eab688d
Merged branch master into new-netcode
2016-09-27 19:45:14 -03:00
Regalis
2bdc7441fc
Merge branch 'level-gen-overhaul'
2016-09-27 20:19:29 +03:00
Regalis
9b15d2f894
Improved background sprite placement logic: orientation of the cell edges determined by their normals instead of their position relative to the cell
2016-09-27 20:18:55 +03:00
juanjp600
0ef813f189
Merge remote-tracking branch 'refs/remotes/barotrauma/master'
...
Conflicts:
Subsurface/Barotrauma.csproj
Subsurface/Source/Screens/GameScreen.cs
2016-09-26 17:03:14 -03:00
Regalis
790212a20b
Merge branch 'walldamage'
2016-09-26 16:28:52 +03:00
Regalis
e91e0a4f9c
HUDProgressBars move with the subs
2016-09-26 16:26:52 +03:00
juanjp600
02d98f5d29
Merge remote-tracking branch 'refs/remotes/barotrauma/master'
...
Conflicts:
Subsurface/Source/Networking/FileStreamReceiver.cs
Subsurface/Source/Networking/FileStreamSender.cs
Subsurface/Source/Networking/GameClient.cs
Subsurface/Source/Networking/GameServer.cs
Subsurface/Source/Networking/GameServerLogin.cs
Subsurface/Source/Networking/NetworkEvent.cs
Subsurface/Source/Screens/NetLobbyScreen.cs
2016-09-24 21:28:37 -03:00
juanjp600
d537e8795a
Replace '' (two single quotes) with \" (double quote)
...
We must correct post-traumatic Blitz disorder
2016-09-24 21:26:08 -03:00
juanjp600
1c58c9323d
Added memPosX/Y
...
This will be used on the client's side to compare positions with what the server says.
2016-09-24 18:57:00 -03:00
juanjp600
8cee457ab7
Run syncing + comparison with hexadecimal values
2016-09-24 18:51:42 -03:00
juanjp600
5567dff1c9
Fixed input order execution + Controller direction syncing
...
It was a dumb mistake indeed, now the player's movement is a lot less erratic. There's some very minor desync, though I might've just tested it incorrectly.
2016-09-24 18:11:09 -03:00
juanjp600
84ce612d06
Fixed Character.IsKeyHit
2016-09-22 21:29:07 -03:00
juanjp600
44e12ffed2
Basic player input syncing
...
There's currently a bug where the inputs might be read out of order or more than once, which leads to desync. I'll feel really dumb when I find what's going on here.
Also, I'm using placeholder player spawning because CharacterInfo doesn't seem to be fully functional yet.
2016-09-22 21:20:46 -03:00
juanjp600
edab86f730
Character freezing + Misc fixes
2016-09-21 16:46:12 -03:00
juanjp600
3314c8501c
Merged branch master into new-netcode
2016-09-21 14:30:49 -03:00
Regalis
f21000124b
0.5 sec delay when switching from swimming to walking or vice versa (prevents rapid switches between swimming/walking if the water level is fluctuating around the minimum swimming depth)
2016-09-21 20:14:24 +03:00
Regalis
96a61ab2ea
HUDProgressBars are drawn over the LOS effect, progressbar not displayed when attempting to weld/cut platforms
2016-09-20 19:36:58 +03:00
Regalis
5918e845ac
Progress bars that show the health of wall sections when welding/cutting
2016-09-20 18:40:30 +03:00
juanjp600
179c0424d7
Disabled vsync + added input list to Character
...
Not everything breaks without vsync. GUI updates need to be fixed.
2016-09-16 15:54:11 -03:00
Regalis
7f543c394a
More background sprites again, sprite commonness can vary between different level types
2016-09-14 19:54:03 +03:00
Regalis
eae854abbc
More background sprites (+ some sprites swing slightly, sprites are less likely to be placed in unreachable places)
2016-09-13 21:23:37 +03:00
Regalis
c20ffd2431
Read/write methods for notifying the clients about a spawned character
2016-09-10 14:56:55 +03:00
juanjp600
404c506662
Merge remote-tracking branch 'refs/remotes/barotrauma/master'
...
Conflicts:
Subsurface/Properties/AssemblyInfo.cs
Subsurface/Source/Characters/Character.cs
2016-09-07 17:35:18 -03:00
juanjp600
bfd8bc6b35
Server serialization functions require client
2016-09-07 17:32:20 -03:00
Regalis
94cec67a2b
Characters that aren't inside a hull or can't enter subs won't attempt to play a walking animation
2016-09-07 20:18:52 +03:00
Regalis
9463b18993
Huskification bugfixes
2016-09-07 18:19:42 +03:00
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
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
Sebastian Broberg
400084f9e5
BackgroundCreatureManager and BackgroundSpriteManager can be overridden via Content packages
...
Changed "topshaft"
2016-09-03 18:05:26 +02: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
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
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
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
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
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
bf686ae997
A few more security checks
2016-08-29 18:38:06 -03:00
Regalis
ca5ad3ece4
Added some husk chems to the subs, attack key is included in the default config, fixed character and wiring modes crashing the game
2016-08-29 21:23:35 +03:00
Regalis
9955856c0c
Tweaked the item interaction distance checks a bit:
...
- using worldposition instead of simposition (an item outside the airlock can be close enough to pick up even if it's far away in physics sim coordinates)
- checking if the player is inside the interact trigger of the item
- better way of checking if the item is a ladder
2016-08-29 18:26:24 +03:00
juanjp600
d27cafffa9
Fixed access to items without PickDistance
...
The ladder check is a horrible hack, but if you're horribly desynced then trying to interact with one will just kill you :)
2016-08-28 20:26:36 -03:00
juanjp600
73fc0cf724
More security checks
...
This actually looks pretty bad, not gonna lie.
2016-08-28 19:54:31 -03:00
juanjp600
6e67c86fb6
Item interaction distance checks
...
Another anti-hack measure, hopefully this stops them from wrecking the sub instantly
2016-08-28 18:35:38 -03:00
Regalis
2c5d272acd
- special death messages for husk infections
...
- fixed husk infections not being removed from clients
- more accurate bleeding indicators
- humanoid standing anim tweaking
2016-08-28 20:22:45 +03:00
Regalis
e2885a912d
Husk infections, manually attacking when controlling a creature
2016-08-28 16:16:02 +03:00
Regalis
fda251898b
Limb attack refactoring (moved attack update logic from EnemyAIController to Limb, removed the Hit/PinchCW/PinchCCW attacktypes)
2016-08-26 20:38:28 +03:00
juanjp600
a00ceb5b9f
Server doesn't trust client positions
...
Client doesn't receive its own real position from the server yet (and I actually can't find where the code filters this information out, but since I'm doing a rewrite it probably won't matter), and since the inputs aren't sent reliably or redundantly, desync is inevitable.
2016-08-25 19:15:10 -03:00
Regalis
dc67eeebd4
Humans can be spawned through console in multiplayer
2016-08-23 14:19:50 +03:00
Regalis
d476ebdc8d
Fixed letting go of dragged character when entering/exiting the sub, fixed spawnitems not being visible in the job info window
2016-08-22 16:49:43 +03:00
Regalis
7c8e866030
Fixed the door collision bug at docking ports
2016-08-16 20:21:33 +03:00