Commit Graph

350 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Regalis
d4e9116b0f Audio channel states visible in debug view + some sound fixes:
- a short "cooldown" after each footstep sound (prevents the sound playing multiple times during one footstep)
- water flow sounds are only played by one of the hulls a gap is between
- flow rate affects the range of the flow sound
2016-10-09 20:11:08 +03:00
Regalis
ef9dce9a0d - fixed exception in GetSubsToLeaveBehind if the round ends when none of the subs is at an exit
- water surface is clamped above the bottom of the hull
- character names don't overlap with health bars
2016-10-09 18:20:32 +03:00
Regalis
f4c5c5e542 Added a particle trail to railgun shells 2016-10-09 15:13:41 +03:00
Regalis
e720fa366c Timing.Alpha isn't updated when the game is paused (-> no "twitching" when the pause menu is open), moved water scrolling and surface lerping from draw method to update 2016-10-09 15:12:57 +03:00
juanjp600
a1d319d0df Merged branch new-netcode into new-netcode 2016-10-08 19:14:52 -03:00
Regalis
3de4645357 Separated waypoint edit/update methods, fixed items/structures being immediately placed when selecting them in the editor, fixed GUIListBox children ovrlapping with the scrollbar 2016-10-08 19:46:56 +03:00
Regalis
1ba87165b0 Fixed camera being placed at {-2147483647, -2147483647} when starting a round, fixed debugdraw crashing the game, moving spectator camera along with the closest sub in Submarine.ForceTranslate 2016-10-08 17:19:54 +03:00
Regalis
e50b801a47 Separate draw/update methods for editingHUD & resizing 2016-10-07 17:06:26 +03:00
juanjp600
94895edbdb Fixes and minor enhancements for sub editor
- Zoom now works relative to the mouse's position rather than the center of the screen, much like Valve's Hammer Editor (or pulsegun's map editor shameless plug ;) )
- Rectangles now have line widths dependent on the camera zoom, not perfect but it's better than having lines disappear
- Fixed background resizing
- Fixed editor being completely broken because of no vsync, might still have a few bugs here and there
- Fixed selection rectangle not rendering at all when dragging from bottom right to top left
- Newline change in Item.cs
2016-10-06 21:15:01 -03:00
Regalis
16ee20aaaa whoops 2016-10-06 21:26:20 +03:00
Regalis
70b8bf1937 Preventing monsters from spawning too close to any sub (not just the main sub) 2016-10-06 21:17:33 +03:00
juanjp600
3d8f5070c5 Added all smallitems to extra cargo list + removed duplicate entries 2016-10-05 16:57:06 -03:00
Regalis
54f3d09af4 Update/rendering logic separation (cherrypicked from commits 9ca3b24, bddcc36 & 9511bae) 2016-10-05 20:35:18 +03:00
Regalis
9ca3b24585 Moved some more UI update logic from draw to update
todo: inventories (oh the horror)
2016-10-04 20:41:00 +03:00
Regalis
ffc6782025 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:54:17 +03:00
Regalis
050f7ffc83 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:21:05 +03:00
Regalis
292218b9b0 WallSection flipping 2016-10-03 22:40:14 +03:00
Regalis
3ec6f008d5 Item/structure sprites flip by default 2016-10-03 16:43:03 +03:00
juanjp600
e1296e4a8e Backported vsync changes from new-netcode, WIP hull visibility culling
The hull culling functions are there, they just aren't being used right now because there are some annoying bugs.
2016-10-02 22:24:31 -03:00
juanjp600
75e7b3a94e Merged branch master into combat-mission 2016-10-01 20:10:38 -03:00
juanjp600
bdcd894b83 Flipping sprites of staircases & engine 2016-10-01 16:41:16 -03:00
Regalis
0fe822c96a Stair body + linkedsub flipping 2016-09-30 20:07:36 +03:00
Regalis
8e8a0e57f0 Cleaned up the flipping logic a bit, overridable MapEntity.FlipX method 2016-09-30 19:48:56 +03:00
Regalis
0da9f58325 Fixed physics item & wire flipping 2016-09-30 19:00:12 +03:00
juanjp600
f6b82eb095 Some progress on flipping subs
Press crouch to flip every sub in the map, texture alignment breaks and physics items vanish, but other than that it's working.
2016-09-29 22:20:15 -03:00
Regalis
25274dd03f Linux damageshader, fixed keyhits being registered multiple times, added LevelGenerationParams.xml to the vanilla content package 2016-09-29 19:04:45 +03:00
Regalis
86c50304dd - saving after MainSub has been removed (i.e. saving after returning to map screen) doesn't break save files anymore
- fixed subs getting left behind if the sub moves too far from the start/end position during the ending cinematic
- map shows which LocationConnections have been passed through
2016-09-28 19:16:50 +03:00
Regalis
c5ce3a75a2 Sp campaign map shows which locations have been visited (+ some minor visual improvements to the map) 2016-09-28 16:53:08 +03:00
juanjp600
fc8eab688d Merged branch master into new-netcode 2016-09-27 19:45:14 -03:00
juanjp600
71ebbc00d9 Merged branch master into combat-mission 2016-09-27 19:42:35 -03:00
juanjp600
e318034a1a Remove submarines markers from radar in combat missions
This should make the mission type a lot more fun.
2016-09-27 19:42:15 -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
344947c3c4 Search and destroy mission
Featuring ugly code
2016-09-26 22:09:06 -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
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