Commit Graph

187 Commits

Author SHA1 Message Date
Joonas Rikkonen
8737a0e0dd (26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit. 2019-04-29 21:12:47 +03:00
Joonas Rikkonen
2aec2414be (12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:25:25 +03:00
Joonas Rikkonen
3eb883fbb3 (9253f5b70) Added libvlc.so to LinuxClient 2019-04-26 11:25:10 +03:00
Joonas Rikkonen
79c31d1a83 (0185896f9) More fixes to messagebox & tutorial info box scaling 2019-04-26 11:19:32 +03:00
Joonas Rikkonen
010411d434 (66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:31 +03:00
Joonas Rikkonen
d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +03:00
Joonas Rikkonen
eb6c5ac1c5 (251e3f856) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:00 +03:00
Joonas Rikkonen
efca3a49fc (ee33ee49f) reverted all doors back to original autodoors, reset prefabs for several doors to ensure correct repair messages, flipped stairs on humpback to ease AI steering issues. 2019-04-26 11:17:44 +03:00
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
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
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
64cf732dc6 (4f255a3b6) Modified: Video back button position 2019-04-25 18:08:54 +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
63f7449b6f (05bb1cedc) Made SerializableEntityEditor string input fields scrollable horizontally. Closes #1158 2019-04-23 17:23:44 +03:00
Joonas Rikkonen
8b4c5b8cd7 (a5643136e) Removed the separate "my character panel" from the top right corner of the screen in MP (not needed anymore because the job preferences etc can be edited in the info menu), removed the radio button below the chatbox (looks bad and not necessary now that we have a dedicated chat hotkey) 2019-04-18 12:03:37 +03:00
Joonas Rikkonen
9dea124ec2 (12dd79a54) Fixed GUIListBoxes still sometimes leaving the last row out when using a grid layout 2019-04-17 12:44:55 +03:00
Joonas Rikkonen
cfd4df925a (41c5679ec) Resize fonts according to resolution (TODO: test on resolutions larger than 1080p) 2019-04-17 12:43:29 +03:00
Joonas Rikkonen
6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen
bd07acf26d (052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0 2019-04-16 17:11:49 +03:00
Joonas Rikkonen
b705b1579c (c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 12:00:49 +03:00
Joonas Rikkonen
b4ec36f5bb (2fc72545e) new texts regarding missions and beacons. 2019-04-15 12:00:35 +03:00
Joonas Rikkonen
11a7bf3600 (6ed01ab09) Add a todo note. 2019-04-15 11:59:09 +03:00
Joonas Rikkonen
a7feb6f7e0 (a6a0c23a1) Close all message boxes when clicking the quit button in the pause menu. Fixes character wizard not closing if it's open when quitting to the main menu. 2019-04-15 11:58:38 +03:00
Joonas Rikkonen
f4275de1ac (845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:26:56 +03:00
Joonas Rikkonen
a57b7184fb (f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls. 2019-04-11 18:26:42 +03:00
Joonas Rikkonen
9b0e0ab278 (ec990ac7c) Save chatbox & crew menu toggle state between rounds 2019-04-11 18:26:26 +03:00
Joonas Rikkonen
9f55da3677 (8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item). 2019-04-10 15:13:25 +03:00
Joonas Rikkonen
c19899769e (cb10b53db) Fixed GUIImage.RecalculateScale throwing an exception if the sprite is not set, use relative scales in GUINumberInput to make the child elements scale dynamically with the parent 2019-04-06 17:50:40 +03:00
Joonas Rikkonen
57e5a969ba (f95283b36) Submarine preview layout changes, don't display attributes that don't have a value, GUIMessageBox layout tweaking 2019-04-05 16:13:12 +03:00
Joonas Rikkonen
cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test 2019-04-04 11:10:29 +03:00
Joonas Rikkonen
b08a31a68f (33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it. 2019-04-04 11:10:14 +03:00
Joonas Rikkonen
41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:09:45 +03:00
Joonas Rikkonen
1966bcb4ab (c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes). 2019-04-04 11:09:32 +03:00
Joonas Rikkonen
a3425a0432 (bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row 2019-04-04 11:08:49 +03:00
Joonas Rikkonen
7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. 2019-04-04 11:08:33 +03:00
Joonas Rikkonen
d4752bb6a0 (9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time. 2019-04-04 11:08:18 +03:00
Joonas Rikkonen
7491b06a5d (bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults. 2019-04-04 11:08:02 +03:00
Joonas Rikkonen
79ea41e6c9 (4f4395b00) Reduced the size of the disallowed item interface area around the chatbox 2019-04-04 11:07:45 +03:00
Joonas Rikkonen
5f05322fdb (fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server. 2019-04-04 11:06:12 +03:00
Joonas Rikkonen
fd0e394827 (04facf9b6) Gray out the text in disabled buttons if the button has no visible sprite (the buttons in the main menu for example looked the same when disabled) 2019-04-03 16:24:34 +03:00
Joonas Rikkonen
cae366e807 (4d924cc86) Fixes to New Game and Game Settings layouts
+ merge fix
2019-04-01 22:55:04 +03:00
Joonas Rikkonen
22372dfffe (061c63299) Wall collider tuning 2019-04-01 22:53:41 +03:00
Joonas Rikkonen
43578f3bb2 (bb8a4525e) Progress on LOS effect improvements. Hiding the unnecessary shadows at spots where the ends of two walls meet works now, still got to do something about corner areas where a vertical wall meets a horizontal one. 2019-04-01 22:53:27 +03:00
Joonas Rikkonen
98e0504e1f (52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started 2019-04-01 22:53:12 +03:00
Joonas Rikkonen
ae3dea40b0 (3c1d889c9) Fixed voice activity controls going outside the settings frame 2019-04-01 22:52:58 +03:00
Joonas Rikkonen
ee18a1b508 (66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:52:44 +03:00
Joonas Rikkonen
6332a6e077 (c896c51fb) Display submarine preview in the "new game" menu, layout tweaks 2019-04-01 22:52:31 +03:00