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

1755 commits

Author SHA1 Message Date
Petr Mikheev
9ec6fce446 Makes the delay of turning while run configurable (part of "smooth movement"). 2020-10-17 16:11:22 +02:00
David Cernat
68837aaf4a Add OpenMW commits up to 15 Oct 2020 
# Conflicts:
#   .travis.yml
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/mwgui/containeritemmodel.cpp
#   apps/openmw/mwgui/tradewindow.cpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwworld/actionteleport.cpp
#   apps/openmw/mwworld/containerstore.cpp
 2020-10-15 19:51:39 +02:00
fredzio
ae3306c019 Document async physics settings 
Add an option to the launcher
Update changelog
 2020-10-15 06:41:41 +02:00
fredzio
3c2504b442 Process movement queue in one or several background threads 
Before movement calculation, the main thread prepare a
vector of ActorFrameData, which contains all data necessary to perform
the simulation, and feed it to the solver. At the same time it fetches
the result from the previous background simulation, which in turn is
used by the game mechanics.
Other functions of the physics system (weapon hit for instance)
interrupt the background simulation, with some exceptions described
below.

The number of threads is controlled by the numeric setting

[Physics]
async num threads

In case 'async num threads' > 1 and Bullet doesn't support multiple threads,
1 async thread will be used. 0 means synchronous solver.
Additional settings (will be silently switched off if async num threads = 0)

[Physics]
defer aabb update

Update AABBs of actors and objects in the background thread(s). It is not an especially
costly operation, but it needs exclusive access to the collision world, which blocks
other operations. Since AABB needs to be updated for collision detection, one can queue
them to defer update before start of the movement solver. Extensive tests on as much
as one installation (mine) show no drawback having that switched on.

[Physics]
lineofsight keep inactive cache

Control for how long (how many frames) the line of sight (LOS) request will be kept updated.
When a request for LOS is made for the first time, the background threads are stopped to
service it. From now on, the LOS will be refreshed preemptively as part of the background
routine until it is not required for lineofsight keep inactive cache frames. This mean
that subsequent request will not interrupt the background computation.
 2020-10-15 06:41:35 +02:00
