mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
27940 commits 38 branches 54 tags 122 MiB
Commit graph

1805 commits

Author SHA1 Message Date
Capostrophic
624a9ac353 Force shaders for objects affected by new envmap option 2020-03-04 14:06:22 +03:00
Capostrophic
2b3ecff004 Remove broken fixed function pipeline support 
Added by mistake
 2020-03-03 21:50:50 +03:00
Capostrophic
6999f1fd28 Add an option to apply lighting to environment maps 2020-03-03 20:08:59 +03:00
Capostrophic
19a7245251 Add bump mapping support 2020-03-03 13:32:30 +03:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00
Frederic Chardon
78d58a344d Item search in inventory (feature #4831) 2020-02-24 18:14:40 +00:00
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2020-02-20 01:51:47 +02:00
Capostrophic
122dffe4c1 Make uncapped Damage Fatigue optional (bug #5264) 
Cap Absorb Fatigue
 2020-02-09 14:41:38 +03:00
David Cernat
60b6f92fa3 Add OpenMW commits up to 13 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
 2020-01-15 07:49:26 +02:00
Andrei Kortunov
2b8e976c6a Adjust settings menu 2020-01-10 14:07:53 +04:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
 2020-01-02 22:09:54 +02:00
Andrei Kortunov
71e1d576cd Allow to enchant multiple projectiles at once (feature #3517) 2019-12-31 21:31:49 +04:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-12-01 23:52:42 +02:00
elsid
6be103bc54
Increase recast scale factor and tile size 
Increased recast scale fixes navmesh around (-28585, -29951, 483).
Increased tile size compensates decrease of total navmesh area.
 2019-11-30 13:19:27 +01:00
David Cernat
3c3015d0da [Browser] Remove unused buttons from the server browser for now 2019-11-20 15:05:48 +02:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
 2019-11-19 17:16:48 +02:00
Capostrophic
ae1f456b0a Default setting value tweaks 2019-11-12 18:38:52 +03:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
Andrei Kortunov
bfc07afa28 Restore normal size of quests buttons in journal 2019-11-09 14:36:22 +04:00
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
 2019-11-08 06:20:41 +02:00
Capostrophic
5a5bc0bef8 Uncheck sheathing checkboxes automatically when appropriate 
Fix their order and bogus saveSettingBool calls
 2019-11-07 17:24:43 +03:00
Capostrophic
5eab913a9c Make additional anim sources dependency more obvious 2019-11-05 21:41:56 +03:00
Capostrophic
7885b8c75e Sheathing-related changes 
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
 2019-11-04 20:34:06 +03:00
Capostrophic
31e330c9a5 Revise shadow setting tooltips and correct fade start minimum value 2019-11-02 18:06:39 +03:00
Capostrophic
208608cbd0 Fix a typo and a mistake 2019-11-02 18:06:39 +03:00
Capostrophic
9b204fe227 Move shadow settings into a new tab 2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471 Add the most basic shadow settings into the launcher 2019-11-02 18:06:39 +03:00
bzzt
b6ed2f1718 Add optional shadow map max distance and fading 2019-11-02 18:06:39 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse 
Implement mouse wheel bindings (bug #2679)
 2019-10-31 13:14:29 +01:00
Alexei Dobrohotov
f944c5b175
Merge pull request #2582 from ananace/add-oars 
Add OARS block for future packaging
 2019-10-31 12:09:19 +03:00
Alexander Olofsson
165401465b
Add OARS block for future packaging 2019-10-31 07:52:36 +01:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-10-29 23:49:31 +02:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield 
Shields holstering support
 2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6 Shields holstering support (feature #5193) 2019-10-22 09:02:59 +04:00
David Cernat
4d40f05576 [GUI] Make TES3MP text input window resize itself automatically 2019-10-10 05:04:44 +03:00
elsid
bfe6005ed4
Increase default recast scale factor 
To make 4 voxels fit into sStepSizeUp = 34:
"recast scale factor" = 4 * "cell size" / sStepSizeUp
 2019-10-07 21:29:46 +02:00
elsid
cbf8deeb31
Remove unused default settings 2019-10-07 21:05:41 +02:00
David Cernat
4a34666c59 Add OpenMW commits up to 7 Oct 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
 2019-10-07 08:19:21 +03:00
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019 
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
 2019-09-18 23:46:08 +03:00
Capostrophic
3a912485ca openmw.cfg-related fixes 
Make sure the defaults exist in local openmw.cfg too
Make sure constant attenuation settings are defined now that they are implemented
Fix config file loading order once and for all (bug #2976)
 2019-09-17 21:26:06 +03:00
David Cernat
ca67587b89 Add OpenMW commits up to 5 Sep 2019 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-09-05 21:41:50 +03:00
Capostrophic
cf0c71c651 Water shader cleanup 2019-08-30 22:32:48 +03:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
David Cernat
63f55ce762 [GUI] Fix chat window layout after 1ce370e7fa made it stop working 2019-08-27 10:53:26 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-08-22 08:40:32 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
 2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
 2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
 2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019 
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
 2019-08-21 15:48:07 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018 
# Conflicts:
#	.travis.yml
#	README.md
 2019-08-21 13:08:56 +03:00
David Cernat
cbba81df03 Add OpenMW commits up to 14 Nov 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-08-21 09:04:36 +03:00
David Cernat
3efffe92e3 Add OpenMW commits up to 5 Nov 2018 
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
 2019-08-21 05:08:50 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 13:15:00 +03:00
David Cernat
056591b957 Add OpenMW commits up to 14 Sep 2018 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-20 12:14:57 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
 2019-08-20 10:06:15 +03:00
AnyOldName3
d460e407ab Merge branch 'framelimit' into 'master' 
Default framelimit

See merge request OpenMW/openmw!54
 2019-07-27 12:54:36 +00:00
wang ryu
d4ec446141 default framelimit 2019-07-27 13:37:00 +00:00
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate 
Make framerate limit configurable in the launcher
 2019-07-19 16:16:20 +01:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
Justin Ivany
643f259cbf Adding option for cursor speed when using gamepad 2019-07-02 11:19:10 +00:00
Capostrophic
9502e9f3f7 Disable FPS limit spinbox by default and set the maximum to 1000 
Make window border and framerate limit labels consistent with other labels
 2019-06-22 18:15:19 +03:00
Capostrophic
b87b29eeb0 Make framerate limit configurable in the launcher 2019-06-22 18:15:19 +03:00
unknown
d9439389e6 fix #4665 2019-06-21 21:37:38 +02:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Alexei Dobrohotov
58f8d1ac04
Merge pull request #2402 from akortunov/console 
Make console to do not hide other GUI windows
 2019-05-30 13:41:00 +03:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Alexei Dobrohotov
ff7a04c336
Fix paths article link in local openmw.cfg too 2019-05-29 15:37:22 +03:00
Alexei Dobrohotov
883dc2136d
Fix openmw.cfg Paths article link 2019-05-29 02:55:03 +03:00
Alexei Dobrohotov
c66ddea429
Merge pull request #2392 from akortunov/guifixes 
Get ride of some redundant GUI stuff
 2019-05-18 19:05:01 +03:00
Andrei Kortunov
70ef87c093
Merge pull request #2393 from akortunov/master 
Fix libpng warning about incorrect profile
 2019-05-18 17:59:54 +04:00
Andrei Kortunov
dbd0d83a6b Fix libpng warning about incorrect profile 2019-05-18 17:57:16 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Capostrophic
686049679c Launcher: Clone content list button (feature #4784) 2019-05-15 18:17:57 +03:00
Andrei Kortunov
1c545c8f6d Fix a regression with variable declarations in water shader 2019-05-12 10:22:49 +04:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders 
Minor water shader fixes
 2019-05-11 18:07:58 +03:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell 
Add a button to delete spells from spellwindow
 2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning 
Allow to maximize windows via Shift + Double Click
 2019-05-04 20:21:30 +03:00
Alexei Dobrohotov
6aef52931f
Merge pull request #2166 from akortunov/distant_slider 
Rework the viewing distance slider
 2019-05-03 21:19:47 +03:00
Andrei Kortunov
16026ec940 Replace the openmw-plugin.png icon for launcher 2019-05-03 10:50:12 +04:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Capostrophic
e49232074b Shader adjustments 
Clamp directional per-vertex diffuse lighting
Simplify vectors
 2019-05-01 11:33:19 +03:00
Andrei Kortunov
6e7bdfe329 Make progress bar close to vanilla 2019-04-27 12:31:20 +04:00
Alexei Dobrohotov
5e405ca679
Merge pull request #2347 from akortunov/pinning 
Make pinnable windows hiding persistent
 2019-04-25 20:15:05 +03:00
Andrei Kortunov
8e48493264 Make pinnable windows hiding persistent (feature #4994) 2019-04-25 21:05:43 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2d94fa20d2 spell window layout: make longer to fit russian translation 2019-04-25 06:24:32 -04:00
Ilya Zhuravlev
04de2fcc54 spell window: Use sDeleteSpell instead of hardcoding string caption 2019-04-24 19:57:15 -04:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Capostrophic
34ea9ea813 Add an option to restore MCP-like movement behavior 2019-04-24 16:21:12 +03:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
Andrei Kortunov
7e0bf40dbe Allow to shrink tooltip width to its actual text width (bug #3812) 2019-04-21 08:27:14 +04:00
Capostrophic
fcf679de49 Make the default vertical FOV in line with vanilla (bug #4933) 2019-04-14 18:13:21 +03:00
Andrei Kortunov
31ddb0a482 Allow to calculate UI skin size based on texture resolution (feature #4968) 2019-04-10 10:34:07 +04:00
terrabyte25
61c3847a12 Add magic animation option to advanced page 2019-04-08 14:21:51 -05:00
Andrei Kortunov
35facc5cde Add an option to use casting animations for magic items (feature #4962) 2019-04-08 15:41:29 +04:00
Capostrophic
a1ec2aec26 Update SDL controller mappings from upstream 2019-04-04 22:28:55 +03:00
bzzt
4708db258e Minor water shader cleanup - avoid redundant calculations 2019-03-23 15:44:27 +04:00
Andrei Kortunov
bbb1fdd92f Reduce default composite map distance to decrease GPU loading 2019-03-23 14:25:44 +04:00
Capostrophic
02242ce66b Fix shader specular lighting (again) 2019-03-18 19:30:08 +03:00
Capostrophic
168e758921 Correct look and behavior of some setting sliders 2019-03-17 06:44:42 +03:00
AnyOldName3
5b2691e744 Actually use specular shininess parameter instead of hardcoded value. 2019-03-15 17:44:52 +00:00
elsid
f2e47d640d
Add option to limit max number of navmesh tiles 2019-03-08 17:39:04 +03:00
Andrei Kortunov
5505582a97 Fix localized 'Invert Y axis' label cutoff 2019-03-03 20:53:05 +04:00
Andrei Kortunov
9398117ea7 Allow to do not reflect terrain 2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184 Add more settings to water reflections in exteriors (feature #4859) 2019-03-02 14:26:14 +04:00
Andrei Kortunov
56fea4b062 Add setting to control composite geometry size 2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6 Allow to configure terrain vertex LOD 2019-03-01 18:02:38 +04:00
bzzt
fd94d7f7ff Make Distant Terrain more configurable (feature #4890) 2019-03-01 14:51:13 +04:00
Bret Curtis
dc1c2358b9
Merge pull request #2089 from akortunov/qthelp 
Editor: Add basic info window
 2019-02-25 16:40:11 +01:00
Bret Curtis
df2de8a661
Merge pull request #2068 from Capostrophic/normalweapons 
Make normal weapon resistance behavior closer to vanilla (bug #4384)
 2019-02-23 08:38:30 +01:00
Capostrophic
4138e29ca4 Add option to restore the previous ammo behavior 2019-02-22 17:18:23 +03:00
Bret Curtis
942f7f776d
Merge pull request #2168 from Capostrophic/gamepad 
Option to disable controller (feature #3980)
 2019-02-22 15:03:01 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm 
Shadows
 2019-02-20 15:35:49 +00:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths 2019-02-16 15:50:58 +03:00
Capostrophic
39dcbacf44 Option to disable controller (feature #3980) 2019-02-15 18:40:22 +03:00
AnyOldName3
f3fc888ab9 Merge branch 'osgshadow-test-vdsm-mesa-optimised-shader-2' into osgshadow-test-vdsm 2019-02-09 15:51:30 +00:00
AnyOldName3
9b92943d1a Don't rely exclusively on a shadow map when out of its depth range 2019-02-05 20:51:56 +00:00
AnyOldName3
abe9ba736e Add line breaks to make settings more readable. 2019-01-31 15:00:04 +00:00
AnyOldName3
556c9a3382 Add normal-offset shadow mapping to remove shadow acne (flicker) 2019-01-30 22:28:00 +00:00
Capostrophic
731f91759e Account for inverted tangents on normal-mapped objects (bug #3733) 2019-01-30 02:03:26 +03:00
Andrei Kortunov
8580a58ba0 Optimize HUD update (do not do unnecessary work) 2019-01-25 21:15:29 +04:00
Andrei Kortunov
8687a49c19 Editor: Added basic info window 2018-12-21 18:51:02 +04:00
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
Bret Curtis
83e346e1e6
add new bugtracker 2018-12-12 16:18:49 +01:00
Bret Curtis
b8b1a52216 add commit date; revert boost as we are not breaking anything yet 2018-12-12 10:27:09 +01:00
Bret Curtis
fc10adb608 makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml 2018-12-11 21:30:37 +01:00
AnyOldName3
2d5da1a6fa Don't exclusively rely on a shadow map if its bounds have been expanded since the cull traversal. 2018-12-08 20:39:41 +00:00
Capostrophic
7b5932a49d Add Invert X Axis option (feature #3610) 2018-12-01 19:08:02 +03:00
AnyOldName3
0a409c0ab8 Make shadow map front-face culling configurable 2018-12-01 00:26:43 +00:00
AnyOldName3
dd207d9e54 Make the shadow polygon offset parameters configurable 2018-11-30 00:55:54 +00:00
AnyOldName3
49487355a5 Merge branch 'osgshadow-test-vdsm' of https://github.com/AnyOldName3/openmw into osgshadow-test-vdsm 2018-11-29 01:26:22 +00:00
AnyOldName3
642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-29 01:19:01 +00:00
Bret Curtis
caad388c26 bump our versions to 0.46, keep this commit in mind when trying to automate this into one place 2018-11-14 16:32:24 +01:00
Grim Kriegor
8f90f8a3b8 [General] Change the default plugins home location 2018-11-12 01:10:10 +00:00
Stanislaw Halik
caefe8cda0 fix win32 app manifest copy-paste error 2018-11-11 21:46:15 +01:00
AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution 2018-11-08 23:05:07 +00:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons 
Weapon sheathing
 2018-11-08 20:44:20 +01:00
Capostrophic
fcb2cde1dd Tweak the default chargen and level up messages 2018-11-07 18:00:20 +03:00
Stanislaw Halik
5e3e01cac0 fix resolution on HiDPI displays under Windows 
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.

What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.

Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.

Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
 2018-11-05 16:16:09 +00:00
Andrei Kortunov
92e45507d8 Weapon sheathing support, including quivers and scabbards (feature #4673) 2018-11-05 11:18:20 +04:00
AnyOldName3
0bafa4399b Use distant shadow maps when the current fragment is outside the depth range of the near ones. 2018-11-03 16:56:33 +00:00
AnyOldName3
ad9dab8593
Switch alpha test from < to <= to fix weird shadows on actors with 50% chameleon 2018-11-03 16:20:56 +00:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour 
Use recastnavigation for pathfinding (#2229)
 2018-10-30 20:44:13 +01:00
Marc Zinnschlag
854d85cb47 Merged merge request !42 2018-10-30 17:05:15 +01:00
Bret Curtis
cbbe69f3f2 additional cleanups for non-essential fallbacks 2018-10-30 12:17:10 +01:00
Bret Curtis
9b83a2345b remove unnecessary fallbacks 2018-10-29 20:54:21 +01:00
Bret Curtis
988914725a wip 1 
wip2

add more Level_UP and QA text

the rest of the questions
 2018-10-29 17:03:49 +01:00
Capostrophic
8757b3edd1 Add icons for Edit and Touch actions (kudos to akortunov) 2018-10-28 21:06:42 +03:00
Capostrophic
89b8eb029f Add icons for record context menu actions 2018-10-28 20:35:58 +03:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Bret Curtis
e7892361f6
Merge pull request #1994 from akortunov/actor_culling 
Minor tweaks for actors processing range setting
 2018-10-28 14:44:12 +01:00
elsid
abc51a8a17 Add settings option to set max number of polygons per navmesh tile 2018-10-28 15:36:47 +03:00
Andrei Kortunov
06d226a1b7 Minor tweaks for actors processing range setting 2018-10-28 15:08:24 +04:00
Marc Zinnschlag
9dd0d641bc Merged pull request #1931 2018-10-28 11:02:33 +01:00
Capostrophic
d27d48eb22 Fix revert record icon 2018-10-27 19:45:40 +03:00
Andrei Kortunov
e7de6b974a Optimize actors processing 
1. Do not update physics and animations for actors outside processing range (bug #4647)
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
 2018-10-25 22:52:59 +04:00
AnyOldName3
e22ab64ebf Fix typo in lighting.glsl 2018-10-22 17:35:01 +01:00
AnyOldName3
85b97d19d3 Add alpha threshold for shadow casting. 2018-10-17 14:02:26 +01:00
AnyOldName3
474770eca8 Switch shadow map rendering to a specialised, simplified shader. 2018-10-16 21:23:31 +01:00
AnyOldName3
ce15369bbd Convert colorMode shader define to a uniform 2018-10-15 23:12:15 +01:00
elsid
ed73d130f9
Cache navmesh tiles 
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.

Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
 2018-10-13 22:22:12 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater 2018-10-13 22:16:34 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render 2018-10-13 22:16:32 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file) 2018-10-13 22:16:31 +03:00
elsid
c26773bd29
Log update NavMesh status 2018-10-13 22:16:29 +03:00
elsid
faaf50446d
Option to initially enable NavMesh render 2018-10-13 22:16:28 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles 2018-10-13 22:16:28 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions 2018-10-13 22:16:27 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file 2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log 2018-10-13 22:16:26 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path 2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713 Merge upstream/master 2018-10-10 21:23:19 +01:00
Marc Zinnschlag
6a9618f0f5 Merged pull request #1948 2018-09-29 11:03:26 +02:00
Capostrophic
f20f49daa6 Content selector: allow to copy paths to clipboard (feature #2847) 2018-09-29 02:09:13 +03:00
Marc Zinnschlag
3dc15d39e3 Merged pull request #1936 2018-09-28 11:30:13 +02:00
Capostrophic
ba2fd8b795 Rename reflected absorb spells setting and add it to Advanced tab 2018-09-26 21:21:03 +03:00
Capostrophic
52da65b776 Fix issues with sun specularity (bug #4527) 2018-09-23 03:39:06 +03:00
Marc Zinnschlag
7be9f2ca45 Merged pull request #1891 2018-09-21 11:38:19 +02:00
Andrei Kortunov
276b7830a9 Mass potion creation (feature #4642) 2018-09-20 15:45:14 +04:00
Andrei Kortunov
62f6f174cf Show attack speed of ranged weapons 2018-09-19 12:23:21 +04:00
Marc Zinnschlag
06b2a23e74 Merged pull request #1768 2018-09-17 12:10:21 +02:00
Andrei Kortunov
275d10e1f7 Add missing icons for UniversalId tables and use them in the editor menu (feature #912) 2018-09-12 22:37:19 +04:00
Andrei Kortunov
c9c0230d2a Scale journal fonts separately from common ones 2018-09-12 14:31:01 +04:00
Andrei Kortunov
8da099713e Minor layout fixes to fit different font size 2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca Improve GUI scaling (bug #3288) 2018-09-12 14:31:01 +04:00
David Cernat
be448e5b8e [General] Use more appropriate update rate in server config 2018-08-23 00:06:28 +03:00
David Cernat
0658d39eaa [General] Update ports used for master server in client & server config 2018-08-22 13:47:46 +03:00
David Cernat
a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts 
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2018-08-20 14:08:44 +03:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
Capostrophic
37f9d45182 Remove an outdated checkbox from the advanced page 2018-08-15 16:04:29 +03:00
Bret Curtis
4cb9b52b81 fix rebase issue 2018-08-14 23:15:30 +02:00
AnyOldName3
1098bd2467 Optimise lighting.glsl for Mesa users. 2018-08-14 21:35:23 +01:00
Yohaulticetl
640b32da56 Fixed merge conflicts 2018-08-14 19:57:48 +02:00
Yohaulticetl
d6f607e823 Fixed wrong starting index 2018-08-14 19:56:40 +02:00
Yohaulticetl
7e9ce99062 Made the werewolf check optional 2018-08-14 19:56:40 +02:00
Yohaulticetl
d19cbdb652 Factored strength into hand-to-hand combat 2018-08-14 19:44:03 +02:00
AnyOldName3
3b3721897d Make indoor shadows disableable. 2018-08-08 23:56:11 +01:00
AnyOldName3
a2b54714d4 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-08-08 23:28:06 +01:00
Koncord
d03722b3f4 [Browser] Rework browser for improved stability & clarity 
(cherry picked from commits 5c79e7106f, 57353cdfff, 15723adb9a, 01a5196a92, ed75563a94, 3839a2dcfd, 1fd16ba69c, 66283943c5, ba8613a179, 5b8f4f3e92, 35b771b19e, 043eb224e2, 05fac2f67d)
 2018-08-05 07:20:12 +03:00
AnyOldName3
8f4125134f Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-08-02 15:51:06 +01:00
Capostrophic
ab29f9e13f Add permanent barter disposition change option (feature #3103) 2018-08-01 17:31:35 +03:00
Marc Zinnschlag
e8139a5cc7 Merged pull request #1835 2018-08-01 15:46:31 +02:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
AnyOldName3
f717c9e56d
Sort out some tabs which snuck into the water shader 2018-08-01 14:07:02 +01:00
Capostrophic
4d48ede6f1 Add two missing gameplay settings to Advanced tab 2018-08-01 13:36:31 +03:00
Andrei Kortunov
2d4ec86b8d Provide launcher icons 2018-07-28 13:18:38 +04:00
David Cernat
21d5bb4d4e
Merge pull request #460 from OpenMW/master 
Add 0.7.0 commits up to 20 Jul 2018
 2018-07-21 05:59:57 +03:00
Miloslav Číž
4e3bc3e403 Change wave parameters based on weather 2018-07-11 17:03:59 +02:00
David Cernat
7a646494ee [General] Point to serverCore.lua instead of server.lua in server config 2018-07-11 02:53:40 +03:00
David Cernat
26ac29e8b1 [Client] Add disclaimer to save dialog about singleplayer-only saves 2018-07-09 22:55:11 +03:00
David Cernat
c0fde5ae97 [General] Add explanation about 0.0.0.0 to server config file 2018-07-07 19:33:54 +03:00
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Koncord
685a80887b Remove Pawn support 2018-07-02 23:00:35 +08:00
Thunderforge
72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 2018-06-28 20:13:18 -05:00
AnyOldName3
85aba2e1da Add toggleable shadow debug overlay. 2018-06-28 17:24:36 +01:00
AnyOldName3
a7e53df278 Move common shadow code to shared shadow shader headers 2018-06-24 23:40:52 +01:00
AnyOldName3
933ed77ef6 Fix water shader alignment issues noticed while removing tabs. 2018-06-22 01:05:45 +01:00
AnyOldName3
b25b356081 Sort out shader indentation 2018-06-22 01:02:01 +01:00
AnyOldName3
553094669b Merge upstream/master (& fix merge conflicts) 2018-06-20 00:11:23 +01:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Thunderforge
058cfb553c Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs 2018-06-12 22:18:06 -05:00
Thunderforge
a9ca528fb8 Adding version number of macOS build of OpenMW 2018-06-09 19:42:24 -05:00
Marc Zinnschlag
efb4abbb7f Merged pull request #1623 2018-06-09 10:49:04 +02:00
Andrei Kortunov
fea34bd73f Added support for per-group animation files 2018-06-08 17:04:15 +04:00
AnyOldName3
759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-05-27 15:41:42 +01:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master 
Add OpenMW commits up to 27 May 2018
 2018-05-27 16:10:16 +03:00
scrawl
31ea7c8edd
Revert "set rebalance soul gem values to true by default" 
This reverts commit 2963524a01.
 2018-05-27 10:43:31 +00:00
Marc Zinnschlag
b151a89528 Merged pull request #1568 2018-05-26 12:17:07 +02:00
Marc Zinnschlag
e30ade81be Merged pull request #1680 2018-05-26 11:21:34 +02:00
Andrei Kortunov
9ac752ea70 Implement filtering in the spells window 2018-05-24 10:48:46 +04:00
David Cernat
296c69d788
Merge pull request #436 from OpenMW/master 
Add OpenMW commits up to 22 May 2018
 2018-05-23 00:40:51 +03:00
declan-millar
2963524a01 set rebalance soul gem values to true by default 2018-05-22 12:59:27 +01:00
declan-millar
9ed4f33048 Replace spelling: soulgem -> soul gem 2018-05-21 19:10:24 +01:00
AnyOldName3
86ce33f437 Update documentation 2018-05-21 16:00:51 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
AnyOldName3
feac7bd88e Use 3 shadow maps by default as 1 sucks. 2018-05-20 00:17:06 +01:00
AnyOldName3
84284a60a7 Make CSM shader changes controllable by the setting. 2018-05-17 17:35:55 +01:00
AnyOldName3
5d05aadb37 Begin to let settings toggle between CSM and PSSM 2018-05-17 16:57:01 +01:00
AnyOldName3
aa68af4f8b Make shaders pick the correct shadow cascade level and blend near cascade edges. 2018-05-16 18:20:21 +01:00
David Cernat
5458e09c8a
Merge pull request #420 from OpenMW/master 
Add OpenMW commits up to 11 May 2018
 2018-05-12 06:32:01 +03:00
AnyOldName3
44b2cf2b7f Merge upstream. 2018-05-11 19:15:04 +01:00
Nelsson Huotari
4ae75d1d20 Terrain texture brush frame 2018-05-10 11:18:54 +03:00
Marc Zinnschlag
e661e3cf74 Merged pull request #1677 2018-05-07 09:42:41 +02:00