 Joonas Rikkonen
|
dedc9b5083
|
(9a7f4893d) Don't select the chatbox when pressing R/T while another textbox is selected.
|
2019-05-03 13:49:57 +03:00 |
|
|
Joonas Rikkonen
|
a445911665
|
(9cc662ae2) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-03 13:49:41 +03:00 |
|
|
Joonas Rikkonen
|
a11e7db190
|
(78f064b46) Revert "Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons."
|
2019-05-03 13:49:23 +03:00 |
|
|
Joonas Rikkonen
|
eb4f8b8a4d
|
(eaa8e3d55) "Fight intruders" order icon
|
2019-05-03 13:49:06 +03:00 |
|
|
Joonas Rikkonen
|
bd659383b4
|
(1aa050263) Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons.
|
2019-05-03 13:48:48 +03:00 |
|
|
Joonas Rikkonen
|
3701f0e957
|
(7e3aa6097) Merge remote-tracking branch 'origin/docking-interface' into dev
|
2019-05-03 13:48:31 +03:00 |
|
|
Joonas Rikkonen
|
8d3a48584b
|
(92fc1380e) Allow interacting with items inside outposts (only prevent deattaching items from walls)
|
2019-05-03 13:48:15 +03:00 |
|
|
Joonas Rikkonen
|
088f7e5485
|
(d3c10117b) Fixed nullref exception if there are no texts defined for a location type change
|
2019-05-03 13:47:58 +03:00 |
|
|
Joonas Rikkonen
|
5031432e77
|
(513733e88) Check that the character is inside the same room as the target before repairing/operating an item.
|
2019-05-03 13:47:39 +03:00 |
|
|
Joonas Rikkonen
|
1ff1584be5
|
(53f9210d1) Check the line of sight before fixing leaks or extinguishing fires.
|
2019-05-03 13:47:22 +03:00 |
|
|
Joonas Rikkonen
|
d1dd0c6043
|
(d3791496e) FireSource implements ISpatialEntity.
|
2019-05-03 13:47:05 +03:00 |
|
|
Joonas Rikkonen
|
3d5e402d22
|
(a98f03ffb) Fix target blocking itself when it's structure. Take doors into account.
|
2019-05-03 13:46:48 +03:00 |
|
|
Joonas Rikkonen
|
0e96e18a24
|
(d9833de39) Added bug report texts to EnglishVanilla
|
2019-05-03 13:46:32 +03:00 |
|
|
Joonas Rikkonen
|
3371e7dca4
|
(17183b3e8) Add a reference in the project.
|
2019-05-03 13:46:15 +03:00 |
|
|
Joonas Rikkonen
|
e0732e6d57
|
(2eca8483c) Refactor CanSeeCharacter method and implement CanSeeTarget method. If we check whether or not we can see a character, it should now check if any of the limbs can be seen instead of always checking the head/torso etc. Not tested.
|
2019-05-03 13:45:58 +03:00 |
|
|
Joonas Rikkonen
|
953b5690ec
|
(2a7829fab) Add ISpatialEntity as a common interface for everything that has a position in the game world. Would have used IMapEntity, but there's already MapEntity, which inherits Entity, so that would be confusing. Declare the inheritance only in the shared class (Character).
|
2019-05-03 13:45:41 +03:00 |
|
|
Joonas Rikkonen
|
4daa149f29
|
(15c28d37a) fixed outpost
|
2019-05-03 13:45:26 +03:00 |
|
|
Joonas Rikkonen
|
904cad71a5
|
(3be596a23) Don't allow using invalid filename characters in a save name. Fixes crashing when attempting to use symbols such as <, > or | in the name.
|
2019-05-03 13:45:10 +03:00 |
|
|
Joonas Rikkonen
|
a640439617
|
(3a64fa8f4) Fixes to wall textures bleeding into adjacent sprites, incorrect dimensions & misaligned colliders
|
2019-05-03 13:44:53 +03:00 |
|
|
Joonas Rikkonen
|
16e49d10d9
|
(a8b3957c6) Fixed nullref exception when selecting categories in the sub editor
|
2019-05-03 13:44:38 +03:00 |
|
|
Joonas Rikkonen
|
c988016b6f
|
(90245034a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-03 13:44:21 +03:00 |
|
|
Joonas Rikkonen
|
35f4657ea1
|
(d85d68721) Fixed character's feet getting stuck to platforms when climbing ladders while holding A/D
|
2019-05-03 13:44:04 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
aef95740d3
|
(768877381) Test: change the docking indicator to a pulsating crosshair when ready to dock (more noticeable than just changing the color of the centerline)
|
2019-05-03 13:43:26 +03:00 |
|
|
Joonas Rikkonen
|
7d7950e70b
|
(c3c244ef4) Nicer looking docking interface buttons (actual arrows instead of U, D, <, >)
|
2019-05-03 13:43:09 +03:00 |
|
|
Joonas Rikkonen
|
9b9735e2e7
|
(6aff06511) Fixed GUIComponent.SpriteEffects not having an effect on GUIImages
|
2019-05-03 13:42:53 +03:00 |
|
|
Joonas Rikkonen
|
bc5f571903
|
(29d8edbb9) Use a sprite to draw the lines on the sonar display (looks better than GUI.DrawLine)
|
2019-05-03 13:42:36 +03:00 |
|
|
Joonas Rikkonen
|
1d7faa8d1d
|
(b778c4641) Docking button works now in the docking interface, change button text depending on whether we're docking/undocking, some placeholder UI graphics for the nav terminal
|
2019-05-03 13:42:19 +03:00 |
|
|
Joonas Rikkonen
|
2f60af4365
|
(0947e0f05) Item.GetConnectedComponentsRecursive can traverse through relays and logic components
|
2019-05-03 13:42:00 +03:00 |
|
|
Joonas Rikkonen
|
32a8b97ad4
|
(01452b66f) Fixed "maintain position" indicators & inputs being relative to the center of the screen, not the center of the sub. Flash the docking button when ready to dock.
|
2019-05-03 13:41:42 +03:00 |
|
|
Joonas Rikkonen
|
fbb7daed00
|
(0c3442136) Merge branch 'dev' into docking-interface
|
2019-05-03 13:41:23 +03:00 |
|
|
Joonas Rikkonen
|
2199a0f97f
|
(276dcf6d2) Docking indicator changes color when the docking port is within the sector
|
2019-05-03 13:40:12 +03:00 |
|
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +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
|
52991e1ded
|
(41a4cf029) Merge
|
2019-04-25 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
8be51d71bd
|
(444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead
|
2019-04-25 17:50:35 +03:00 |
|
|
Joonas Rikkonen
|
ae33907727
|
(5bcbaf382) Improved campaign UI store search bar layout
|
2019-04-25 17:48:28 +03:00 |
|
|
Joonas Rikkonen
|
00586d26ce
|
(195c368ea) Fixed search bar layout and position for sub list and sub editor
|
2019-04-25 17:47:35 +03:00 |
|
|
Joonas Rikkonen
|
544cc7ec08
|
(bad1f3738) Added search bars to sub lists in campaign setup UI and sub editor. Closes #1415
|
2019-04-23 15:37:48 +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
|
d16c470df6
|
(de584e63e) Improved MP campaign setup UI
|
2019-04-07 21:44:28 +03:00 |
|
|
Joonas Rikkonen
|
0ecfc426ff
|
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:22:12 +03:00 |
|
|
Joonas Rikkonen
|
0dd1823eb1
|
(44a496915) Added: Template for using a video with the Welcome text in the tutorial if needed. Removed: Old spritesheets. Fixed: Bug in fetching crew with certain jobs
|
2019-04-03 16:21:57 +03:00 |
|
|
Joonas Rikkonen
|
34ee220bc9
|
(bb5ebaee3) Minor layout improvements to New Game and Game Settings
|
2019-04-02 12:39:42 +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
|
6332a6e077
|
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
|
2019-04-01 22:52:31 +03:00 |
|
|
Joonas Rikkonen
|
26210da6a6
|
(7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups
|
2019-04-01 22:52:04 +03:00 |
|
|
Joonas Rikkonen
|
a3eabfabac
|
(2400ab447) Revert "Improved New Game panel" (easier to do the columns with layoutgroups than by setting the contents to half the width)
|
2019-04-01 22:51:50 +03:00 |
|
|
Joonas Rikkonen
|
508bd960be
|
(b378675eb) Improved New Game panel
|
2019-04-01 22:51:21 +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 |
|