Commit Graph

3757 Commits

Author SHA1 Message Date
Joonas Rikkonen
4fa3d8e41a (3582f590f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:59 +03:00
Joonas Rikkonen
4d3e3ca0a2 (d08b879a0) Moved remora's aux engine back so the turbine is outside 2019-05-16 06:30:39 +03:00
Joonas Rikkonen
e50baabea0 (36cf727ca) fixes and sub folder cleanup 2019-05-16 06:30:22 +03:00
Joonas Rikkonen
531a1235af (e2fcec3e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:06 +03:00
Joonas Rikkonen
e074a5bf73 (7da87677c) tweaks and fixes 2019-05-16 06:29:49 +03:00
Joonas Rikkonen
2ac3f597ca (de83e894f) Fixed remora tail hull problem, moved ballast ladder platform to correct position 2019-05-16 06:29:32 +03:00
Joonas Rikkonen
04124fe56b (2f11bb197) tweaks 2019-05-16 06:29:14 +03:00
Joonas Rikkonen
07055ada82 (2c6f87623) Made autodoor motion sensor area bigger on most doors 2019-05-16 06:28:55 +03:00
Joonas Rikkonen
d9ab57e2ae (8a177f8bd) Fixed remora airlocks and refreshed drone. Added higher res preview pics to remora, typhon and bunyip 2019-05-16 06:28:39 +03:00
Joonas Rikkonen
7c167257b1 (6653a62b6) Small visual pass for the outposts, added some safety railings for outpost exteriors 2019-05-16 06:28:22 +03:00
Joonas Rikkonen
70ff950d38 (c5137ce8c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:28:06 +03:00
Joonas Rikkonen
e39043dbf5 (834990e1a) sub folder cleanup 2019-05-16 06:27:50 +03:00
Joonas Rikkonen
fef173f129 (eb3823e18) updated decals for tutorial station 2019-05-16 06:27:33 +03:00
Joonas Rikkonen
1cdd62360f (986bfff2b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:27:16 +03:00
Joonas Rikkonen
a6b592a625 (93733c170) Fix a null reference exception. 2019-05-16 06:26:57 +03:00
Joonas Rikkonen
cdc2ede035 (741810595) adjustments to art pass 2019-05-16 06:26:39 +03:00
Joonas Rikkonen
f23e4c67db (534c88165) Remora, remora drone & Typhon updated 2019-05-16 06:26:22 +03:00
Joonas Rikkonen
36898958b2 (0a8612032) Graphics add, mostly structure stuff 2019-05-16 06:26:06 +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
bf57a48c7e (ebf4529cc) Use a uniform way to check if the bot has reached it's target. Should fix issues where bot is stuck when trying to get or operate an item in some cases. 2019-05-16 06:25:31 +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
52d3737416 (717837ca0) Fixed: Editor spacing & element sizes in 4k 2019-05-16 06:24:55 +03:00
Joonas Rikkonen
dc2f96443a (ff4df7194) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:24:39 +03:00
Joonas Rikkonen
880b7b1c02 (35b1c9d08) Fixed: NetLobby permission view dialog 2019-05-16 06:24:21 +03:00
Joonas Rikkonen
a09baa3484 (e1f526341) Fixed turrets not rotating to the correct direction client-side when a bot is operating them 2019-05-16 06:24:04 +03:00
Joonas Rikkonen
a2276b308f (0634c0518) Fixed docking interface not activating in subs with more than one docking port (e.g. Selkie) or on nav terminals that control another sub (e.g. Remora's drone control terminal) 2019-05-16 06:23:47 +03:00
Joonas Rikkonen
71c59e98a7 (c2a796af9) Fixed: globalZoomScale not working properly past fullHD resolutions 2019-05-16 06:23:30 +03:00
Joonas Rikkonen
2aaf5c359f (56b84ac3d) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:23:10 +03:00
Joonas Rikkonen
0a4a2aa35e (cdc3301a5) Fixed: Tutorial checkmark position 2019-05-16 06:22:53 +03:00
Joonas Rikkonen
0b837a6086 (1a3a48fee) Fixed: Tutorial stroke size 2019-05-16 06:22:36 +03:00
Joonas Rikkonen
3e8d6cdfc8 (1b9acec1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:22:19 +03:00
Joonas Rikkonen
ed2f3f0b11 (643118ce3) Fixed a typo in Credits.xml 2019-05-16 06:22:03 +03:00
Joonas Rikkonen
6b2d6aabe5 (917534b2b) Fixed: tooltip overflowing from container on 4k 2019-05-16 06:21:46 +03:00
Joonas Rikkonen
66e0ac9dc6 (0151f8b18) Fixed: StatusMonitor overlapping with the Sonar in 4k 2019-05-16 06:21:27 +03:00
Joonas Rikkonen
fcd95da483 (44994edc6) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:21:10 +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
b0a8f0e5e1 (c41c72d1b) new arrow decals 2019-05-16 06:20:37 +03:00
Joonas Rikkonen
aac2aaae8b (46356bbf0) Fix bots reporting incorrectly that there is no targets. 2019-05-16 06:20:20 +03:00
Joonas Rikkonen
cb0a1dc681 (f41a05165) Change the debug text colors. 2019-05-16 06:20:03 +03:00
Joonas Rikkonen
0df7ed4ac0 (b0edb0a51) Fix bots not being able to equip anything. 2019-05-16 06:19:46 +03:00
Joonas Rikkonen
69494dcde8 (d7a4efa97) Merge branch 'human-ai' into dev 2019-05-16 06:19:27 +03:00
Joonas Rikkonen
e8ee3f9d18 (18eb9f712) Fix bots stealing items if they happen to target them before somebody equips them. 2019-05-16 06:19:10 +03:00
Joonas Rikkonen
df89114850 (67f64fd23) Incremented version number 2019-05-16 06:18:53 +03:00
Joonas Rikkonen
5326dace2b (98af64697) Updated readme file 2019-05-16 06:18:36 +03:00
Joonas Rikkonen
bed3afab4b (b7b7e6b02) Rename "courage" to "resolution" and disable it, because it's not yet used anywhere. 2019-05-16 06:18:20 +03:00
Joonas Rikkonen
dbb7b175d4 (fc343e73b) Changelog additions 2019-05-16 06:18:03 +03:00
Joonas Rikkonen
8b977ed5c0 (fb180d412) Merge branch 'dev' into human-ai 2019-05-16 06:17:45 +03:00
Joonas Rikkonen
2f0bd98f8f (43fff031a) Remove the placeholder female engineer variant. Only male engineers now have two variants. 2019-05-16 06:17:28 +03:00
Joonas Rikkonen
306e3575a8 (95bf20e92) Disable watchman and mechanic variants for the build, because they are not yet quite there. 2019-05-16 06:17:11 +03:00
Joonas Rikkonen
5d38344efc (dc8407cf2) Properly remove reported targets when they are done. Fix get item completing when it shouldn't if the target item was supposed to be equipped. 2019-05-16 06:16:54 +03:00