 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
|
5208b922d8
|
(46e39d26c) v0.9.0.4
|
2019-06-04 16:12:45 +03:00 |
|
 juanjp600
|
9364b3839a
|
(6eee2e437) Replaced OpenTK + replaced reference OpenAL implementation with soft_oal
|
2019-06-04 16:06:05 +03:00 |
|
|
Joonas Rikkonen
|
81dd2f3202
|
(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."
|
2019-06-04 16:02:25 +03:00 |
|
|
Joonas Rikkonen
|
edccfe223d
|
(9a7d83a40) Fullscreen bug workarounds
|
2019-06-04 16:00:38 +03:00 |
|
|
Joonas Rikkonen
|
e592c49fa8
|
(221f9f2a6) Merge branch 'dev' into capitalizationfixes
|
2019-06-04 15:38:31 +03:00 |
|
|
Joonas Rikkonen
|
f797235bfd
|
(38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla
|
2019-06-04 15:38:12 +03:00 |
|
|
Joonas Rikkonen
|
822322e669
|
(bb2624736) Don't keep running the end round cinematic if the player leaves the game screen. Otherwise the player can, for example, quickly start a new single player round or switch to the sub editor, and have the game crash when then end round cinematic finishes and unloads the sub.
|
2019-06-04 15:37:52 +03:00 |
|
|
Joonas Rikkonen
|
b31fbe23da
|
(618410bf9) Fixed clients crashing when opening the server settings menu
|
2019-06-04 15:36:58 +03:00 |
|
|
Joonas Rikkonen
|
feb32943c7
|
(be8059eff) Use RestSharp to download the existing preview image when editing published workshop items. WebClient doesn't seem to work in the Mac build
|
2019-05-23 15:18:31 +03:00 |
|
|
Joonas Rikkonen
|
4c3e5f324f
|
(29d49d21a) Fixed too small password input box
|
2019-05-23 15:17:37 +03:00 |
|
|
Joonas Rikkonen
|
d0c4b83de2
|
(3cd408e4a) Cancel Steam auth ticket when cancelling server connection (by clicking "Cancel" in either the "Connecting to..." popup or the password prompt). Fixes steam auth failed errors when attempting to reconnect after cancelling.
|
2019-05-23 15:17:18 +03:00 |
|
|
Joonas Rikkonen
|
eed0666879
|
(76909c3c7) Fixed "clowncostume" and "crewaway" achievements not unlocking in multiplayer, fixed being able to get the "killclown" achievement by committing suicide while wearing a clown costume. Closes #1478
+ merge fix
|
2019-05-18 18:24:03 +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
|
84b034b34d
|
(bf1f4d5e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-18 17:41:06 +03:00 |
|
|
Joonas Rikkonen
|
3635568b6a
|
(6ac5b80f0) Fixed: PauseOnFocusLost always treated as if being enabled
|
2019-05-18 17:40:49 +03:00 |
|
|
Joonas Rikkonen
|
a5e869ccd0
|
(cae84e234) Translate Lidgren's "no response from remote host" error message
|
2019-05-18 17:39:59 +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
|
e63ffe652e
|
(5e16139ed) Added "OrderGiver" field to AI orders, always show reports from the currently controlled character (even if the report is not targeted for the character's class)
|
2019-05-18 17:26:34 +03:00 |
|
|
Joonas Rikkonen
|
19b4caa576
|
(a7fed8657) More punctuation fixes
|
2019-05-16 07:01:26 +03:00 |
|
|
Joonas Rikkonen
|
cb83984e80
|
(4ca668169) Fixed: Conflict
|
2019-05-16 05:58:48 +03:00 |
|
|
Joonas Rikkonen
|
257889b9cc
|
(42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool.
|
2019-05-16 05:58:15 +03:00 |
|
|
Joonas Rikkonen
|
412d46169e
|
(1621785a9) Size variants of labels, also reverts 995d492
|
2019-05-16 05:57:39 +03:00 |
|
|
Joonas Rikkonen
|
f8ca1444fd
|
(7765c6989) Only show a bunch of pathfinder errors and warnings in debug builds.
|
2019-05-16 05:57:22 +03:00 |
|
|
Joonas Rikkonen
|
1ae482a84d
|
(8c8a15639) Implemented new wall textures
|
2019-05-16 05:56:49 +03:00 |
|
|
Joonas Rikkonen
|
fe5f386358
|
(61f67c194) Fix the raycast and angle checks. use the weapon position instead of the character position.
|
2019-05-16 05:56:16 +03:00 |
|
|
Joonas Rikkonen
|
0bb541bce8
|
(2c8e14bca) Added edge variants for new environment base textures
|
2019-05-16 05:54:50 +03:00 |
|
|
Joonas Rikkonen
|
e9664d3639
|
(084340338) Add an aim timer before the weapon can be used. Fix a null reference exception.
|
2019-05-16 05:54:33 +03:00 |
|
|
Joonas Rikkonen
|
57302f7bb8
|
(4ff749939) Added new environment assets for implementation
|
2019-05-16 05:51:28 +03:00 |
|
|
Joonas Rikkonen
|
049d3ba795
|
(e7bd8839d) Remove unused parameters.
|
2019-05-16 05:51:12 +03:00 |
|
|
Joonas Rikkonen
|
ef374ada71
|
(990e36132) Merge branch 'human-ai' into dev
|
2019-05-16 05:50:20 +03:00 |
|
|
Joonas Rikkonen
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
|
Joonas Rikkonen
|
306cb77167
|
(6facb21fe) Reminder to self: save before committing
|
2019-05-16 05:46:29 +03:00 |
|
|
Joonas Rikkonen
|
e367f900b8
|
(2a4bd39c2) Merge branch 'dev' into human-ai
|
2019-05-16 05:33:13 +03:00 |
|
|
Joonas Rikkonen
|
3d7a113d75
|
(048b753e6) Merge branch 'dev' into human-ai
|
2019-05-16 05:20:29 +03:00 |
|
|
Joonas Rikkonen
|
108e42edb0
|
(b5250291f) Merge branch 'dev' into human-ai
|
2019-05-16 05:15:16 +03:00 |
|
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +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
|
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
|
f42a7c1ec6
|
(69d450d58) Initialize SteamManager before creating the GameMain instance
|
2019-05-06 11:34:36 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +03:00 |
|