3d234aef73
Sending NetEntityEvents from client to server, ItemComponent class doesn't implement the INetSerializable interfaces (only the derived classes do), reactor syncing
2016-11-13 19:34:23 +02:00
498c72c64a
Server sends ServerEntityEvents to clients, NetEntityEvents can contain an object array which will be passed to the serializable entity (now only used for ItemComponent indices)
2016-11-13 13:56:48 +02:00
c314b37029
Some classes for syncing entity state changes. Similar to the NetworkEvents in the old netcode, but the logic is split into separate classes which prevent the server from reading updates for entities that aren't IClientSerializable.
...
todo: add NetEntityEventManagers to server & client, some logic to prevent sending events that don't need to be sent (e.g. duplicate event state updates)
2016-11-12 20:56:06 +02:00
ac65a431a8
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Properties/AssemblyInfo.cs
Subsurface/Source/Items/Components/Signal/Wire.cs
Subsurface/Source/Items/Item.cs
Subsurface/Source/Items/ItemInventory.cs
Subsurface/Source/Networking/GameServer.cs
2016-11-09 17:58:56 +02:00
d017817878
Updating wire sections if the wires are moved during loading
2016-11-09 16:23:48 +02:00
e3cd19b781
Wire rendering optimization (angles & distances between nodes are only calculated when adding/removing nodes)
2016-11-08 22:22:49 +02:00
adf19869c2
- ItemContainers whose bodies are disabled don't set the positions of the contained items each frame (only once when the item is placed in the container)
...
- ItemContainers maintain a list of statuseffects that need to be applied on the contained items instead of constantly rechecking each item
- deactivating ItemContainers if they have no body and there are no statuseffects to apply
2016-11-08 21:22:09 +02:00
1617cd8f7a
Item/statuseffect optimization:
...
- PowerTransfer components cache power connections instead of rechecking them every frame
- items store connections in a dictionary with the name of the connection as a key (-> finding the correct connection when sending a signal is more efficient)
- storing item tags & StatusEffect targetNames in HashSets
2016-11-08 21:14:29 +02:00
e15f5f5040
Moving a wire outside the sub doesn't reset connections or nodes in the editor
2016-11-06 15:58:34 +02:00
fae2dc2536
Can compile again
...
Let's hope it's not too broken.
2016-11-05 18:55:11 -03:00
f0acf69065
Merge remote-tracking branch 'barotrauma/master' into new-netcode
...
# Conflicts:
# Subsurface/Properties/AssemblyInfo.cs
# Subsurface/Source/Characters/AI/EnemyAIController.cs
# Subsurface/Source/Characters/AICharacter.cs
# Subsurface/Source/Characters/Character.cs
# Subsurface/Source/Items/Components/Signal/Connection.cs
# Subsurface/Source/Items/Item.cs
# Subsurface/Source/Map/Structure.cs
# Subsurface/Source/Networking/GameClient.cs
# Subsurface/Source/Networking/GameServer.cs
# Subsurface/Source/Screens/NetLobbyScreen.cs
2016-11-05 18:18:20 -03:00
35dafc4792
Merge remote-tracking branch 'barotrauma/master' into new-netcode
...
# Conflicts:
# Subsurface/Source/Characters/Character.cs
# Subsurface/Source/Items/Components/Machines/Steering.cs
# Subsurface/Source/Map/Structure.cs
# Subsurface/Source/Networking/GameClient.cs
# Subsurface/Source/Networking/GameServer.cs
2016-11-05 18:09:44 -03:00
8f646a2723
- fixed dummy location generation crashing the tutorial
...
- gameserver handles exceptions thrown when instantiating a new gamesession
- fixed screwdrivers (and other items that can be held in either hand) going into both hand slots when equipping by double clicking
2016-11-03 18:22:45 +02:00
3cc807605e
Wires can be dragged from a connection panel to the inventory without dropping them, wire connections & nodes are cleared when taking the wire outside
2016-11-02 14:40:05 +02:00
9b29c52a1b
Removed redundant data from AICharacter update messages, fixed startlocation name being shown for endlocation on nav terminals
2016-10-31 21:01:01 +02:00
eb2c51c2f1
Cleanup with resharper (mostly removing redundancies & using collection.Length/Count properties instead of the Count method)
2016-10-31 20:50:20 +02:00
72178d4b1f
Fabricator UI shows item descriptions and items that can't be fabricated are grayed out, added a couple of new fabricable items
2016-10-28 19:47:45 +03:00
48c07cfce5
- doors aren't ignored when checking visibility during waypoint generation or when finding a starting node for a path
...
- AICharacter will mark their path unreachable if their path is blocked by a door they cant open (may happen if someone closes the door after calculating the path)
- fixed exception when creating a Steering component when there's no active GameSession (i.e. in the editor)
2016-10-27 21:18:45 +03:00
282611d0cc
Limiting too long location names in navigation terminals & end shift button
2016-10-26 19:48:39 +03:00
980f8e0d33
- option to select which location autopilot navigates towards
...
- generating "dummy locations" for the MP gamesessions (visible in sonar and mission descriptions)
- EndGame network message tells the clients if the mission was successful (because the message may arrive before the sub has reached the exit or before some character has died at the client's end)
2016-10-26 19:22:40 +03:00
6f9160e4a7
Removing & spawning entities in the same order as the server, EntitySpawner does both removing and spawning
2016-10-26 16:44:59 +03:00
62dd055e8d
Merge branch 'master' into animcontroller-overhaul
...
Conflicts:
Subsurface/Content/Characters/Crawler/crawler.xml
Subsurface/Source/Characters/AICharacter.cs
Subsurface/Source/Characters/Animation/FishAnimController.cs
Subsurface/Source/Characters/Animation/Ragdoll.cs
Subsurface/Source/Characters/Character.cs
Subsurface/Source/Map/Submarine.cs
Subsurface/Source/Map/SubmarineBody.cs
Subsurface/Source/Networking/GameClient.cs
Subsurface/Source/Networking/GameServer.cs
Subsurface/Source/Physics/PhysicsBody.cs
2016-10-25 20:09:25 +03:00
07f8c966ab
Submarine position is synced using the same logic as the characters, AICharacter position syncing
2016-10-25 19:01:19 +03:00
641e579e92
Backported animcontroller-overhaul
2016-10-22 15:18:16 +03:00
c144a11119
Merge branch 'master' into animcontroller-overhaul
2016-10-22 13:38:25 +03:00
bb9b2c6eb7
Fixed inventory getting "stuck" if slots are merged while one of them is selected
2016-10-21 18:30:03 +03:00
92b61ee816
Merge branch 'master' into animcontroller-overhaul
2016-10-19 21:15:44 +03:00
de203cc424
- a WIP attempt to correct the position of the controlled character based on updates from the server
...
- fixed server not being able to move character controllers
- renamed IsNetworkPlayer -> IsRemotePlayer
2016-10-19 00:15:29 +03:00
9fed308705
InGame update messages include a timestamp which is passed to the ClientRead methods
...
Now only used in character position syncing, but some other entities may also have an use for it (e.g. discarding outdated data)
2016-10-18 19:04:32 +03:00
0cafc674dd
- projectiles don't stick to colliders
...
- fixed impacts weaker than the damage threshold giving characters health
- possible to slide down ladders
- improved IndoorsSteeringManager ladder climbing logic
2016-10-17 17:41:41 +03:00
f3e74a6a41
Collider-controlled swimming, fixes
2016-10-16 20:07:34 +03:00
db8c2b9f8e
Changed colliders from limbs to normal physics bodies, removed RefLimb
2016-10-15 20:08:51 +03:00
506ef2f2aa
Attempted fix for drawableComponents crash + LOS tweaks
2016-10-12 19:24:39 -03:00
e12fe29f80
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Source/Items/CharacterInventory.cs
Subsurface/Source/Items/Inventory.cs
Subsurface/Source/Items/Item.cs
2016-10-12 21:12:21 +03:00
1cdb218fe0
Items are removed from their parent inventory and their bodies are removed when Item.Remove is called
2016-10-12 21:07:19 +03:00
060a1db431
Fixed null exception in CharacterInventory
2016-10-12 20:57:06 +03:00
170e1a0da8
ItemRemover -> EntityRemover, clients reset spawner & remover when starting a new round
2016-10-12 20:46:47 +03:00
60b36e020c
Changed ItemSpawner to EntitySpawner, used for syncing both item and character spawning
2016-10-12 19:25:01 +03:00
ac3539da63
Item spawn syncing
2016-10-12 18:29:44 +03:00
71d4df6300
Highlighting inventory slots when moving items around, red highlight if an item can't be placed in a slot
2016-10-12 16:18:32 +03:00
f5268c7c6c
Fixes
...
It compiles now, but it's probably really broken.
2016-10-11 21:37:23 -03:00
72033a581e
Merge remote-tracking branch 'refs/remotes/barotrauma/master'
...
Conflicts:
Subsurface/Properties/AssemblyInfo.cs
Subsurface/Source/Characters/Character.cs
Subsurface/Source/GUI/GUI.cs
Subsurface/Source/GameMain.cs
Subsurface/Source/GameSettings.cs
Subsurface/Source/Items/CharacterInventory.cs
Subsurface/Source/Items/Components/ItemComponent.cs
Subsurface/Source/Items/Components/Machines/Pump.cs
Subsurface/Source/Items/Components/Machines/Radar.cs
Subsurface/Source/Items/Components/Machines/Steering.cs
Subsurface/Source/Items/Components/Power/PowerContainer.cs
Subsurface/Source/Items/Inventory.cs
Subsurface/Source/Items/Item.cs
Subsurface/Source/Items/ItemSpawner.cs
Subsurface/Source/Map/Levels/WaterRenderer.cs
Subsurface/Source/Map/LinkedSubmarine.cs
Subsurface/Source/Map/Map/Map.cs
Subsurface/Source/Map/Structure.cs
Subsurface/Source/Map/Submarine.cs
Subsurface/Source/Map/WayPoint.cs
Subsurface/Source/Networking/GameClient.cs
Subsurface/Source/Networking/GameServer.cs
Subsurface/Source/Physics/PhysicsBody.cs
Subsurface/Source/Screens/GameScreen.cs
2016-10-11 20:19:25 -03:00
9dfba4921e
Merge branch 'combat-mission'
2016-10-11 16:35:43 +03:00
636b25d725
Readded inventory tooltips
2016-10-10 21:24:46 +03:00
d8476d9371
Hull-specific ambient lighting: light sources increase the amount of ambient light in rooms and the light can spread to adjacent rooms through gaps. Allows making the default ambient light much darker without making shadows look too dark in fully lit subs.
2016-10-10 21:13:22 +03:00
f0f385c2b2
Fixed clients not seeing additional cargo + spawn monster cursor
2016-10-10 11:05:33 -03:00
74a9453676
Upper limit to water drag force, fixed highlighted items "flickering"
2016-10-09 20:45:28 +03:00
f64743a57c
SubInventories return "back to normal" if removed from the parent inventory (e.g. crate inventories aren't drawn above the hand slots after dropping the crate)
2016-10-09 17:36:11 +03:00
f4c5c5e542
Added a particle trail to railgun shells
2016-10-09 15:13:41 +03:00
e50b801a47
Separate draw/update methods for editingHUD & resizing
2016-10-07 17:06:26 +03:00
Regalis
juanjp600