Petr Mikheev
be27b51279 Add head bobbing in first person mode 2020-10-08 00:22:01 +02:00
Alexei Dobrohotov
5ab29f26e9 Put the main menu below other windows (bug #5622) 2020-10-01 20:31:45 +03:00
David Cernat
0eedf8fd9f Add OpenMW commits up to 30 Sep 2020 
# Conflicts:
#   apps/openmw/mwmechanics/aicombat.cpp
#   apps/openmw/mwmechanics/character.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   components/CMakeLists.txt
 2020-09-30 13:32:15 +02:00
Petr Mikheev
a17fb14b8a Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md. 2020-09-22 22:50:44 +02:00
Petr Mikheev
b838782557 Avoid collisions between actors. 2020-09-22 22:50:44 +02:00
Petr Mikheev
71ba94a89a Smooth turning; smooth stopping; combat headtracking 2020-09-22 22:50:44 +02:00
David Cernat
80af0ce6a7 Add OpenMW commits up to 29 Aug 2020 
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwmechanics/character.cpp
 2020-08-29 16:15:22 +02:00
Andrei Kortunov
7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 2020-08-22 09:26:15 +04:00
Capostrophic
c436f29a1e Make Advanced tab of the launcher look okay for everyone again 2020-08-09 20:23:17 +03:00
Petr Mikheev
6a4fa8a8b5 Add more settings to openmw-launcher 2020-08-07 20:17:44 +00:00
David Cernat
baa9446cd1 Add OpenMW commits up to 4 Aug 2020 2020-08-04 17:41:01 +02:00
Bret Curtis
82a45eb6ae
Merge pull request #2976 from Capostrophic/unconscious 
Add option to always allow stealing from KO'd actors (feature #5545)
 2020-07-27 01:22:51 +02:00
Petr Mikheev
65c92b6488 Add alignment="Qt::AlignTop" to files/ui/graphicspage.ui 2020-07-27 00:24:15 +02:00
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
Bret Curtis
584fcd4716 Merge branch 'master' of github.com:OpenMW/openmw 2020-07-26 11:54:51 +02:00
Bret Curtis
224923d6c8 update appdata license and dejavufont license file 2020-07-26 01:56:55 +02:00
David Cernat
ff10aa816b Add OpenMW commits up to 25 Jul 2020 
# Conflicts:
#   .travis.yml
 2020-07-25 19:44:01 +02:00
CedricMocquillon
1f4f10c723 Add a tab level in advanced settings 2020-07-25 17:42:31 +02:00
Petr Mikheev
2e6aa155a3 New settings 'preview if stand still' and 'deferred preview rotation'. 2020-07-19 18:21:40 +02:00
Petr Mikheev
8ac7ffc32b Remove 'separate preview camera' and make the new behavior the default one. 
Also minor refactoring in camera.cpp
 2020-07-17 22:59:44 +02:00
Petr Mikheev
4d206d2c67 Improved preview mode 2020-07-17 20:35:52 +02:00
Petr Mikheev
383fa3d3ab Make 'zoom out when move' configurable. 2020-07-12 21:03:18 +02:00
Petr Mikheev
ef03f2c033 Auto switch shoulder 2020-07-12 20:51:38 +02:00
David Cernat
39e429c9eb Add OpenMW commits up to 11 Jul 2020 
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
 2020-07-11 21:42:01 +02:00
Petr Mikheev
280862f58b New setting "third person camera distance" 2020-07-10 00:38:18 +02:00
psi29a
46db69a349 Merge branch 'swimming' into 'master' 
Swimming-related fixes

See merge request OpenMW/openmw!247

(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)

738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
 2020-07-09 20:05:59 +00:00
CedricMocquillon
998bf5da34 Add new checkbox for the new setting 'trainers training skills based on base skill' 2020-07-06 20:32:30 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills. 
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
 2020-07-06 20:28:08 +02:00
David Cernat
5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
 2020-07-04 16:50:54 +03:00
Dillon
8f9de7289d fix typos 2020-07-02 13:48:56 +00:00
Alexei Dobrohotov
c53516a4b7
Merge pull request #2940 from akortunov/deadzone 
Make joysticks dead zone configurable
 2020-06-30 01:15:58 +03:00
Andrei Kortunov
230e06dec7 Make joysticks dead zone configurable (bug #5502) 2020-06-28 13:12:12 +04:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
Petr Mikheev
63f828fea8 Bugfix for "turn to movement direction" 2020-06-26 20:04:02 +00:00
Petr Mikheev
63137a3b5a Make vertical offset of "view over shoulder" configurable 2020-06-24 20:07:41 +02:00
psi29a
abc77075b9 Merge branch 'doc-formattopics' into 'master' 
Follow up to MR 126 - make it more obvious for end users how to set colors

See merge request OpenMW/openmw!234
 2020-06-24 11:26:22 +00:00
fredzio
6d4d53fc7c Add a setting to the launcher to enable/disable the dialogue topic 
formatting stuff.
 2020-06-22 23:21:03 +02:00
David Cernat
3b2eb6f62c Add OpenMW commits up to 22 Jun 2020 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2020-06-22 20:50:55 +03:00
Petr Mikheev
b4c699348f Improved strafe movement 2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747 Advanced third person camera. 2020-06-22 15:22:34 +02:00
fredzio
ae27ad6bcd Follow up to MR 126 
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
 2020-06-22 04:31:12 +02:00
Alexei Dobrohotov
0d70318304 Merge branch 'launcher-search-datafiles-tab' into 'master' 
Add a search function to the "Datafiles" tab of the OpenMW launcher

See merge request OpenMW/openmw!191
 2020-06-21 14:45:31 +00:00
Cédric Mocquillon
6e397e4008 Add a search function to the "Datafiles" tab of the OpenMW launcher 2020-06-21 14:45:30 +00:00
psi29a
981184109e Merge branch 'formattopics' into 'master' 
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
 2020-06-21 07:58:02 +00:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix 
Get rid of ECLD and dependencies
 2020-06-17 15:00:57 +02:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Andrei Kortunov
50d692a097
Merge pull request #2914 from akortunov/master 
Fix typos in shaders
 2020-06-17 10:14:52 +04:00
Andrei Kortunov
9bc0e9b4b7 Fix typos in shaders 2020-06-17 10:13:52 +04:00
psi29a
66b5cf9f1d Merge branch 'master' into 'near_far_mode_in_launcher' 
# Conflicts:
#   files/settings-default.cfg
 2020-06-16 23:05:07 +00:00
psi29a
6f8eefcb16 Switching object paging active grid default option to false for now until the light limit problem is resolved. 2020-06-16 17:53:09 +00:00
psi29a
0dc7715c35 Merge branch 'object_paging_retry' into 'master' 
Object Paging

See merge request OpenMW/openmw!209
 2020-06-16 08:21:54 +00:00
Andrei Kortunov
f30cb9f8bc Calculate viewNormal only when needed 2020-06-15 12:57:37 +04:00
bzzt lost a hitlab login
c7fda6d280 activegrid paging = 2xfps 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4dccabeb83 fix analyzation not taking instancecount in account + settings calibration 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
77b92aee9c fix shadowsglitch by bounds overflow 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
00e56ae862 batch debug colours 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
8a624e5a71 minsize based on mergedecision solves partial culling 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
ce505a9bb3 crashfix + optimiziation 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f terrainbased objectpaging 
Signed-off-by: Bret Curtis <psi29a@gmail.com>
 2020-06-13 00:22:27 +02:00
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020 
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2020-06-11 13:21:58 +03:00
Capostrophic
91514aed5d Don't deliberately do redundant assignments 2020-06-09 22:08:43 +03:00
Capostrophic
1c50d25853 Minor shader fixes 
Don't initialize uniform bool to false explicitly
Attempt not to calculate specular lighting if the material specular color is black
 2020-06-09 15:27:38 +03:00
David Cernat
62df188fd4 Add OpenMW commits up to 16 May 2020 
# Conflicts:
#	CI/before_script.linux.sh
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwscript/globalscripts.cpp
#	apps/openmw/mwscript/interpretercontext.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/cellstore.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
#	components/interpreter/context.hpp
 2020-06-06 22:38:28 +03:00
Capostrophic
58d78fb126 Always pass the vertex color to the fragment shader 2020-05-12 18:28:07 +03:00
Capostrophic
c0b322b264 Improve color mode handling in shaders 2020-05-09 16:15:10 +03:00
David Cernat
053a5a6258 Add OpenMW commits up to 9 May 2020 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
 2020-05-09 15:17:04 +03:00
psi29a
b72720f357 Merge branch 'shadow-transparency-rework' into 'master' 
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
 2020-05-08 21:32:16 +00:00
Bret Curtis
aaa8990006
Merge pull request #2799 from Capostrophic/simplewaterfog 
Fix simple water with radial fog enabled
 2020-05-08 20:48:04 +02:00
Sisah
b19f53aab6 Fix parallax and specular for android 2020-05-08 15:55:22 +02:00
fredzio
947f3cf13c Optionally change color of keywords in the dialogue window based on the 
next answer:
- if the answer was already heard, apply "color topic exhaused" setting
- if the answer was never heard, and the current actor is specified in
the dialog, apply "color topic specific"
- otherwise, do nothing special
 2020-05-02 01:42:05 +02:00
elsid
b150d681a9
Update same navmesh tile with limited frequency 2020-05-01 18:05:58 +02:00
Bret Curtis
5f0f2f0f16 rename to better reflect what is going on per AnyOldName3 comment; added none option 2020-05-01 00:34:31 +02:00
Bret Curtis
aca223f6c8 fix unrelated rst issue; rename to bounds 2020-04-30 17:41:26 +02:00
Bret Curtis
980525cba4 better said 2020-04-29 17:08:12 +02:00
Bret Curtis
ae729a1ac7 add ability to set the type of near far method to be used in shadow calculation; default to bounding volumes; cleaned up code while there and re-ordered items 2020-04-29 16:36:48 +02:00
Bret Curtis
3ba77b933a "compute tight scene bounds" reset back to true until it is decided how best to handle this in settings 2020-04-27 08:45:52 +02:00
bzzt
dc33eeadf1 tightscenebound is uncessary after water bbfix 2020-04-27 08:42:46 +02:00
David Cernat
a20f8e77dc Add OpenMW commits up to 25 Apr 2020 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
 2020-04-25 09:52:58 +03:00
Capostrophic
688e804548 Fix simple water with radial fog enabled 2020-04-24 13:52:53 +03:00
AnyOldName3
53b9b41159 Rely on existing alpha test for non-blended shadow casting 2020-04-21 18:18:55 +01:00
Capostrophic
bbf6b4e517 Don't radialize underwater fog 2020-04-18 12:30:59 +03:00
Capostrophic
36d82abafd Make book layer have lower priority than the layer for other GUI windows 2020-04-13 21:09:06 +03:00
David Cernat
25a632c650 Add OpenMW commits up to 13 Apr 2020 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
 2020-04-13 19:53:42 +03:00
AnyOldName3
12044a607b Only alpha-test shadows when necessary 
Previously we always discarded shadow map fragments if the alpha channel of the output would have been low, but there were some (modded) assets that have non-one alpha but have testing or blending disabled so end up opaque anyway. This lets the shadows of those objects match.
 2020-04-10 15:45:37 +01:00
Bret Curtis
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream 
add launchable type
 2020-04-05 10:05:20 +02:00
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
 2020-04-01 19:24:11 +03:00
Andrei Kortunov
e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 2020-04-01 19:57:04 +04:00
Bret Curtis
deac2abc0f add launchable type; rename files to be conform to freedesktop.org and debian standards 2020-03-27 08:12:06 +01:00
Andrei Kortunov
9d254aefb3
Merge pull request #2731 from Capostrophic/gender 
Fix Gender column filtering (bug #4601)
 2020-03-23 17:27:41 +04:00
Capostrophic
18bfc6f2c5 Fix Gender column filtering (bug #4601) and correct filter descs 2020-03-22 22:09:38 +03:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
fredzio
e1b5dd97b8 Add a filter in the alchemy window. 
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.

The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
 2020-03-20 06:35:57 +01:00
Alexei Dobrohotov
e80fbf4786
Merge pull request #2721 from akortunov/radial_fog 
Support for radial fog
 2020-03-17 22:35:10 +03:00
Andrei Kortunov
02444add2a Support for radial fog (feature #4708) 2020-03-17 23:09:28 +04:00
elsid
7ae7cb181d
Support recast mesh rendering 2020-03-14 09:38:24 +01:00
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00