Commit Graph

1695 Commits

Author SHA1 Message Date
Joonas Rikkonen 90986751c3 Merge branch 'antagonists' 2017-12-05 19:05:39 +02:00
Joonas Rikkonen 6e78e945a7 Minor code style nitpicking :) 2017-12-05 19:05:21 +02:00
Joonas Rikkonen 63493d2b9d Added a Character.AddDamage override method that does damage to a specific limb instead of the limb closest to the source of the damage. Projectiles and melee weapons now always do damage to the limb they hit, even if the center point of some other limb happens to be closer.
Also refactored the IDamageable interface to make more sense; now the attacker has to be a character instead of an IDamageable and damageable classes don't need to have an AiTarget.

Closes #69
2017-12-05 18:03:00 +02:00
Juan Pablo Arce 258047e638 Merge pull request #79 from Crystalwarrior/ClientFixes
Chat tweaks and fixes
2017-12-05 12:54:28 -03:00
Alex Noir 0e586651e7 Adds a [PM] tag
Fixes .Private message type colors being silly
2017-12-05 18:50:36 +03:00
Alex Noir fdd3db82e6 oops fixed logic 2017-12-05 18:22:03 +03:00
Alex Noir d4ce079d65 Lets people use keybinds to start chatting in lobby 2017-12-05 18:01:10 +03:00
juanjp600 ffbb327fb4 Fixed client exception when round ends 2017-12-05 11:32:27 -03:00
Alex Noir fde3ed40a8 Prevent clients from chatting when unconscious on the serverside to prevent clients from "hacking" and enabling chat box. 2017-12-05 17:21:45 +03:00
Alex Noir a290a6a337 Tweak chatting so you can finally use keybinds OTHER than TAB/~ for chat/radio chat by disabling those keybinds when the chat box is active. This is not a problem anymore because pressing enter stops the chat box.
This is a positive change since this is a lot more "industry standard" than the previous system, which initially was very confusing and unfamiliar (at least personally).
2017-12-05 16:25:51 +03:00
Alex Noir 1e8c1f7f04 Fixed a NullReferenceException caused when you try to play a round with traitors enabled while there are not enough player characters. 2017-12-05 16:17:51 +03:00
Joonas Rikkonen 6993242373 Updated readme.md (MonoGame 3.5 -> 3.6) 2017-12-05 12:05:57 +02:00
juanjp600 c6ca3572ba Added an option to respawn directly in the main sub 2017-12-05 03:03:37 -03:00
juanjp600 e69e316f6b Added the option to disable karma 2017-12-04 20:52:25 -03:00
juanjp600 ca30b901a6 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-04 20:32:27 -03:00
juanjp600 72e42bd257 Added try-catch to PhysicsBody.Enabled setter
Hopefully this should help us track down what's causing this exception
2017-12-04 20:32:22 -03:00
Joonas Rikkonen 243b3843b8 Fixed worn items being assigned multiple times to the same limb when equipping an item that takes up multiple slots, causing damagemodifiers to be applied multiple times. + DamageModifiers with the damage type "None" don't affect damage.
Closes #68
2017-12-05 01:01:55 +02:00
Alex Noir 38815c3b69 Added code words to traitorlist console command 2017-12-05 00:30:21 +03:00
Alex Noir 3b02f0c86a Seems like sending a long-winded copy-paste of the traitor greeting message to host when he's still in lobby causes an error: https://cdn.discordapp.com/attachments/386620407035330561/387295192946049025/unknown.png
This is mostly a bugfix
2017-12-05 00:20:36 +03:00
juanjp600 a0782e5d8d Blowing up the reactor sets karma to 0, all jobs except assistant require a certain karma level 2017-12-04 17:05:22 -03:00
Alex Noir 94b2c4c9e7 Moved code around a bit, moved traitor greeting to Greet function in Traitor class 2017-12-04 20:03:29 +03:00
Alex Noir eb82ed6092 Merge commit 'a19579088ffa87bb873bf6baf6cdc9a1ef60dbb1' into antagonists 2017-12-04 20:02:59 +03:00
juanjp600 2347f2937e Improved revolver hitreg, shooting structures affects karma, fixed 5th server being blocked in server list
Closes #70
2017-12-04 12:39:27 -03:00
juanjp600 6841bb154b Added Karma, harming players reduces it 2017-12-03 21:51:12 -03:00
juanjp600 4a1eea8c30 Fixed crash when setting a filter while the game is refreshing the server list 2017-12-03 20:33:20 -03:00
juanjp600 f8e5a4f7ab Use SetClientCharacter in AddToRemoveQueue 2017-12-03 19:09:55 -03:00
juanjp600 2d1220e1fd Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-03 19:06:15 -03:00
juanjp600 e323e9dc71 Fixed chat messages being assigned to the wrong sender when their bodies have been eaten 2017-12-03 19:06:01 -03:00
Joonas Rikkonen b68cceae55 Added smallitem tag to revolver rounds
Closes #65
2017-12-03 22:56:53 +02:00
Alex Noir c74f2d66b2 one more keyword 2017-12-03 23:26:02 +03:00
Alex Noir 63f8760b86 Added traitor code words
Fixed host never being traitor
2017-12-03 19:39:31 +03:00
juanjp600 a19579088f Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-03 11:59:34 -03:00
juanjp600 3db407fe52 Fixed wire connections being lost when copy-pasting in sub editor 2017-12-03 11:59:29 -03:00
Joonas Rikkonen 8735dffd04 Added console command for killing characters 2017-12-03 15:36:20 +02:00
Joonas Rikkonen b36d3fc70e Fixed clients not getting notified when a character is spawned midround by a repeating MonsterEvent (eventually causing them to be kicked out because of desync).
Closes #59
2017-12-03 15:32:51 +02:00
Alex Noir ca535d295f Merge remote-tracking branch 'origin/master' into antagonists 2017-12-03 13:10:04 +03:00
Joonas Rikkonen f0225e4312 Chemicals and explosives can be thrown. Nitroglycerin & flash powder explode on impact, no effect on other items yet (implement applying status effects when the item hits someone?) 2017-12-03 01:10:26 +02:00
Joonas Rikkonen ddf9ad26b8 v0.7.0.1 2017-12-03 01:07:16 +02:00
Joonas Rikkonen 9e5f503659 Added minor damage protection to diving suit 2017-12-03 01:07:04 +02:00
Alex Noir 56df7b6900 Support for multi-traitors!
It's possible for traitors to share targets and/or target each other.
Todo: code phrases-responses, clientside settings for traitor amount
2017-12-03 00:43:14 +03:00
Joonas Rikkonen 20664c08fd Fixed limb lightsources not rotating with the limb 2017-12-02 19:15:27 +02:00
Juan Pablo Arce 3bcd128ac7 Fixed extra quote in carrier.xml 2017-12-02 13:19:44 -03:00
Joonas Rikkonen f55d028799 Chatbox can be deselect by pressing enter while it's empty 2017-12-02 17:47:05 +02:00
Joonas Rikkonen 1cc33d221d Moving the sub using IJKL in debug builds is disabled when writing into a textbox. 2017-12-02 16:46:27 +02:00
Joonas Rikkonen 063881701c Fixed exceptions when attempting to set the value of a serializable rect property by parsing a string 2017-12-02 16:25:21 +02:00
Joonas Rikkonen c66191ca94 Added exception handling to SerializeProperty.TrySetValue methods 2017-12-02 15:50:40 +02:00
Joonas Rikkonen ccac8de723 Removed unused NetConfig constants and leftover debug code in GameServer 2017-12-02 15:42:52 +02:00
Joonas Rikkonen 04bcc6b9b1 Modifications to the damage/armor system:
- Armor values aren't reduced from the damage taken, but instead multiply the damage (e.g. an item reduces damage by 10% instead of 10 hp). Now armor doesn't make characters invulnerable to small amounts of damage.
- Armoring isn't defined as a single "armor value", but instead there are "damage modifiers" which can be added to items and limbs. The modifiers can only affect specific types of damage and have separate multipliers for the damage amount and bleeding amount.
- Having a fire proof item on a limb doesn't make that limb invulnerable to burn damage. Item's that protect against fire now have a damage modifier for the Burn damage type.
2017-12-02 15:42:13 +02:00
Joonas Rikkonen 1d4327b690 Diving suits cover feet (fixes characters receiving damage almost exclusively to their feet when wearing a diving suit) 2017-12-02 15:35:29 +02:00
Joonas Rikkonen 78e97097cd Fixed autorestart counter overlapping with the campaign map in the server lobby screen
Closes #57
2017-12-02 15:28:46 +02:00