Commit Graph

4640 Commits

Author SHA1 Message Date
Joonas Rikkonen
cb9f33dc68 (4e4b8532a) Fixed buttons overlapping with the text in some GUIMessageBoxes on large resolutions (I think, needs to be tested on resolutions higher than 1080p). Using relative scale on the texts and the button container caused them to upscale when scaling the message box (for example when making room for the link buttons in the editor disclaimer). 2019-04-26 11:17:27 +03:00
Joonas Rikkonen
1ffb969522 (45158b939) Fixed item scale not being taken into account when drawing item assembly icons or when placing them 2019-04-26 11:17:11 +03:00
Joonas Rikkonen
e3e9475c22 (c0e74e421) new autodoors, autohatches are broken for now 2019-04-26 11:16:56 +03:00
Joonas Rikkonen
0dba9947f3 (1d84e98c2) Forgot to revert some values back when fixing up the tutorial info windows 2019-04-26 11:16:41 +03:00
Joonas Rikkonen
1ed937299f (8556f608e) Removed Berilia, Remora & RemoraDrone from the vanilla content package 2019-04-26 11:16:25 +03:00
Joonas Rikkonen
8e15be3d42 (57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:15:52 +03:00
Joonas Rikkonen
fa25735e9f (3851196d8) Show the campaign disclaimer when entering the New Game or Tutorials tab for the first time. 2019-04-26 11:15:37 +03:00
Joonas Rikkonen
e1924f517f (53ca31b28) Removed: Unused tutorialsub, unused enum from tutorials 2019-04-26 11:15:19 +03:00
Joonas Rikkonen
fa004b0067 (7422bd0ce) Removed: ContextualTutorial folder, files from project 2019-04-26 11:14:46 +03:00
Joonas Rikkonen
9d9349c96e (73987cc6a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:14:32 +03:00
Joonas Rikkonen
ee1672408f (0bf65db0b) Removed: ContextualTutorial structure from tutorials.xml 2019-04-26 11:14:15 +03:00
Joonas Rikkonen
a7f56ced21 (3cc40bf1d) Added prefabs for new autodoors. Replaced doors in Dugong and Bunyip 2019-04-26 11:13:43 +03:00
Joonas Rikkonen
f3fbaedb42 (a0a15e2cb) Removed: ContextualTutorial related calls 2019-04-26 11:13:25 +03:00
Joonas Rikkonen
e90519ad2f (2e347c6b4) Updated: Engineer's tutorial with a junction box that has only a single power connection 2019-04-25 18:15:18 +03:00
Joonas Rikkonen
4f746b04ea (b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:14:20 +03:00
Joonas Rikkonen
eb7ac2bfbe (8e98e6343) Add and implement new clown gear. 2019-04-25 18:13:47 +03:00
Joonas Rikkonen
07b937ca90 (ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:13:28 +03:00
Joonas Rikkonen
03797df87b (224725392) fixed default state of a few emergency pumps. 2019-04-25 18:12:55 +03:00
Joonas Rikkonen
46ae95ab42 (a71afc56d) Added new LampsAdditive.png texture and light texture for Fluorescent L2 lamp 2019-04-25 18:12:36 +03:00
Joonas Rikkonen
df0f8c79ab (dbc56728c) Fixed item scale not being taken into account in light sprites 2019-04-25 18:12:19 +03:00
Joonas Rikkonen
d3687bc3ef (21015c117) Placeholder icon for the OuterClother slot (see #28) 2019-04-25 18:12:02 +03:00
Joonas Rikkonen
f365bdc92f (a66d0118e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:11:45 +03:00
Joonas Rikkonen
c455bda37e (6f4d8cd0e) Added: Dimmed background for info frames. Fixed: Highlight waits to be only a frame as it seems to be enough 2019-04-25 18:11:27 +03:00
Joonas Rikkonen
e11752276b (9680a2a43) Moved tutorial sub and outpost to tutorial folder 2019-04-25 18:11:11 +03:00
Joonas Rikkonen
4ecda00b1f (6c54b9b29) Slight improvements to tutorial windows 2019-04-25 18:10:53 +03:00
Joonas Rikkonen
f31114ea01 (9f6737ced) Fixed: Old text tag in sonar.cs 2019-04-25 18:10:37 +03:00
Joonas Rikkonen
31546e40bb (b89fa807d) Removed: Leftover yield return null 2019-04-25 18:10:19 +03:00
Joonas Rikkonen
f43bc25e2f (6aaa50391) Added: Prevention of using the autotemp before the operating portion of the reactor tutorial is complete in engineer's tutorial 2019-04-25 18:10:02 +03:00
Joonas Rikkonen
87dd5042e6 (bc52b535a) Added: Highlighting to order options in Captain's tutorial 2019-04-25 18:09:28 +03:00
Joonas Rikkonen
64cf732dc6 (4f255a3b6) Modified: Video back button position 2019-04-25 18:08:54 +03:00
Joonas Rikkonen
1aa88d90cb (ddcbb7983) Added: Disabling of SteamWorkshop on MacOS for now 2019-04-25 18:08:37 +03:00
Joonas Rikkonen
ad028163a2 (332bdd387) Added: Content.RootDirectory modifying on macOS 2019-04-25 18:08:20 +03:00
Joonas Rikkonen
e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00
Joonas Rikkonen
99344e4031 (b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix 2019-04-25 17:52:14 +03:00
Joonas Rikkonen
52991e1ded (41a4cf029) Merge 2019-04-25 17:50:53 +03:00
Joonas Rikkonen
8be51d71bd (444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead 2019-04-25 17:50:35 +03:00
Joonas Rikkonen
e4ac5434d7 (f1791560b) Switched back to old fonts (requested by art) 2019-04-25 17:50:17 +03:00
Joonas Rikkonen
457000c8dd (9e2b50b03) Removed unused duplicate texture 2019-04-25 17:49:59 +03:00
Joonas Rikkonen
3a83ac42c9 (dd2b3452f) Social center png added (was missing) 2019-04-25 17:49:41 +03:00
Joonas Rikkonen
47ef561a03 (ade7449ec) increase stun baton damage slightly, should take 6 or so hits to kill a crawler instead of 12. 2019-04-25 17:49:23 +03:00
Joonas Rikkonen
a90cdb7843 (c5ad20e76) Graphics for outposts: Added new backwalls for outpost rooms (shop,maintenance bay and social center) aswell as some corridor pieces 2019-04-25 17:49:05 +03:00
Joonas Rikkonen
9df0141640 (ca0e4bd45) When attempting to deconstruct an item that can't be deconstructed, put it in the output inventory instead of leaving it in the input 2019-04-25 17:48:45 +03:00
Joonas Rikkonen
ae33907727 (5bcbaf382) Improved campaign UI store search bar layout 2019-04-25 17:48:28 +03:00
Joonas Rikkonen
c69ebd8408 (35da84ff7) Fixed sub editor sub list filter area flickering on/off 2019-04-25 17:47:54 +03:00
Joonas Rikkonen
00586d26ce (195c368ea) Fixed search bar layout and position for sub list and sub editor 2019-04-25 17:47:35 +03:00
Joonas Rikkonen
43e54bd686 (8b8e05f82) Added: Required MacOS .app bundle stuff: .dylib, icons, .bin.osx 2019-04-25 17:47:17 +03:00
Joonas Rikkonen
5aa433f582 (456e67c5d) Fixed: Missing comma when using release builds 2019-04-25 17:46:59 +03:00
Joonas Rikkonen
d98c245183 (714944a46) - Item triggers can be used to define areas that cause the item to be highlighted, not just areas that the player has to be inside to interact with the item. - Triggers take item scale into account. - Added triggers around the integrated buttons in the new hatch/window variants (-> fixes hatches not being highlighted by putting the cursor on the button when there's a ladder next to the player). 2019-04-25 17:46:26 +03:00
Joonas Rikkonen
7d65c53bb6 (090be439c) Fix the bots not reacting to enemy attacks. 2019-04-25 17:46:08 +03:00
Joonas Rikkonen
9b8d0ffc51 (17bb71ed5) Fix repair tool not being used if the repair target is not within interaction area. Fixes repairing items with the welding tool. Partial fix to #63 (dev). 2019-04-25 17:45:33 +03:00