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
|
2aec2414be
|
(12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:25:25 +03:00 |
|
Joonas Rikkonen
|
3eb883fbb3
|
(9253f5b70) Added libvlc.so to LinuxClient
|
2019-04-26 11:25:10 +03:00 |
|
Joonas Rikkonen
|
010411d434
|
(66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:18:31 +03:00 |
|
Joonas Rikkonen
|
d425064a3b
|
(28c455ff7) Improve the ai repair tool usage.
|
2019-04-26 11:18:14 +03:00 |
|
Joonas Rikkonen
|
eb6c5ac1c5
|
(251e3f856) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:18:00 +03:00 |
|
Joonas Rikkonen
|
efca3a49fc
|
(ee33ee49f) reverted all doors back to original autodoors, reset prefabs for several doors to ensure correct repair messages, flipped stairs on humpback to ease AI steering issues.
|
2019-04-26 11:17:44 +03:00 |
|
Joonas Rikkonen
|
1ffb969522
|
(45158b939) Fixed item scale not being taken into account when drawing item assembly icons or when placing them
|
2019-04-26 11:17:11 +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
|
9c5d25a2da
|
(480a052a8) Minor physics optimization: use SetTransformIgnoreContacts when correcting physicsbody positions
|
2019-04-23 11:15:32 +03:00 |
|
Joonas Rikkonen
|
ee2326db63
|
(f27ee6807) Changed to only show damage indication when the section is damaged
|
2019-04-17 12:42:53 +03:00 |
|
Joonas Rikkonen
|
1615e2f6aa
|
(3c4a367f1) Added structural section damage indication to DebugDraw
|
2019-04-17 12:42:35 +03:00 |
|
Joonas Rikkonen
|
2b11c79a4c
|
(ac9d10462) Take entity scale and flipping into account when dragging
|
2019-04-16 17:13:34 +03:00 |
|
Joonas Rikkonen
|
9dc29965f6
|
(602bf4ba6) Implemented structure scaling. TODO: draw with correct scale when dragging
|
2019-04-16 17:13:18 +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
|
ddfdb3f4bf
|
(7f0d0fe11) Fixed specular maps going over characters, fixed levelobject draw order not working correctly in the level editor
|
2019-04-11 18:28:10 +03:00 |
|
Joonas Rikkonen
|
dd45af5a9f
|
(20f37d9c7) Option to toggle structure drop shadows and edit the position of the shadow
|
2019-04-11 18:25:01 +03:00 |
|
Joonas Rikkonen
|
9594ea67a7
|
(bf037f9b0) Don't allow deleting vanilla subs or subs that are a part of some content package
|
2019-04-08 13:36:58 +03:00 |
|
Joonas Rikkonen
|
57e5a969ba
|
(f95283b36) Submarine preview layout changes, don't display attributes that don't have a value, GUIMessageBox layout tweaking
|
2019-04-05 16:13:12 +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
|
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
|
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 |
|
Joonas Rikkonen
|
7491b06a5d
|
(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.
|
2019-04-04 11:08:02 +03:00 |
|
Joonas Rikkonen
|
79ea41e6c9
|
(4f4395b00) Reduced the size of the disallowed item interface area around the chatbox
|
2019-04-04 11:07:45 +03:00 |
|
Joonas Rikkonen
|
5f05322fdb
|
(fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server.
|
2019-04-04 11:06:12 +03:00 |
|
Joonas Rikkonen
|
1f94e174ef
|
(50a891840) Lazy deformable LevelObject sprite loading
|
2019-04-03 16:25:31 +03:00 |
|
Joonas Rikkonen
|
92713cf587
|
(d041dfb1b) Implemented lazy sprite loading (= the texture isn't loaded until it's accessed for the first time). Atm only used in LevelObjectPrefabs and location portraits.
|
2019-04-03 16:25:02 +03:00 |
|
Joonas Rikkonen
|
4685121eee
|
(3ffde5103) Disabled alpha premultiplication on a bunch of non-transparent textures (-> minor loading time reduction)
|
2019-04-03 16:24:48 +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
|
5cf66d7343
|
(ecda2cb2a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-02 12:41:32 +03:00 |
|
Joonas Rikkonen
|
e86d86c41f
|
(9bd8db487) Allow to aim in ladders when not moving.
|
2019-04-02 12:41:18 +03:00 |
|
Joonas Rikkonen
|
6de0fa4b73
|
(c5f9e6070) Fixed lighting artifacts cause by the LOS changes
|
2019-04-02 12:40:50 +03:00 |
|
Joonas Rikkonen
|
28a8a5a2ed
|
(99be2b970) Fixed submarine preview info text overlap
|
2019-04-02 12:39:55 +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
|
43578f3bb2
|
(bb8a4525e) Progress on LOS effect improvements. Hiding the unnecessary shadows at spots where the ends of two walls meet works now, still got to do something about corner areas where a vertical wall meets a horizontal one.
|
2019-04-01 22:53:27 +03:00 |
|
Joonas Rikkonen
|
6332a6e077
|
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
|
2019-04-01 22:52:31 +03:00 |
|