1ff2054ca8
Converted the GetAttribute methods in the ToolBox class to extension methods
2017-10-04 18:38:40 +03: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
e15f5a881b
Merge branch 'dedicated-server' (TODO: make sure I didn't break anything)
...
Conflicts:
Barotrauma/Barotrauma.csproj
Barotrauma/BarotraumaShared/Source/Characters/AI/AIController.cs
Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs
Barotrauma/BarotraumaShared/Source/Characters/AICharacter.cs
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
Barotrauma/BarotraumaShared/Source/Characters/Attack.cs
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
Barotrauma/BarotraumaShared/Source/Characters/CharacterNetworking.cs
Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
2017-06-30 21:02:52 +03:00
1b5c4ae63a
UpdateControlled only runs on the controlled character (-> fixes camera always focusing on the last spawned character)
2017-06-29 18:49:54 +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
Joonas Rikkonen
juanjp600