Commit Graph

21 Commits

Author SHA1 Message Date
Joonas Rikkonen 3301bed442 409d4d9...aeafa16 (merge human-ai) 2019-03-18 22:52:17 +02:00
Joonas Rikkonen eac98b22fa bdbcef4...18b4bac
commit 18b4bacd5bb645f36f62e77587af971cb789d37c
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date:   Fri Mar 8 13:04:51 2019 +0200

    Added a beginner level sub

commit eef09f7d07cde64d1f2f6971eda733505339a0c0
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 19:05:14 2019 +0200

    Remove the old sprite when recreating the sprite.

commit a6c3ce00782882bc14f200f95abab0fa4d5d9a2d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 19:04:51 2019 +0200

    Fix gender specific wearables not refreshing when we change the gender.

commit f606b801dac9e4cbb4238506ff4d73981709a2f8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 18:42:14 2019 +0200

    Move some console commands from the shared project to the client. These should not be debug only, because they might be useful for modders too.

commit 154251c183eacf37e92fa7b27bb6d57bb15797d8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 14:42:22 2019 +0200

    Disable latchonto ai for now.
2019-03-18 22:31:34 +02:00
Joonas Rikkonen 110d803b78 5d2c9f2...bdbcef4
commit bdbcef41bfbc42beeb2d942e7db431b8ab627f1c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 13:31:02 2019 +0200

    Simplify the sprite related commands.

commit 49c8e1cd01953ae31cff99bf35432ab887b45d62
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 13:05:20 2019 +0200

    Rename "Reload Texture" button as "Reload Sprite", because it actually reloads both the xml and the texture. Add the button text into the localization file.

commit 84f58d9e0bb46f29412f936d569348e46227c9d5
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:50:51 2019 +0200

    Add the option to reload xml/texture/both for items when they are hovered over with the mouse. dry.

commit 732084c044e6a2c220cee8d5c1d9b5e4ce05587d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:48:49 2019 +0200

    Fix the sprite name of the right hand in the assistant job gear.

commit 30344369d7e87a17312cc839f195c36c77c4a3b2
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:26:20 2019 +0200

    Fix ReloadXML failing when multiple source elements are found.

commit ddb6fb48b6e0789b18a1ea889dcdf408fcbb5b12
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 11:47:13 2019 +0200

    Fix damagemodifier multiplier not applied on particles if no sound is played.

commit 41206013be41d240b12dad48f4ddaba9b072742b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 11:46:22 2019 +0200

    Fix engigear lower arm sprite name.

commit 8ce938305206ca65aeb00515639e799d9f2fd526
Merge: e6166d2ef 61703e8af
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:53:36 2019 +0200

    Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev

commit e6166d2ef24489bac6f217211849884013dbf4e6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:53:30 2019 +0200

    Implement husk sprite overlays as wearables. Add new husk injector (wip).

commit 367c4f5b3784c65c3c26807dd6c10e837960c6bb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:52:15 2019 +0200

    Add console commands for changing the gender and race of the character.

commit 61703e8af274c8f5d9e05575ebaf13c9bde8855f
Author: Iiro Enges <iiro@fakefish.fi>
Date:   Wed Mar 6 17:47:09 2019 +0200

    Refined environment item scales and colors
2019-03-18 22:31:14 +02:00
Joonas Rikkonen 044fd3344b 2f107db...5202af9 2019-03-18 21:42:26 +02:00
Joonas Rikkonen 6c0679c297 38f1ddb...178a853: v0.8.9.1, removed content folder 2019-03-18 20:39:27 +02:00
Joonas Rikkonen 506c13c929 Again, save before committing 2018-08-08 11:15:05 +03:00
Joonas Rikkonen 0a84d989a8 Fixed wearable sprite colors being calculated wrong. Closes #607 2018-08-08 11:10:48 +03:00
Joonas Rikkonen 362c97ce05 Worn items use the spritecolor set in the sub editor. Closes #574 2018-08-06 11:01:13 +03:00
Joonas Rikkonen bb31fd1e73 Moved some client-specific limb code to the client project, dripping water particles when characters get out from water 2018-05-21 19:17:34 +03:00
Joonas Rikkonen 48757618f6 Renamed the "file" attribute of hit sounds to "tag", replaced footstep sound paths in creature configs with tags. 2018-02-24 21:13:21 +02:00
Joonas Rikkonen 47f9900fdc Lighting fixes:
- Re-enabled lightsprites (glowing lamp sprites on lamps).
- Limb sprites use lightsprites instead of overriding the texture (positioned correctly now).
- Fixed lights that don't cast shadows not being rendered.
2018-01-11 11:23:55 +02:00
Joonas Rikkonen 55e96b315f Fixed compiler error in Limb.cs 2018-01-09 12:27:09 +02:00
Joonas Rikkonen 7187c277e7 Merge branch 'master' into moStuff 2018-01-09 10:38:06 +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
Alex Noir 2cb0ee73be Adds footstep sound variety, makes diving and clown suits have unique footstep sounds!
https://puu.sh/yQ8fs/61e12f15c6.webm
TODO: Get rid of the "damagesoundtype" system and replace it with simple "tag" checking to allow customizability from content pack side
Fix damagemodifier sounds never being played (I've never once heard LimbArmor play on anything but mantis)
2017-12-29 17:41:18 +03:00
Joonas Rikkonen 20664c08fd Fixed limb lightsources not rotating with the limb 2017-12-02 19:15:27 +02:00
Joonas Rikkonen 1ff2054ca8 Converted the GetAttribute methods in the ToolBox class to extension methods 2017-10-04 18:38:40 +03:00
Joonas Rikkonen fd844fd696 Option to make wearable sprites use the depth of the sprite instead of using the depth of the limb it's attached to 2017-08-10 18:19:06 +03:00
Joonas Rikkonen 64ad5e5003 Removed unnecessary using directives 2017-07-05 18:35:09 +03:00
Joonas Rikkonen 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
juanjp600 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