Commit Graph

37 Commits

Author SHA1 Message Date
Joonas Rikkonen b9574dde2d (361a8d556) LevelResource fixes:
- If collecting the resource doesn't require any items, allow it to be picked up withour a repair tool. Closes #1325
- Fixed deattach timer not being synced (the methods were implemented, but the server never sent any events). Closes #1292
- Fixed ridiculously small mineral colliders that made it hard to hit them with the plasma cutter (body size was not updated when the sprites were changed?).
2019-03-28 18:17:19 +02:00
Joonas Rikkonen c76fb32e15 (5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account. 2019-03-28 18:12:23 +02:00
Joonas Rikkonen f3dc34dfa3 (d211acd47) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:12:09 +02:00
Joonas Rikkonen 2490951b2b (6912a70c7) Removed: Unused, old code. Fixed: Formatting 2019-03-28 18:11:54 +02:00
Joonas Rikkonen f51c9c14df (54ae135f5) Items can be dragged and dropped directly from the inventory into containers without having to select the container first. 2019-03-28 18:11:40 +02:00
Joonas Rikkonen a351ffcbda (1beb64bd8) Removed: Duplicate code from VideoPlayer 2019-03-28 18:11:25 +02:00
Joonas Rikkonen 2281035ffa (05ee3bb5f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:11:10 +02:00
Joonas Rikkonen fde8cc1d6f (9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed 2019-03-28 18:10:56 +02:00
Joonas Rikkonen 98935935c9 (46c711ce2) Made a bunch of ItemContainer UI panels larger 2019-03-28 18:10:41 +02:00
Joonas Rikkonen 68a601722c (34987308f) Fixed reactor warning lights being clickable 2019-03-28 18:10:27 +02:00
Joonas Rikkonen 4ce2316cb2 (8339ae744) Don't allow autointeracting with contained items (e.g. picking up an ammunition box from a loader) if another item is currently selected. Makes it less likely for players to accidentally pick up items from containers when they deselect another item. 2019-03-28 18:10:13 +02:00
Joonas Rikkonen b9556280fa (1f3241833) Fixed chatmessage "popups" overlapping with the report buttons when the chatbox is hidden, color the name of the speaker according to their job 2019-03-28 18:09:59 +02:00
Joonas Rikkonen c468b4f6f1 (ccaa0d2e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:45 +02:00
Joonas Rikkonen 9618c9b7e9 (db8417634) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:19 +02:00
Joonas Rikkonen 44a8bfce08 (808e7257d) Attempt to fix the issue where bots are not avoiding walls properly while wandering around. 2019-03-28 18:09:05 +02:00
Joonas Rikkonen 0c15748429 (8bea0a96b) Removed minimum conditions from battery deconstruction output (= deconstructing an empty battery still gives the materials used to craft the battery). Closes #1356 2019-03-28 12:41:06 +02:00
Joonas Rikkonen bcd779fe78 (519124ad1) Fixed items with no sprite crashing the game. Closes #1153 2019-03-28 12:40:08 +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 c463baed44 Made medical & toxic cabinets waterproof. Closes #578 2018-08-06 14:08:00 +03:00
Joonas Rikkonen 8e8b8464af All items and structures have to define a sourcerect for the sprite because otherwise the dedicated server won't know the size of the entity. Closes #321 2018-03-06 13:55:30 +02:00
Joonas Rikkonen 55a5e9e968 Syringes are recolored according to the color of the contained medical item. Closes #256 2018-03-01 11:26:04 +02:00
Joonas Rikkonen 1eaccef8c7 Added damaged variants of junction box sprite, damaged item sprites can be set to fade in. 2018-01-11 20:48:26 +02:00
Joonas Rikkonen 25ebe52248 Option to configure alternate sprites for broken items 2018-01-11 16:51:36 +02:00
Joonas Rikkonen 9f58d1b74d Cargo items can be set to spawn inside specific types of containers instead of being scattered on the cargo room floor. 2018-01-10 15:56:11 +02:00
Alex Noir 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
Joonas Rikkonen 8a7af2affd Players can't use other items when a railgun controller is selected. Prevents accidentally firing weapons or hitting people with something while using the railguns.
Closes #94
2017-12-15 00:25:46 +02:00
Joonas Rikkonen 08cf902cb8 MapEntityPrefabs are deserialized using SerializableProperty 2017-11-15 19:01:55 +02:00
Joonas Rikkonen 04e3710a65 Renaming fields for consistency 2017-11-14 22:45:22 +02:00
Joonas Rikkonen 913a102591 Option to set aliases for StructurePrefabs 2017-11-14 21:04:49 +02:00
Joonas Rikkonen 8e556f1c76 - Renamed a bunch of ObjectProperty-related stuff (ObjectProperty -> SerializableProperty, IPropertyObject -> ISerializableEntity, the "SerializableProperty" attribute -> Serialize).
- Rectangle serialization.
- Option to restrict numeric properties to a range of values.
- WIP generic ISerializableEntity editor.
2017-11-08 21:15:03 +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 bf7677154b Disabled debug logging of the loading coroutine when verbose logging isn't enabled 2017-07-23 20:11:55 +03:00
Joonas Rikkonen 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
Joonas Rikkonen 64ad5e5003 Removed unnecessary using directives 2017-07-05 18:35:09 +03:00
Joonas Rikkonen 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
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