286f290e57
Fixed networking
2017-12-08 15:32:37 +03:00
8788efa007
Merge remote-tracking branch 'origin/master' into moRags
2017-12-08 14:43:56 +03:00
48fb3d58b9
Let players choose to grab onto the body's torso!
...
Better CPR animations
todo: network the limb targeting
2017-12-08 13:47:27 +03:00
26216a0d99
Fixed fish being selectable
...
Closes #91
2017-12-07 00:01:48 -03:00
a272d22de8
Players can now pick up corpses to eat them
2017-12-06 17:57:58 -03:00
f4f58622e1
Short delay before the "pressure increasing" message is displayed (because clients may briefly be outside the sub before they get in sync with the server)
2017-11-24 18:53:21 +02:00
765587efd7
Renamed screens (EditMapScreen -> SubEditorScreen, EditCharacterScreen -> CharacterEditorScreen)
2017-11-18 15:13:03 +02:00
ff926c1da2
Warning texts when water pressure is increasing to dangerous levels and when running out of oxygen, added a method for invoking an arbitrary action after a delay to CoroutineManager
2017-11-14 19:10:43 +02:00
bf5a0746ad
Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master
...
Conflicts:
Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
Barotrauma/BarotraumaShared/Source/Items/Item.cs
2017-07-05 19:32:34 +03:00
64ad5e5003
Removed unnecessary using directives
2017-07-05 18:35:09 +03:00
4d225c65f2
Updated to MonoGame 3.6 + Directory refactor
...
- Barotrauma's projects are in the Barotrauma directory
- All libraries are in the Libraries directory
- MonoGame is now managed by NuGet, rather than referenced from the installed files (TODO: consider using PCL for easier cross-platform development?)
- NuGet libraries are not included in the repo, as getting the latest versions automatically should be preferred
- Removed Content/effects.mgfx as it didn't seem to be used anywhere
- Removed some references to Subsurface directory
- Renamed Launcher2 to Launcher
2017-06-27 09:52:57 -03:00
Alex Noir
juanjp600
Joonas Rikkonen