2598bb1bd3
Fixed attachable items becoming detachable without any tools after they've been detached once
2017-07-08 18:32:21 +03:00
4e4983f0a6
If focused on both a character and an item, the one that's closer to the cursor can be interacted with (instead of characters having higher priority, because that would make it impossible to interact with items that are next to a dead/unconscious character). Selected characters can also be deselected without highlighting the character with the cursor.
...
+ extra null check in HasRequiredItems
2017-07-08 14:32:01 +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
9b054ebd50
Added an artifact that attracts creatures, item max health can be changed & items can be made indestructible
2017-07-04 22:10:30 +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
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