Commit Graph

33 Commits

Author SHA1 Message Date
Joonas Rikkonen 87a0ee21eb (6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix 2019-06-15 20:24:01 +03:00
Joonas Rikkonen f68c16d944 (22e7598d9) Ignore keyboard inputs (delete, arrow keys, copy/paste) in the sub editor when a textbox is selected. Closes #1641 2019-06-15 20:17:47 +03:00
Joonas Rikkonen 7a99e0082e (7ae08a816) Incremented version number, changelog update 2019-06-15 20:01:03 +03:00
Joonas Rikkonen 157f6cfd21 (62b9ca04f) Removed Berilia from the build 2019-06-15 20:00:44 +03:00
Joonas Rikkonen d23fafbbde (9ebb872ae) Fixed typo 2019-06-15 19:44:34 +03:00
Joonas Rikkonen 03a7093486 (1c5ce3fee) More descriptive error messages when publishing a Workshop item fails. 2019-06-15 19:44:13 +03:00
Joonas Rikkonen 6f3d9d7191 (7ae08a816) Incremented version number, changelog update 2019-06-15 19:43:52 +03:00
Joonas Rikkonen 63999fc17b (62b9ca04f) Removed Berilia from the build 2019-06-15 19:43:32 +03:00
Joonas Rikkonen adab8589da (f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-12 16:45:24 +03:00
Joonas Rikkonen dce98349ea (23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing 2019-06-12 16:45:02 +03:00
Joonas Rikkonen b598459179 (65e2b5073) Fixed crashing when an item that requires aim to use is used by something else than a character. Not sure if there are any vanilla items that can cause this error, but can be reproduced for example by creating a projectile that RequiresAimToUse and triggers the Use method when it hits something. Closes #1602 2019-06-12 16:44:18 +03:00
Joonas Rikkonen e3ca616fff (869ac975f) Merge branch 'master' into dev 2019-06-12 16:43:56 +03:00
Joonas Rikkonen eaf4f6afb8 (face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568 2019-06-12 16:43:34 +03:00
Joonas Rikkonen 54fe039c8a (5b697f37f) Link the door and the gap even more strictly. It shouldn't be possible to destroy or move the other without moving the other. Fixes #1528. 2019-06-12 16:43:13 +03:00
Joonas Rikkonen 5f497543a4 (1986bc0d3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:46:21 +03:00
Joonas Rikkonen dd1ce8bf2f (df244251c) Fixed: Electric devices that are underwater and are broken by flooding being repairable forever, due to condition never staying at full condition for long enough for the repairing to stop 2019-06-11 21:46:02 +03:00
Joonas Rikkonen a4875cfeb3 (776291eb7) Create linked gaps when the door is selected. Move the gaps with the doors. 2019-06-11 21:44:32 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen 2b11c79a4c (ac9d10462) Take entity scale and flipping into account when dragging 2019-04-16 17:13:34 +03:00
Joonas Rikkonen 9dc29965f6 (602bf4ba6) Implemented structure scaling. TODO: draw with correct scale when dragging 2019-04-16 17:13:18 +03:00
Joonas Rikkonen ddfd7274e9 (d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:24:17 +02:00
Joonas Rikkonen ca08b803dc (891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions 2019-03-29 17:24:02 +02:00
Joonas Rikkonen 296ec8bab8 (d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab 2019-03-29 17:23:47 +02:00
Joonas Rikkonen d7526934e6 (f7209b813) Draw the sprites of the entities that are being dragged in the sub editor (instead of just a red rectangle). 2019-03-28 12:35:57 +02:00
Joonas Rikkonen 63eb4d64e5 f8b0295...0671290 2019-03-18 23:30:58 +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 807ec87694 Fixed items in cloned/copypasted inventories not being saved. Closes #342 and #38 2018-04-05 13:45:21 +03:00
Joonas Rikkonen 96a64d45dc Moved MapEntity saving methods to the shared project (the server needs to be able to save subs in the campaign mode) 2017-08-30 18:09:48 +03:00
Joonas Rikkonen 3c0f099448 Entities can be nudged with the arrow keys in the sub editor 2017-08-20 13:20:52 +03:00
Joonas Rikkonen 64ad5e5003 Removed unnecessary using directives 2017-07-05 18:35:09 +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