 Joonas Rikkonen
|
adab8589da
|
(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-12 16:45:24 +03:00 |
|
|
Joonas Rikkonen
|
dce98349ea
|
(23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing
|
2019-06-12 16:45:02 +03:00 |
|
|
Joonas Rikkonen
|
e3ca616fff
|
(869ac975f) Merge branch 'master' into dev
|
2019-06-12 16:43:56 +03:00 |
|
|
Joonas Rikkonen
|
eaf4f6afb8
|
(face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568
|
2019-06-12 16:43:34 +03:00 |
|
|
Joonas Rikkonen
|
e38c896d42
|
(7f9b7df0c) Fixed items disappearing when they're dropped into a full container. Closes #1588
|
2019-06-11 21:50:38 +03:00 |
|
|
Joonas Rikkonen
|
9341ac772d
|
(d616acca8) Empty contained item indicators (oxygen tank, battery, etc indicators) keep pulsating when they're empty
|
2019-06-09 17:37:25 +03:00 |
|
|
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
|
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
|
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
|
04f69dbe63
|
(b3c71807f) Updated to the latest version of GameAnalytics
|
2019-06-04 15:33:38 +03:00 |
|
|
Joonas Rikkonen
|
7babe75d18
|
(262cb429c) More implementation
|
2019-06-04 15:33:16 +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
|
108e42edb0
|
(b5250291f) Merge branch 'dev' into human-ai
|
2019-05-16 05:15:16 +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
|
67a0636470
|
(b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-29 21:09:50 +03:00 |
|
|
Joonas Rikkonen
|
2554e17189
|
(621326f05) Don't flee when taking damage if part of a swarm.
|
2019-04-29 21:08:32 +03:00 |
|
|
Joonas Rikkonen
|
c5452048d7
|
(d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-29 21:08:16 +03:00 |
|
|
Joonas Rikkonen
|
b3b1d1851d
|
(eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds
|
2019-04-29 21:08:00 +03:00 |
|
|
Joonas Rikkonen
|
788c51143b
|
(55f425031) Tutorial outpost visual pass
|
2019-04-29 21:06:26 +03:00 |
|
|
Joonas Rikkonen
|
205f808f84
|
(5b377538a) Adjust crawler attacks a bit.
|
2019-04-29 21:05:53 +03:00 |
|
|
Joonas Rikkonen
|
33747a63b0
|
(3340f2f90) Don't do impact damage to structures in Structure.OnWallCollision. Impact damage was disabled when a character hits the sub from the outside (implemented in SubmarineBody), but should've been done here as well.
|
2019-04-29 21:05:21 +03:00 |
|
|
Joonas Rikkonen
|
69c4b9a74f
|
(8e2e25260) Spawn multiple monsters using the same spatial and temporal spreading logic as in events.
|
2019-04-29 21:05:06 +03:00 |
|
|
Joonas Rikkonen
|
dfb664e10f
|
(d7ca2a2a8) Lock inventory when using a controller
|
2019-04-29 21:04:36 +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
|
9e3d13b1c9
|
(3730c56ab) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-16 17:10:10 +03:00 |
|
|
Joonas Rikkonen
|
9ec8659c89
|
(410101a21) Add an extension method for replacing strings if a condition is met.
|
2019-04-16 17:09:41 +03:00 |
|
|
Joonas Rikkonen
|
f667455659
|
(ba5343957) Button for hiding personal inventory slots
|
2019-04-16 17:08:58 +03:00 |
|
|
Joonas Rikkonen
|
e839260a9d
|
(a3d3d1671) Health interface layout tweaking, change "drop" to "use as treatment" when dragging an item to the health interface
|
2019-04-15 13:43:35 +03:00 |
|
|
Joonas Rikkonen
|
29e979d60a
|
(7840e7e91) Fixed characters selecting entities when dragging and dropping items into them when the Select input is bind to Mouse1.
|
2019-04-05 16:13:27 +03:00 |
|
|
Joonas Rikkonen
|
2eaf22683d
|
(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)
|
2019-04-01 22:47:22 +03:00 |
|
|
Joonas Rikkonen
|
ec7e23061b
|
(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.
|
2019-04-01 22:47:03 +03:00 |
|
|
Joonas Rikkonen
|
d974a5d72f
|
(3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:21:37 +02:00 |
|
|
Joonas Rikkonen
|
c0cf060526
|
(7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature).
|
2019-03-29 17:20:54 +02:00 |
|
|
Joonas Rikkonen
|
f3dc34dfa3
|
(d211acd47) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-28 18:12:09 +02:00 |
|
|
Joonas Rikkonen
|
2490951b2b
|
(6912a70c7) Removed: Unused, old code. Fixed: Formatting
|
2019-03-28 18:11:54 +02:00 |
|
|
Joonas Rikkonen
|
f51c9c14df
|
(54ae135f5) Items can be dragged and dropped directly from the inventory into containers without having to select the container first.
|
2019-03-28 18:11:40 +02:00 |
|
|
Joonas Rikkonen
|
23687fbf2f
|
aeafa16...4d3cf73
|
2019-03-18 22:57:05 +02:00 |
|
|
Joonas Rikkonen
|
3301bed442
|
409d4d9...aeafa16 (merge human-ai)
|
2019-03-18 22:52:17 +02:00 |
|
|
Joonas Rikkonen
|
044fd3344b
|
2f107db...5202af9
|
2019-03-18 21:42:26 +02:00 |
|
|
Joonas Rikkonen
|
6c0679c297
|
38f1ddb...178a853: v0.8.9.1, removed content folder
|
2019-03-18 20:39:27 +02:00 |
|