vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
792 Commits 5 Branches 2 Tags
62dd055e8d88254a1d5bddeec4e54ab2ff6cb1be
Commit Graph

690 Commits

Author SHA1 Message Date
Regalis
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
Regalis
07f8c966ab Submarine position is synced using the same logic as the characters, AICharacter position syncing 2016-10-25 19:01:19 +03:00
Regalis
ac8edb5b2a Fixed monster/artifact events being out of sync between the server and the clients 2016-10-25 18:58:56 +03:00
Regalis
c33a4ba5e5 AmbientLightHulls optimization (only spread to adjacent hulls once, not once per every gap between the hulls) 2016-10-25 15:40:19 +03:00
Regalis
a8484e10ff Unlit LOS effect, IJKL doesn't move the sub when the debug console is open 2016-10-23 19:01:46 +03:00
Regalis
641e579e92 Backported animcontroller-overhaul 2016-10-22 15:18:16 +03:00
Regalis
c144a11119 Merge branch 'master' into animcontroller-overhaul 2016-10-22 13:38:25 +03:00
Regalis
b410a04a86 Fixes 2016-10-21 19:55:48 +03:00
Regalis
bb9b2c6eb7 Fixed inventory getting "stuck" if slots are merged while one of them is selected 2016-10-21 18:30:03 +03:00
Regalis
92b61ee816 Merge branch 'master' into animcontroller-overhaul 2016-10-19 21:15:44 +03:00
Regalis
e2d0e7fe24 Moved collider position correction logic to the physicsbody class (so that it can be used for sub & item syncing), character position msg length is written in bytes instead of bits, misc cleanup/refactoring 2016-10-19 20:49:18 +03:00
Regalis
8cb9450217 CaveGenerator doesn't attempt to create triangles whose area is too small for Farseer to handle 2016-10-19 16:55:16 +03:00
Regalis
813ebc79f4 Updating HUDs of equipped items (= handheld sonars work again) 2016-10-19 16:37:44 +03:00
Regalis
b4389277aa Collider isn't moved to the position of the main limb when frozen, limb collisions are temporarily disabled if the ragdoll is too far from the collider, some cleanup 2016-10-19 16:21:54 +03:00
Regalis
51a2bf097d Using update IDs instead of timestamps to correct client-side movement predictions 2016-10-19 00:56:24 +03:00
Regalis
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
Regalis
6cf6b31594 Ragdoll syncing bugfix 2016-10-18 19:04:47 +03:00
Regalis
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
Regalis
b68eeda8a8 WIP position syncing 2016-10-17 22:34:59 +03:00
Regalis
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
Regalis
efcc466fdd - added colliders to all monster configs 
- disabling monster collider & placing it at mainlimb when stunned/dead/frozen
- monsters can't swim above water
- misc fixes
 2016-10-17 16:32:57 +03:00
Regalis
704c7c7561 Collider-controlled monster movement 2016-10-16 22:24:33 +03:00
Regalis
f3e74a6a41 Collider-controlled swimming, fixes 2016-10-16 20:07:34 +03:00
Regalis
db8c2b9f8e Changed colliders from limbs to normal physics bodies, removed RefLimb 2016-10-15 20:08:51 +03:00
Regalis
1b59d1bc21 - disabling the collider and placing it on the torso when swimming, stunned or dead (todo: attempt to get swimming working with the collider controlling movement) 
- only the collider can receive impact damage
- shorter collider to allow crouching in tight spaces
- AI characters are considered close enough to a waypoint if their collider overlaps with it (instead of a distance check)
 2016-10-14 16:11:45 +03:00
Regalis
9d9c50a520 Progress 2016-10-14 01:10:46 +03:00
Regalis
62c88be214 Controlling humanoid movement with one capsule-shaped physics body that other limbs (attempt to) follow 
Broken and WIP
 2016-10-14 00:13:19 +03:00
Regalis
fbf4b4fcad LOS can be disabled through the console, slightly brighter default LOS color 2016-10-13 16:02:54 +03:00
juanjp600
506ef2f2aa Attempted fix for drawableComponents crash + LOS tweaks 2016-10-12 19:24:39 -03:00
juanjp600
7e6ef65eb3 Improved LOS effect 
It's pretty inefficient (I need to figure out how to set up new shaders), and it might let the player see too much, but it looks way better than pure black.
 2016-10-12 16:54:41 -03:00
Regalis
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
Regalis
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
Regalis
060a1db431 Fixed null exception in CharacterInventory 2016-10-12 20:57:06 +03:00
Regalis
170e1a0da8 ItemRemover -> EntityRemover, clients reset spawner & remover when starting a new round 2016-10-12 20:46:47 +03:00
Regalis
60b36e020c Changed ItemSpawner to EntitySpawner, used for syncing both item and character spawning 2016-10-12 19:25:01 +03:00
Regalis
ac3539da63 Item spawn syncing 2016-10-12 18:29:44 +03:00
Regalis
a235b90aee Job & waypoint assignment 2016-10-12 16:49:43 +03:00
Regalis
1d25362df6 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 2016-10-12 16:24:41 +03:00
Regalis
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
juanjp600
f5268c7c6c Fixes 
It compiles now, but it's probably really broken.
 2016-10-11 21:37:23 -03:00
juanjp600
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
juanjp600
4caf00dd9d Some extra checks to prevent character flinging 
New netcode will solve all of these problems the right way.
 2016-10-11 19:40:35 -03:00
Regalis
9540972db4 Added a near-indestructible ruin wall variant that has a higher chance of being used in rooms further away from the ruin entrance 2016-10-11 22:46:24 +03:00
Regalis
f9017d3cf9 User-controlled monsters can damage structures from outside the sub 2016-10-11 21:11:06 +03:00
Regalis
bbec3d64dc Amount of ambient light decreases when going deeper, closest sub can be moved with IJKL 2016-10-11 18:23:25 +03:00
Regalis
d21c6674ea Level generation bugfixes: 
- cell bodies match the shape of the cell (triangulation didn't work correctly because the center of the cell was given in display units while vertices were in sim units)
- ignoring graph edges whose length is zero when generating cells (fixes "invalid left/right normal" errors)
 2016-10-11 18:18:54 +03:00
Regalis
9dfba4921e Merge branch 'combat-mission' 2016-10-11 16:35:43 +03:00
Regalis
7e20d7a17a Timing.Alpha isn't updated if accumulator < step, using interpolated positions to draw lightsources & ragdoll/ai debug info (-> no twitching when the sub is moving) 2016-10-11 16:34:59 +03:00
Regalis
cb992c7d66 Fixed crashing if a matching waypoint isn't found when spawning a monster 2016-10-10 21:38:19 +03:00
Regalis
636b25d725 Readded inventory tooltips 2016-10-10 21:24:46 +03:00