 Joonas Rikkonen
|
bec7aadfa9
|
(af16ecdfa) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:00 +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
|
427526aba2
|
(d4a475f03) Added text wrapping to pump GUI texts
|
2019-05-07 18:05:16 +03:00 |
|
|
Joonas Rikkonen
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
|
Joonas Rikkonen
|
65d627d57c
|
(2c9775b8e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-06 11:22:36 +03:00 |
|
|
Joonas Rikkonen
|
b797d112b7
|
(db4f4a55b) HasRequiredItems method is used for different purposes. Thus we shouldn't return true if the door is damaged but not broken, because it would cause issues for example in steering. Similarly I don't think we should use the canBePicked here, because it could be possible that the door should be interactable but not pickable.
|
2019-05-06 11:22:20 +03:00 |
|
|
Joonas Rikkonen
|
e4adc47dad
|
(1036993d3) Adjusted motion detector in autodoors
|
2019-05-06 11:22:02 +03:00 |
|
|
Joonas Rikkonen
|
30620ed059
|
(61cc49902) Don't create ai for the dummy character. Creates issues.
|
2019-05-06 11:21:45 +03:00 |
|
|
Joonas Rikkonen
|
ad2b6159c0
|
(64db8799d) Removed editable DynamicDockingIndicator property
|
2019-05-03 13:57:58 +03:00 |
|
|
Joonas Rikkonen
|
2c3d33e3d5
|
(245fdaa7e) Fixed invisible reactor on/off lever
|
2019-05-03 13:55: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
|
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
|
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
|
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
|
45ba589d96
|
(12412e6fd) Determine the steering vector relative to the center of the sub, not the center of the display when clicking on the display
|
2019-05-03 13:41:06 +03:00 |
|
|
Joonas Rikkonen
|
5d4a3f18c6
|
(021a3d977) Draw the steering indicator at the center of the sub, not at the center of the display. Change the color of the docking indicators when ready to dock
|
2019-05-03 13:40:49 +03:00 |
|
|
Joonas Rikkonen
|
a2c2f72357
|
(2edf7845f) Progress on docking interface (nudge controls), focus sonar on the center of the submarine instead of the nav terminal
|
2019-05-03 13:40:31 +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
|
482b3dacfd
|
(392954b0e) Swap the order of the starting location & destination in nav terminals when playing in a mirrored sub.
|
2019-04-29 21:18:04 +03:00 |
|
|
Joonas Rikkonen
|
ce7d36d9e2
|
(78888f7fb) Changes to reactor interface to make it adapt better to different text lengths
|
2019-04-29 21:13:36 +03:00 |
|
|
Joonas Rikkonen
|
8737a0e0dd
|
(26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit.
|
2019-04-29 21:12:47 +03:00 |
|
|
Joonas Rikkonen
|
e21b4e5efc
|
(529c58f9a) Added a couple of missing texts to EnglishVanilla. Because it may take a while until these can be added, a hard-coded text is used if these lines can't be found.
|
2019-04-29 21:12:31 +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
|
1a3184dbad
|
(4c452f172) Force reactor IsActive=true when an AI character or a remote player operates it. Previously this was only done in UpdateHUD, so inactive reactors would not become enabled.
|
2019-04-18 12:04:56 +03:00 |
|
|
Joonas Rikkonen
|
fdacc4534b
|
(c14dcd3d6) Support for multi-target monster missions
|
2019-04-18 12:03:07 +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
|
66de47f041
|
(a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml
|
2019-04-15 12:06:58 +03:00 |
|
|
Joonas Rikkonen
|
d7e41d95af
|
(bb287fabc) Decreased simple physics distance, sonar now displays characters that are in simple physics mode
|
2019-04-11 18:28:38 +03:00 |
|
|
Joonas Rikkonen
|
9f55da3677
|
(8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item).
|
2019-04-10 15:13:25 +03:00 |
|
|
Joonas Rikkonen
|
6ac3ecd2b2
|
(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-04 11:43:25 +03:00 |
|
|
Joonas Rikkonen
|
16c558a859
|
(7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns
|
2019-04-04 11:10:43 +03:00 |
|
|
Joonas Rikkonen
|
cc122f2bbf
|
(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test
|
2019-04-04 11:10:29 +03:00 |
|
|
Joonas Rikkonen
|
b08a31a68f
|
(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.
|
2019-04-04 11:10:14 +03:00 |
|
|
Joonas Rikkonen
|
41da4e24a9
|
(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-04 11:09:45 +03:00 |
|
|
Joonas Rikkonen
|
1966bcb4ab
|
(c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes).
|
2019-04-04 11:09:32 +03:00 |
|
|
Joonas Rikkonen
|
66fa81bd3d
|
(23a7169b0) Updated item assemblies to get the items in sync with the current prefabs (see #1363)
|
2019-04-04 11:09:17 +03:00 |
|
|
Joonas Rikkonen
|
dce643e116
|
(a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml
|
2019-04-04 11:09:03 +03:00 |
|
|
Joonas Rikkonen
|
a3425a0432
|
(bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row
|
2019-04-04 11:08:49 +03:00 |
|
|
Joonas Rikkonen
|
7eb03ea6b3
|
(874c38a79) Show keybindings for use or shoot in the tooltips.
|
2019-04-04 11:08:33 +03:00 |
|
|
Joonas Rikkonen
|
d4752bb6a0
|
(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.
|
2019-04-04 11:08:18 +03:00 |
|