Commit Graph

92 Commits

Author SHA1 Message Date
Joonas Rikkonen ddd84a4f9e (c45394988) Refactor and fix button interaction and access checks in the indoors steering manager. 2019-05-16 05:40:00 +03:00
Joonas Rikkonen 3575c8df52 (03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas 2019-05-16 05:39:25 +03:00
Joonas Rikkonen e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen 7f72f72ca7 (9c0250ef1) Merge branch 'dev' into human-ai 2019-05-16 05:14:40 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen b83302408f (909dcf05d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 18:05:33 +03:00
Joonas Rikkonen 427526aba2 (d4a475f03) Added text wrapping to pump GUI texts 2019-05-07 18:05:16 +03:00
Joonas Rikkonen 56015c2f01 (d2cb979c9) Added: Creditsbutton to englishvanilla. Fixed: Title & objective in videoplayer being shown in manualvideo contenttype 2019-05-07 18:04:58 +03:00
Joonas Rikkonen 482f3c1f3c (975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:23:16 +03:00
Joonas Rikkonen bb6067df31 (1e5573bea) new outpost 2019-05-07 16:22:58 +03:00
Joonas Rikkonen e55a5d6d9d (aef4f0ea0) Option to override sprites per language, new logos 2019-05-07 13:23:02 +03:00
Joonas Rikkonen a2760830af (b2f1fcb2b) Progress on credits (images can now be displayed), removed unused "TileSprites" field from GUIComponent 2019-05-07 13:21:22 +03:00
Joonas Rikkonen f65d73ca74 (3950185ea) Progress on credits 2019-05-07 13:21:06 +03:00
Joonas Rikkonen 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen 47abb30bef (2a2494e33) Fixed tutorial names not being translated 2019-05-06 11:37:28 +03:00
Joonas Rikkonen 323c8e7b95 (141ad0eda) Fixed tutorial button text not being translated 2019-05-06 11:36:54 +03:00
Joonas Rikkonen 029f5fccda (8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:35:46 +03:00
Joonas Rikkonen 26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen 192159811c (e4a7630aa) Made the "privacy policy" text in the main menu a clickable link 2019-05-06 11:34:53 +03:00
Joonas Rikkonen cffaef3c3c (4dba94638) Legacy save file support (= save files present in Data/Saves will still be usable) 2019-05-06 11:29:24 +03:00
Joonas Rikkonen 5999a66681 (ac4fc6f29) Fixed EventInput crashing in 32-bit windows builds 2019-05-06 11:28:13 +03:00
Joonas Rikkonen 0bd876e17d (18c3d51e4) Display current year in the copyright notices 2019-05-06 11:25:29 +03:00
Joonas Rikkonen 38b2f261b7 (0abd4ae6c) Added some legal stuff to the main menu 2019-05-06 11:24:55 +03:00
Joonas Rikkonen fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +03:00
Joonas Rikkonen b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +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 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 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 1aa88d90cb (ddcbb7983) Added: Disabling of SteamWorkshop on MacOS for now 2019-04-25 18:08:37 +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 5aa433f582 (456e67c5d) Fixed: Missing comma when using release builds 2019-04-25 17:46:59 +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 24794932dc (b1ed113e0) Randomize map seed when opening the "new game" tab. Closes #1399 2019-04-08 13:37:12 +03:00
Joonas Rikkonen 19b451ff17 (5ddee76aa) Workshop UI improvements #2 2019-04-05 16:15:40 +03:00
Joonas Rikkonen 7c4f8fcb88 (153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag. 2019-04-04 11:11:24 +03:00
Joonas Rikkonen 16c558a859 (7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns 2019-04-04 11:10:43 +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