Commit Graph

271 Commits

Author SHA1 Message Date
Joonas Rikkonen
60c85a19f3 (511dc4358) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:12:44 +03:00
Joonas Rikkonen
ebd215df53 (6c4495e04) Fixed: Mechanic cabinet highlighting before deconstructing 2019-05-23 15:12:26 +03:00
Joonas Rikkonen
c237ffa982 (8a1744511) Removed duplicate swarm description. Closes #1490 2019-05-23 15:12:08 +03:00
Joonas Rikkonen
2a20b68f3c (33a87d5c8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:11:49 +03:00
Joonas Rikkonen
b6a0cd3871 (7a85fb03d) Added: Possibility to access any tutorial in a debug build 2019-05-23 15:11:31 +03:00
Joonas Rikkonen
cd5d81c3f1 (e8befa230) Added: Unlocking of tutorials one by one. Fixed: EngineerTutorial's submarine reactor not starting properly in the off-state 2019-05-23 15:09:42 +03:00
Joonas Rikkonen
78b67de866 (e9f10995d) Merge branch 'bugreporterUI' into dev 2019-05-18 17:43:00 +03:00
Joonas Rikkonen
3a2310e547 (3ac5065f5) Fixed: Rendering order for Bugreporter window, OK button position 2019-05-18 17:42:41 +03:00
Joonas Rikkonen
f1d794cb39 (86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:35:10 +03:00
Joonas Rikkonen
65a914e5ed (0b29f1236) Added: Scaling to mouse cursor size 2019-05-18 17:34:53 +03:00
Joonas Rikkonen
4dfd5f6fa2 (4df232b6e) Show the campaign disclaimer also if the player goes directly to the multiplayer tabs. Closes #1468 2019-05-18 17:26:16 +03:00
Joonas Rikkonen
4874c07d5e (6056b4603) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:23:31 +03:00
Joonas Rikkonen
3cc0b65946 (b1fa1d68c) Fix stairs not being properly assigned due to a failing raycast. 2019-05-18 17:22:23 +03:00
Joonas Rikkonen
fdb9161932 (05abb966f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:21:15 +03:00
Joonas Rikkonen
fefa1a067b (fa5639a1d) Added: Space in the beginning of tutorial info frames to have indenting on all paragraphs 2019-05-18 17:20:59 +03:00
Joonas Rikkonen
09ddcc8436 (d9894f840) Round UI text positions to integers, rendering at a fractional position makes them look messy 2019-05-18 17:20:25 +03:00
Joonas Rikkonen
f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +03:00
Joonas Rikkonen
63af8ddac8 (b207c589d) Translate the "privacy policy" text in the main menu (got the texts from Daedalic's privacy policy page, should be correct even though the didn't come from the translators) 2019-05-16 07:00:50 +03:00
Joonas Rikkonen
970a5a8732 (0b88fdd81) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:49:30 +03:00
Joonas Rikkonen
af7fcb823d (63921aa0d) Implement GetVisibleHulls method. 2019-05-16 06:49:11 +03:00
Joonas Rikkonen
97b6888274 (5b2ce3831) Restart the credits sequence when re-selecting the credits tab, some changes to the credit texts 2019-05-16 06:48:53 +03:00
Joonas Rikkonen
15e5f8f75b (be6e8e567) Fixed shuttle text overflowing in the load menu in the sub editor in German 2019-05-16 06:33:29 +03:00
Joonas Rikkonen
e768df7859 (ad183c440) Removed: SteamWorkshop disabling on MacOS 2019-05-16 06:33:13 +03:00
Joonas Rikkonen
c2e039be19 (22b95f75c) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:32:55 +03:00
Joonas Rikkonen
9f87239724 (f3d83a912) Disabled: Separate mac path to test if editing the actual application folder when using steam is OK 2019-05-16 06:32:38 +03:00
Joonas Rikkonen
2215c2fba0 (b3637fc6c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:32:22 +03:00
Joonas Rikkonen
9da8a437eb (aebd2c4c0) tweaks part 666 2019-05-16 06:32:06 +03:00
Joonas Rikkonen
80c563e7b0 (86280d29b) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:31:49 +03:00
Joonas Rikkonen
fc22eb5088 (fc5e081d3) Fixed: Hull names not saving properly in submarineditor 2019-05-16 06:31:32 +03:00
Joonas Rikkonen
50dc08fb56 (dcfd6ef21) tweaks 2019-05-16 06:31:16 +03:00
Joonas Rikkonen
4fa3d8e41a (3582f590f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:59 +03:00
Joonas Rikkonen
4d3e3ca0a2 (d08b879a0) Moved remora's aux engine back so the turbine is outside 2019-05-16 06:30:39 +03:00
Joonas Rikkonen
e50baabea0 (36cf727ca) fixes and sub folder cleanup 2019-05-16 06:30:22 +03:00
Joonas Rikkonen
531a1235af (e2fcec3e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:06 +03:00
Joonas Rikkonen
e074a5bf73 (7da87677c) tweaks and fixes 2019-05-16 06:29:49 +03:00
Joonas Rikkonen
2ac3f597ca (de83e894f) Fixed remora tail hull problem, moved ballast ladder platform to correct position 2019-05-16 06:29:32 +03:00
Joonas Rikkonen
04124fe56b (2f11bb197) tweaks 2019-05-16 06:29:14 +03:00
Joonas Rikkonen
07055ada82 (2c6f87623) Made autodoor motion sensor area bigger on most doors 2019-05-16 06:28:55 +03:00
Joonas Rikkonen
d9ab57e2ae (8a177f8bd) Fixed remora airlocks and refreshed drone. Added higher res preview pics to remora, typhon and bunyip 2019-05-16 06:28:39 +03:00
Joonas Rikkonen
7c167257b1 (6653a62b6) Small visual pass for the outposts, added some safety railings for outpost exteriors 2019-05-16 06:28:22 +03:00
Joonas Rikkonen
70ff950d38 (c5137ce8c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:28:06 +03:00
Joonas Rikkonen
e39043dbf5 (834990e1a) sub folder cleanup 2019-05-16 06:27:50 +03:00
Joonas Rikkonen
fef173f129 (eb3823e18) updated decals for tutorial station 2019-05-16 06:27:33 +03:00
Joonas Rikkonen
1cdd62360f (986bfff2b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:27:16 +03:00
Joonas Rikkonen
a6b592a625 (93733c170) Fix a null reference exception. 2019-05-16 06:26:57 +03:00
Joonas Rikkonen
cdc2ede035 (741810595) adjustments to art pass 2019-05-16 06:26:39 +03:00
Joonas Rikkonen
f23e4c67db (534c88165) Remora, remora drone & Typhon updated 2019-05-16 06:26:22 +03:00
Joonas Rikkonen
36898958b2 (0a8612032) Graphics add, mostly structure stuff 2019-05-16 06:26:06 +03:00
Joonas Rikkonen
7ceba13e8f (deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:25:48 +03:00
Joonas Rikkonen
bf57a48c7e (ebf4529cc) Use a uniform way to check if the bot has reached it's target. Should fix issues where bot is stuck when trying to get or operate an item in some cases. 2019-05-16 06:25:31 +03:00