bd4c7d68d0
Fixed endless messagebox spam when the controlled character turns into a husk, fixed an index our of range exception when merging firesources
2017-07-09 16:17:44 +03:00
d4b58e16b9
Fire & explosion decals
2017-07-08 18:30:07 +03:00
4d2e7c33b1
Decal system (TODO: add decals for explosions and fire), moved some of the client-specific Hull update logic to the client project
2017-07-06 21:38:32 +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
8f3c58de4b
Fixed null exceptions when selecting a sonar in a sub with no hulls
2017-07-05 17:39:30 +03:00
e431cc775f
Some null checks, clients log initial lobby update, minor lighting optimization
2017-07-04 22:36:00 +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
d397253fa1
Added missing debugconsole lock
2017-07-04 17:18:33 +03:00
60a826f0cd
Separate help commands for server and client
2017-07-03 20:55:22 +03:00
8aa6ba71b6
Another attempt to fix the "Destination array was not long enough" errors in AddToGUIUpdateList:
...
The errors seem to be caused by adding messages to the debug console from another thread, which may happen if an OpenAL error occurs during sound streaming. Now the debug console queues the messages and creates the necessary UI elements in the main thread, which should(?) make it thread-safe. (TODO: figure out what's causing the OpenAL errors)
2017-07-03 19:08:52 +03:00
0d7851367b
Dedicated server loads the name, password and other initial settings from the serversettings file. + Fixed not being able to change the server name if the current name is null or empty
2017-07-03 18:44:06 +03:00
8e880b2ded
Added GUINumberInputs to the extra cargo menu, minor additions to GUINumberInput
2017-07-02 22:17:12 +03:00
8ae2fb225c
- Ban duration can be set in the UI prompt.
...
- Ban reasons & durations are listed in the banlist menu.
- Clients tell the server the reason when kicking/banning another client.
- Added GUINumberInput GUIComponent.
- Ban duration saving/loading fixes.
2017-07-02 21:36:17 +03:00
df0bdb64d6
- Ban durations (TODO: add a way to set and view the durations through the menus).
...
- Separated ban & kick methods.
- Fixed compilation errors in DebugConsole when building the server.
2017-07-02 18:58:07 +03:00
da71b6bf9c
Option to supply a reason for banning/kicking, logic for handling question prompts in the debug console
2017-07-02 15:25:55 +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