b3eaa6bd17
Merge remote-tracking branch 'origin/master' into moStuff
...
# Conflicts:
# Barotrauma/BarotraumaShared/BarotraumaShared.projitems
# Barotrauma/BarotraumaShared/Data/clientpermissions.xml
2017-12-23 17:33:24 +03:00
60329fb0d1
Fixed missing clientpermissions.xml preventing hosting
...
Fixed double-clicking items in corpses putting them in their hands instead of your inventory
Fixed game over/round end music not playing in multiplayer
Added Item Combinations for things like chemicals, etc. - this transfers condition from one item to another
Added game over text to multiplayer round summary
2017-12-23 16:59:08 +03:00
6d30557860
Overhaul fabricators and deconstructors to have minCondition, maxCondition (deconstructor) and outCondition
...
Implement several suggestions listed in https://github.com/Regalis11/Barotrauma/issues/196
Add more fabricatables and deconstructables
2017-12-22 21:33:14 +03:00
ac53c5f80d
Fixed campaign view button overlapping with the spectate button in NetLobbyScreen. Closes #117
2017-12-22 01:18:16 +02:00
9610444e67
Merge branch 'master' into moStuff
...
# Conflicts:
# Barotrauma/BarotraumaShared/Source/Characters/Character.cs
2017-12-21 23:17:56 +03:00
9251dbf83a
Overhaul DelayedEffect to support application to multiple targets
...
Fix DelayedEffect being unusable by monsters due to monsters calling Single Target Apply in their Attack, which DelayedEffect doesn't override, by making Apply (single target) call Apply (multiple targets) which THEN calls the protected Apply function.
Nerf Amanitin to require two injections to be lethal. First injection only stops oxygen from regenerating and slightly saps HP.
Add Cause of Death to Health HUD
2017-12-21 21:40:54 +03:00
9ed2871ede
Renamed a couple of properties for consistency & removed unnecessary CPR blood particle scaling
2017-12-20 20:26:22 +02:00
dde320b387
Merge pull request #101 from Crystalwarrior/moRags
...
Body shoulder-grab, better CPR anims, CPR and Crit overhaul!
2017-12-20 19:37:38 +02:00
ce37411a29
Merge branch 'permission-overhaul'. Closes #49
...
Conflicts:
Barotrauma/BarotraumaShared/Source/DebugConsole.cs
Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
2017-12-20 19:36:17 +02:00
b3c3970209
Server responses to clients using console commands ("granted permissions to client", error messages, etc) are displayed in the client's debug console instead of the chat box. Client command usage is included in server logs.
2017-12-20 19:18:32 +02:00
3e4d2c5a8a
Fixed incorrect positioning of debug console question prompts. The ShowQuestionPrompt method used to take the last textblock in the console and consider that as the question prompt text, even though the text had only been queued and the actual GUITexblock hadn't been instantiated yet.
2017-12-20 18:57:42 +02:00
0204bc2c49
Added permission presets (or ranks). Current presets are none (no special permissions), moderator (round management & kicking) and admin (almost everything permitted).
2017-12-19 22:27:07 +02:00
0a8c79c1cb
Fixed exceptions in GUIListBox.Select if any of the children have null userdata, option to add tooltips to GUIDropDown items
2017-12-19 22:22:42 +02:00
d03dd40336
Fixed item GUIMessages overlapping with each other
2017-12-19 18:11:47 +02:00
26503a975c
Fixed sub->sub and outside->sub visibility checks when determining name tag visibility.
2017-12-17 22:34:24 +02:00
e5c49d929d
Fixed ragdolling and grab-type switching in singleplayer
2017-12-17 23:13:50 +03:00
9e307d8302
Merge branch 'master' into moRags
2017-12-17 22:58:16 +03:00
6127bb473d
- Moved character nametag visibility culling to the update method (doesn't make sense for the update rate to be tied to rendering framerate).
...
- Name tags on characters that are outside the camera view are automatically hidden to avoid the costly visibility checks.
- If the controlled character or the target has no head, the visibility check is done based on the position of the torso.
- Fixed sub->outside visibility checks.
- Fixed invalid attributes in the flashlight config.
2017-12-17 21:47:03 +02:00
1e5b25bd1a
Merge branch 'master' into moRags
2017-12-17 22:41:45 +03:00
041d1112b8
Added a timer to the raycasts so it's not screwing over performance too hard
2017-12-17 21:35:19 +03:00
714b52dce8
Fixed several sound-related issues that have been bothering me for ages, e.g.
...
* Sounds not playing when the structure is fully destroyed
* Glass windows using wrong sound effects
* Only one glassBreak sound was used despite there being 3
2017-12-17 18:05:05 +03:00
4f7c805a9c
Hide character names/health/etc. if you can't see their head or it doesn't exist.
...
TODO: use Line of Sight instead of CheckVisibility
2017-12-17 15:17:15 +03:00
0ce9acb76a
fix things
2017-12-16 21:45:30 +03:00
8ab97af456
Allow sub makers to alter the ID Card's description property on spawn points
2017-12-16 21:30:18 +03:00
bdeb3a19fd
Updated server logs so admins can see disguised persons
...
clientist should also display stuff
TODO: Log inventory interactions like putting item in slots (e.g. oxy mask equipped in Head slot or equipped in Any slot, etc.) so you can tell the exact moment someone decided to disguise themselves.
2017-12-16 20:24:24 +03:00
bd646fb23e
Implements identity system! If your mask hides your face (e.g. oxygen mask, clown mask and diving suit), the game will either use the name of the ID card owner in your ID card slot or will give you a "?" name.
...
This only affects "DisplayName". The reason why I can't completely override the .Name for the client from server is due to how crew manifest and CharacterInfo classes are handled - it would require a major rework of many Character-related systems and interactions to truly make this "hack-proof".
Server hosts will have to stay on their toes I guess.
2017-12-16 19:52:25 +03:00
18d75c620f
Adds crowbar function to force-open doors...
...
***except the Door component ignores the damn requireditem and allows bare fukken hands to open it goddamnit***
2017-12-15 16:47:10 +03:00
760452170e
Implement ID card slot and ID card description that states the owner and his job in preparation for identity system
2017-12-14 22:57:42 +03:00
986862b23e
The GUIMessageBox constructor with no width or height parameters automatically resizes the box according to the size of the text instead of using the default height.
...
Closes #131
2017-12-14 00:16:13 +02:00
847e10d4a2
Fixed wires not being dropped server-side when a player drops a connected wire without dragging it to their inventory first (or client-side when a host does so).
...
Closes #96
2017-12-13 18:34:23 +02:00
c4e894cb2e
Fixed camera going insane when dropping through hatches
...
TODO: make the game less rubberbandy
2017-12-12 21:08:37 -03:00
23b220b6af
Sync character collider rotation, try to make collider face the main limb by instantly flipping it if the angle's too wide, client-side ragdoll correction is more aggressive
2017-12-12 17:58:49 -03:00
07aeac4fdc
Traitor Count/Coefficient and Ragdoll and Karma server settings buttons!!! oh my GOD!!!
2017-12-09 19:09:10 +03:00
de7489db8b
Change int to UInt32 for grabLimb networking
...
Fixed IsRagdolled state networking
2017-12-08 20:55:46 +03:00
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
fff8d714fe
I THINK this is all that needs to be done to network it...right?
2017-12-08 14:09:09 +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
7026da2748
Health Scanner HUD shows the status of all nearby characters without having to highlight them. Fixes being unable to scan characters that aren't dead or unconscious. Non-human characters can also be scanned now.
...
Closes #73
2017-12-07 19:34:32 +02:00
9599137e83
Console command permissions can be changed in the client permission menu, permitted commands are displayed in the client-side permission popup
2017-12-07 18:25:08 +02: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
9bc0931be5
Clients can execute permitted console commands server-side now. The console commands have three different actions: the default action, one that's executed client-side when a client uses it, and one that's executed server-side when a clients requests it. If the client-side action is omitted, the client relays the command to the server as-is. If the third action is omitted, the server executes the default action.
2017-12-06 19:53:05 +02:00
3df2c20ee1
Merge pull request #81 from Crystalwarrior/ragdollbutton
...
Adds ragdoll button. Because why not.
2017-12-06 13:02:35 -03:00
4a8e411a70
Fixed carrying stunned people being a severe case of a major ass pain by carrying over the "stairs" from the carrier.
...
Added "CarriedBy" property, publicized CarriedCharacter and CarriedBy, synced CarriedCharacter and CarriedBy for cool points
Publicized Stairs property
2017-12-06 18:58:18 +03:00
10a77e6137
Cleanbuild console command removes the list of banned players (won't be included in builds to prevent the file from being cleared when updating the game)
2017-12-06 13:31:08 +02:00
2e6d35ce8e
Doors with no broken sprite turn black when destroyed (just like before). TODO: graphics for broken ruin doors/hatches
2017-12-05 22:31:13 +02:00
0b603ba10b
Fixed particles in water being drawn under ruin structures (making it seem like plasma cutters aren't working), fixed all structures having the default health of 100 because of mismatching parameter name (Health vs MaxHealth)
2017-12-05 22:30:24 +02:00
b26b6a7418
Fixed ragdolled players suffering less impact damage than non-ragdolled one.
...
Also fixed limb impact sounds on the clientside for ragdolls
2017-12-05 23:03:40 +03:00
ee8c4dfb3a
Adds ragdoll button. Because why not.
...
Also adds admin ragdoll command to force people into ragdoll mode.
The networking/syncing wasn't yet tested for this but hopefully everything should work.
Updates config.xml to add default keybinds for radio chat and ragdoll
2017-12-05 20:50:24 +03:00
Alex Noir
Joonas Rikkonen
juanjp600
Juan Pablo Arce