Commit Graph

1846 Commits

Author SHA1 Message Date
Juan Pablo Arce
c2e2f0ca8d Fixed damageshader color parameter being optimized out
color is a parameter for the main function
2017-12-31 19:19:34 -03:00
Juan Pablo Arce
fa09aaa57c Fixed damageshader color parameter being optimized out
color is a parameter for the main function
2017-12-31 19:15:52 -03:00
Juan Pablo Arce
5c2872c1e1 Separate versions of each shader are now more easily available for compilation
TODO: write up some way to share shader code and use platform-specific features
2017-12-31 19:04:04 -03:00
Juan Pablo Arce
959e5dfed1 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-31 17:45:12 -03:00
Juan Pablo Arce
904052390c Fixed LOS effect on Windows, fixed SharpDX reference, rebuilt damageshader_opengl 2017-12-31 17:45:05 -03:00
Joonas Rikkonen
c77c598cb6 Fixed items being dropped when attempting to place them in an itemcontainer slot that's on a normal inventory slot. Closes #200 2017-12-31 01:59:49 +02:00
Joonas Rikkonen
7d2b701784 GUIMessageBox text overflow fix: the padding of the GUIFrame is taken into account when determining the height of the text, and the messagebox is always automatically resized if the height parameter is not given. 2017-12-30 18:32:27 +02:00
Joonas Rikkonen
343895d776 Console command arguments can be autocompleted by hitting tab. Closes #162 2017-12-30 18:30:55 +02:00
Joonas Rikkonen
65d6071378 Fixed damageshader ignoring sprite colors. Closes #212 2017-12-30 04:51:39 +02:00
Joonas Rikkonen
6777a039d5 Characters receive damage when crushed between a sub and the level and are gibbed if the impact is hard enough. Closes #186 2017-12-30 02:17:08 +02:00
Joonas Rikkonen
c3c16b53ac Fixed background sprites being rendered in an incorrect order 2017-12-30 02:04:42 +02:00
Joonas Rikkonen
627d6ecd78 Minor UI fixes 2017-12-29 21:09:53 +02:00
Joonas Rikkonen
bcd2582cf9 - More gore particles when severing limbs!
- Explosions can sever limbs even if the target character is dead. Now explosive projectiles can explode creatures into pieces even if the creature dies of the initial projectile impact and not the explosion.
- Disabled blood particles on carriers and fractal guardians.
2017-12-29 21:06:11 +02:00
Joonas Rikkonen
454e0def3b Particle additions:
- Support for subemitters (= particles can emit particles).
- Option to set a different velocity change value for particles in water (can be used to simulate buouancy).
- Fixed drag vector & timer not being reset when initializing a particle.
2017-12-29 20:58:29 +02:00
Joonas Rikkonen
a8749f3d87 Fixed characters dragging husks by their tongue when GrabLimb is set to None, removed hardcoded texts from the grab button. Closes #210 2017-12-29 15:51:37 +02:00
Joonas Rikkonen
fe54b75117 Fixed modified structure colors not being cloned. Closes #212 2017-12-29 15:32:08 +02:00
Joonas Rikkonen
4d55e2dd55 Move hard-coded gender pronouns from TextManager to Texts.xml 2017-12-28 21:47:29 +02:00
Joonas Rikkonen
9dd4d21cac Fixed opened and broken doors being ignored during waypoint generation, causing waypoint connections to go through the doors and preventing AI characters from opening them. + Updated waypoints in Aegir Mark III 2017-12-28 20:53:27 +02:00
Joonas Rikkonen
b84c965be3 More AI fixes/improvements:
- AI characters can refuel the reactor when needed.
- AIObjectiveContainItem.CanBeCompleted returns true if the target item cannot be obtained or if the container cannot be reached.
- AI characters only weld leaks that are part of some submarine (i.e. not ruins).
2017-12-28 19:44:48 +02:00
Joonas Rikkonen
d074d3d443 Crew AI fixes:
- Characters can use oxygenite shards (or any other item with an "oxygensource" tag) in diving suits/masks.
- AIObjectiveFindDivingGear doesn't count as being completed if the character has diving gear in their inventory unless the character has equipped the gear.
- AIObjectiveGetItem doesn't count as being completed if equipping the target item is required and the character hasn't equipped it yet.
2017-12-28 12:53:23 +02:00
Joonas Rikkonen
ccda925623 Fixed order option buttons ("power up", "fire at will", etc) not working in the crew commander menu due to being outside their parent GUIComponent 2017-12-28 12:47:48 +02:00
Joonas Rikkonen
bd4388042f Fixed map generation going crazy if the main path node interval is very large relative to the size of the level. Closes #201 2017-12-27 18:18:31 +02:00
Joonas Rikkonen
3d73f28362 - TextManager automatically replaces "\n" strings with a newline.
- Removed instantiating traitor start popup from client-side TraitorManager (instead the client receives the start message from the server).
- GUIMessageBoxes don't leave unnecessary empty space for the header if the header text is empty.
- More hard-coded text removal.
2017-12-27 16:07:00 +02:00
Joonas Rikkonen
4f0b190371 Some more hard-coded text removal 2017-12-27 14:40:33 +02:00
Joonas Rikkonen
2894b74edc Started moving hard-coded texts to a separate xml file (Content/Texts.xml) to make modding and translating the game easier (see #80). Also Renamed InfoTextManager as TextManager. 2017-12-26 23:51:18 +02:00
Joonas Rikkonen
a5d2dd37f4 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-26 20:04:47 +02:00
Joonas Rikkonen
bc6c828a14 Option to make limb attacks do damage based on contact with physics bodies instead of distance. Attacks also do damage to all sections of a structure that are within damage range. Closes #108 2017-12-26 20:02:33 +02:00
juanjp600
5374c0f9a6 Windows-specific fixes 3
MS PLOX
2017-12-25 18:35:21 -03:00
juanjp600
44d096d20c Windows-specific fixes #2 2017-12-25 16:29:32 -03:00
juanjp600
905a8dcbe9 Windows-specific fixes #1 2017-12-25 16:03:12 -03:00
juanjp600
e2f4431357 Added a command for automatic hull generation
It's not perfect by any means, but it should be usable enough as a
baseline for most subs.
2017-12-23 17:57:19 -03:00
juanjp600
47b5ccd7c6 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2017-12-21 20:31:24 -03:00
juanjp600
064c8da7e7 Unknown object headers will now crash the game with a copy of the previous object to be read 2017-12-21 20:26:33 -03:00
Joonas Rikkonen
ac53c5f80d Fixed campaign view button overlapping with the spectate button in NetLobbyScreen. Closes #117 2017-12-22 01:18:16 +02:00
Joonas Rikkonen
2287ddda29 Added empty default client permission file 2017-12-22 01:17:43 +02:00
Joonas Rikkonen
7c37ba0955 Characters can only have one picking timer active at a time. Closes #179 2017-12-21 22:31:48 +02:00
Joonas Rikkonen
4db708335a Readded homoglyph comparisons to client name checking during login (i.e. similar name checks can't be bypassed by using similar-looking characters). Looks like this got removed due to a messed up merge 5bdb57b
Closes #182
2017-12-21 21:57:06 +02:00
juanjp600
c593fdb7c6 Minor networking fixes
- Don't spam the shit out of status updates (TODO: send update
immediately on drastic changes)
- Fixed some potential message misreading
- Readded homoglyph name comparison
2017-12-21 16:00:04 -03:00
Joonas Rikkonen
604fc65154 Human AI improvements & fixes:
- Replaced item name comparisons with Prefab.NameMatches (-> item names can be changed without breaking the AIs).
- Having an AIObjective set as the current order of the character doesn't automatically cause it to have a high priority. For example, the order to fix leaks has a low priority if there are no leaks to fix.
- AIObjectiveFixLeaks makes sure the character is wearing a diving suit before going to fix a leak. The characters used to run in and out of flooded rooms because the AIObjectiveFindSafety objective would become active as soon as the character entered the room, causing the character to run out, and then immediately run back because they are no longer in immediate danger of drowning, making the FixLeaks objective the most high-priority one.
- Characters attempt to find a room with no water in AIObjectiveIdle even if the character is wearing a diving suit.
- AIObjectiveFindSafety considers flooded rooms dangerous even if the character is wearing a diving suit (-> the character attempts to go into a more dry room instead of happily idling in the flooded one).
- Distance to a hull doesn't decrease its desirability nearly as much in AIObjectiveFindSafety (-> fixes characters not bothering to move into a non-flooded room if it's far away).
- AIObjectiveOperateItem makes sure the item is equipped before using it (-> characters can't weld leaks with the welder in their inventory).
2017-12-21 19:49:26 +02:00
juanjp600
40a46f96e2 Fixed LOS not going red + Fixed additive particles not looking right at all 2017-12-20 20:47:17 -03:00
juanjp600
07626a1989 Merge branch 'master' of https://github.com/Regalis11/Barotrauma
Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
2017-12-20 19:46:53 -03:00
juanjp600
7a413aee93 Optimized GameScreen.DrawMap
- Downscaled lightmap, since blurring will make this unnoticeable anyway
(TODO: make this optional)
- Render LOS in fewer passes by using a shader
- Use light volume to calculate LOS
- This also means we can use the override texture to render the diving
suit obstruct effect
- Don't render bunks and labels onto LOS background (TODO: add the
option to render back into the LOS background, i.e. just use
multiplicative blending as if it was the lightmap)
- Prefer SpriteSortMode.Deferred over all others, prefer
SamplerState.LinearClamp/PointClamp over all others
- Remove shader blur in favor of geometry blur (TODO: improve on this
further, right now it has a few artifacts)
- Trim light volumes
- Do some weird shit with the background particles (use DrawTiled
instead of relying on SamplerState.LinearWrap, because that's faster
somehow :/ )
- Pressing up/down in the console only returns a typed command now
2017-12-20 19:41:23 -03:00
Joonas Rikkonen
9ed2871ede Renamed a couple of properties for consistency & removed unnecessary CPR blood particle scaling 2017-12-20 20:26:22 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
91699b26a6 Giveperm and revokeperm commands work correctly now when used by clients 2017-12-20 18:58:27 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
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