 Joonas Rikkonen
|
bea7b58ff3
|
(a410fd46c) Trying to help the merge script through a jungle of merges
|
2019-06-04 16:37:31 +03:00 |
|
|
Joonas Rikkonen
|
7c67b1f164
|
(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.
|
2019-05-20 21:00:11 +03:00 |
|
|
Joonas Rikkonen
|
b71adc7589
|
(2e0e45e1f) Updated: Localization
|
2019-05-20 20:46:21 +03:00 |
|
|
Joonas Rikkonen
|
928ace7063
|
(c0f7f880e) Made the bug report button in the pause menu a little less prominent, more aliasing at the edges of the bug and notification icons
|
2019-05-20 20:34:52 +03:00 |
|
|
Joonas Rikkonen
|
6332cfd55f
|
(81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-18 17:44:13 +03:00 |
|
|
Joonas Rikkonen
|
71d1738498
|
(76e16f98e) Use outdoorsteering when far enough from the sub. Increase the wait until reachable time a bit.
|
2019-05-18 17:43:38 +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
|
da693c20fa
|
(7bfeac605) More space for the labels in the Pump interface
|
2019-05-18 17:42:20 +03:00 |
|
|
Joonas Rikkonen
|
11d08f4f70
|
(2df363efc) Refactor avoiding, because the previous method wasn't working well. It now should work better, but requires a heading vector. Add some notes on how to improve the method. TODO: revisit fishes.
|
2019-05-18 17:41:58 +03:00 |
|
|
Joonas Rikkonen
|
1a5bf77149
|
(a40a61508) Added: Not drawing cursor when the window is not active
|
2019-05-18 17:41:28 +03:00 |
|
|
Joonas Rikkonen
|
6abe73b889
|
(3f196aed7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-18 17:38:16 +03:00 |
|
|
Joonas Rikkonen
|
5bd1bc4ae3
|
(e7d380c4c) Removed size variants of the number/letter/icon decals. Not needed because they can be scaled.
|
2019-05-18 17:37:03 +03:00 |
|
|
Joonas Rikkonen
|
5dc3767a8e
|
(6db19454d) Updated: Cursor with a higher resolution version
|
2019-05-18 17:36:47 +03:00 |
|
|
Joonas Rikkonen
|
65a914e5ed
|
(0b29f1236) Added: Scaling to mouse cursor size
|
2019-05-18 17:34:53 +03:00 |
|
|
Joonas Rikkonen
|
fb206ee5a3
|
(71a7f5c3c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-18 17:25:27 +03:00 |
|
|
Joonas Rikkonen
|
cb519b455d
|
(e7e775e7b) Fixed non-translated "Toggle Battery Output" display text in Orca, increased the size of the docking labels in Bunyip to create more space for translated texts
|
2019-05-18 17:25:11 +03:00 |
|
|
Joonas Rikkonen
|
75b88e0c18
|
(33abbb810) Fixed: Interfaces that were too small on 4k by removing the use of maxsize & adding scale related multipliers to absolute values
|
2019-05-18 17:24:54 +03:00 |
|
|
Joonas Rikkonen
|
6055f10c5a
|
(0744e6c3f) Use keybinds to AZERTY when language is set to French
|
2019-05-18 17:17:20 +03:00 |
|
|
Joonas Rikkonen
|
efb9dcd0f0
|
(89b895e0a) Added bug report buttons to game settings and pause menu
|
2019-05-18 17:17:03 +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
|
e500ba2bdf
|
(a17abe3fa) Remove a not so useful loop from a method, which might be used often.
|
2019-05-16 06:25:12 +03:00 |
|
|
Joonas Rikkonen
|
48070a3f90
|
(23ecb8f20) Fixed: Scaling past 1920x1080 for: Reactor UI, Submarine labels, loading tips, inventoryslot container status
|
2019-05-16 06:20:54 +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
|
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
|
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
|
e83dba2959
|
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
|
2019-04-25 18:07:37 +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
|
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 |
|