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

16966 commits

Author SHA1 Message Date
Mads Buvik Sandvei
4e720afbd9 Better management of orientation. You should now be able to pitch and roll freely with no awkward limitations. 2020-11-01 17:17:40 +01:00
Mads Buvik Sandvei
77ab249d06 Global setting for vr mode 2020-11-01 15:50:59 +01:00
Mads Buvik Sandvei
4a42a299d8 Fixed implicit cast warnings 2020-11-01 15:47:45 +01:00
Mads Buvik Sandvei
f762088651 Use Constants::UnitsPerMeter instead of rolling my own value. 2020-11-01 15:45:14 +01:00
psi29a
ba3aad31c1 Merge branch 'hitdebug' into 'master' 
Visualize hits in the debug overlay

See merge request OpenMW/openmw!379
 2020-11-01 10:20:14 +00:00
psi29a
7ee7041399 Merge branch 'stretch' into 'master' 
Put a stretch menu background checkbox into the launcher (#5672)

Closes #5672

See merge request OpenMW/openmw!387
 2020-11-01 09:26:19 +00:00
Alexei Dobrohotov
f49bf028b9 Put a stretch menu background checkbox into the launcher (#5672) 2020-11-01 02:14:25 +03:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace 
Use emplace_back instead of push_back
 2020-11-01 01:58:56 +03:00
Mads Buvik Sandvei
010fc13b91 Refer to !6 2020-10-31 09:03:01 +01:00
Christoph Haag
b54e77a667 fix openmw non-vr build 
../apps/openmw/mwphysics/movementsolver.cpp: In static member function ‘static void MWPhysics::MovementSolver::move(MWPhysics::ActorFrameData&, float, const btCollisionWorld*, MWPhysics::WorldFrameData&)’:
../apps/openmw/mwphysics/movementsolver.cpp:98:52: error: ‘getPlayer’ is not a member of ‘MWMechanics’
   98 |         const bool isPlayer = (ptr == MWMechanics::getPlayer());
      |                                                    ^~~~~~~~~
 2020-10-30 23:29:24 +00:00
fredzio
4876969153 Use the PhysicsSystem::movementQueue instead of a serie of 
setPosition(getPosition() + diff) to move actor in scripts.
With background physics, this is very slightly off with the collision
object position.
When the script run long enough (a few dozen frames for instance),
the accumulated error becomes too big. It make actors fall through lifts floors.
 2020-10-30 23:59:09 +01:00
Evil Eye
7065282127 Save and load container records; fixes #5668 2020-10-29 13:55:24 +01:00
Andrei Kortunov
64ba81ecf2 Fix some issues, found by CoverityScan 2020-10-28 18:02:31 +04:00
Mads Buvik Sandvei
c1e6b05555 Wrote a meta menu for accessibility on VR controllers with few keys. 2020-10-27 20:45:41 +01:00
psi29a
8f68f08aee Merge branch 'moonmoon' into 'master' 
Change moon phase to an enum class

See merge request OpenMW/openmw!381
 2020-10-27 19:44:30 +00:00
Evil Eye
3bf5247c0b remove forward declaration 2020-10-27 19:23:07 +01:00
Alexei Dobrohotov
9763995892 Fix regression #5666 2020-10-27 18:08:14 +03:00
psi29a
74dfc09e2d Merge branch 'removeitem' into 'master' 
Fix remove item regression

Closes #5663

See merge request OpenMW/openmw!380
 2020-10-26 23:13:35 +00:00
Evil Eye
2c4cafa41a Change moon phase to an enum class 2020-10-26 22:16:31 +01:00
Evil Eye
0512a574e8 Fix remove item regression 2020-10-26 20:13:24 +01:00
psi29a
f6e4c7cb42 Merge branch 'regionsounds' into 'master' 
Fix region sounds

See merge request OpenMW/openmw!370
 2020-10-26 16:29:45 +00:00
fredzio
e8c0a7bec0 Visualie projectile hits 2020-10-26 13:53:36 +01:00
Frederic Chardon
574ccbf7bd Visualize hand to hand hits 2020-10-26 13:48:15 +01:00
fredzio
435b2e37f8 Allow to display collision points in the debug viewer 2020-10-26 13:42:46 +01:00
Bret Curtis
4032b754e4 set minimal boost version; remove #ifdef boost version checks 2020-10-25 22:43:10 +01:00
Mads Buvik Sandvei
5ffd884b14 Loading screen should now be visible. 2020-10-25 17:02:25 +01:00
unknown
eae9eafb8c Merge branch 'master' of gitlab.com:OpenMW/openmw into regionsounds 2020-10-25 14:13:14 +01:00
unknown
eebb320916 Wait for the previous sound to stop 2020-10-25 12:20:14 +01:00
Bret Curtis
f6bead88a9 purge boost/optional.hpp headers 2020-10-25 00:58:44 +02:00
Bret Curtis
62b0781f7d use std::optional instead of boost::optional 2020-10-25 00:33:41 +02:00
Mads Buvik Sandvei
fdea94d84e Fixed crash when taking screenshots -> crash during save game 2020-10-24 22:42:34 +02:00
psi29a
957a1425d1 Merge branch 'cleanup_1' into 'master' 
Cleanup 1

See merge request OpenMW/openmw!365
 2020-10-24 18:43:03 +00:00
unknown
1ce296aa7f Use fallback values for region sounds and fix probability 2020-10-24 18:54:46 +02:00
Bret Curtis
259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs 
Strip the plugin index when looking for deleted refs.
 2020-10-23 21:51:53 +02:00
Nelsson Huotari
b1ea9f6a5b Strip the plugin index from refid completely 2020-10-23 20:21:34 +03:00
psi29a
6534bc9b74 Merge branch 'config-fixes' into 'master' 
Config fixes

See merge request OpenMW/openmw!367
 2020-10-23 16:40:18 +00:00
AnyOldName3
538314b03a Make path settings have path type 2020-10-23 15:34:41 +01:00
Alexei Dobrohotov
129bd51672 Add compressed BSA support to bsatool 2020-10-23 14:04:21 +03:00
AnyOldName3
8b28b6e55e Compose BSA, context and script blacklist lists 
These would only take their value from the highest priority source, so
specifying `openmw --content anExtraEsp.esp` would override all the
content files in the user cfg file, and the user cfg file would override
any in the global/local one.
 2020-10-23 01:58:43 +01:00
AnyOldName3
cf81f1bbb7 Make composing variables compose in the expected order 2020-10-23 01:41:28 +01:00
Bret Curtis
5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
AnyOldName3
651a5a27f6 Fix inconsistent indentation 
This has been irritating me for years.
 2020-10-22 21:44:47 +01:00
Mads Buvik Sandvei
a86e5a0b67 Merge branch 'openxr_vr' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-10-22 20:40:27 +02:00
Mads Buvik Sandvei
4f8f0cc8ac Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-10-22 20:39:53 +02:00
Bret Curtis
43614e2204
Merge pull request #3021 from akortunov/warnfix 
Do not use deprecated Qt functions
 2020-10-22 17:17:13 +02:00
psi29a
fa1765816f Merge branch 'somecpp17' into 'master' 
C++17 cosmetics

See merge request OpenMW/openmw!357
 2020-10-22 13:06:15 +00:00
Andrei Kortunov
46a1950b0e Do not use deprecated Qt functions 2020-10-22 15:50:47 +04:00
fredzio
a19db73eca Fix bad rebase 2020-10-22 09:24:56 +02:00
fredzio
1357bba0a0 Use some C++17 where it makes the code more readable 
Also replace boost::optional
 2020-10-22 07:15:16 +02:00
fredzio
4fc5b6f6f4 Sort headers 2020-10-22 07:15:16 +02:00
fredzio
212b293803 Use same parameter name in definition and declaration 2020-10-22 07:15:16 +02:00
Alexei Dobrohotov
f1b7cd5404 Don't reset temporarily hidden container window 2020-10-22 02:12:31 +03:00
psi29a
4ae504970f Merge branch 'blocking' into 'master' 
Fix lower body blocking animation priority (bug #5656)

Closes #5656

See merge request OpenMW/openmw!359
 2020-10-21 22:32:24 +00:00
psi29a
7f59751946 Merge branch 'standing' into 'master' 
Fix standing actors logic

See merge request OpenMW/openmw!360
 2020-10-21 22:31:01 +00:00
Mads Buvik Sandvei
bf9edec4ce Merge branch 'index-controller-support-v2' into 'openxr_vr' 
Update bindings for Valve Index controllers

See merge request madsbuvi/openmw!3
 2020-10-21 21:02:50 +00:00
Mads Buvik Sandvei
4c4fc0c69a Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera. 2020-10-21 21:34:47 +02:00
fredzio
2916a9462e Fix standing actors logic: 
it is updated in the solver only if the actor is standing on
"something". The ground is not "something", so in case the actor goes
from standing on an object to the standing on the ground, this change was not taken
into account.
Clear the value before the simulation to solve this problem.
 2020-10-21 21:32:06 +02:00
Alexei Dobrohotov
2972033a72 Merge branch 'thelevelling' into 'master' 
Allow adding levelled lists using AddItem

Closes #2404

See merge request OpenMW/openmw!358
 2020-10-21 16:53:46 +00:00
Alexei Dobrohotov
7da8479d25 Fix lower body blocking animation priority (bug #5656) 2020-10-21 19:35:01 +03:00
Evil Eye
bdcd2bc802 Allow adding levelled lists with AddItem 2020-10-21 17:21:28 +02:00
Dean Allen
ac00ce7a13 Update bindings for Valve Index controllers 2020-10-21 00:45:15 -07:00
Bret Curtis
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal 
Add support for service-specific refusals
 2020-10-21 00:29:19 +02:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
Evil Eye
f62905eb0a remove redundant argument 2020-10-20 21:04:35 +02:00
psi29a
09373a757d Merge branch 'radioactive' into 'master' 
Container base record mutations

See merge request OpenMW/openmw!353

(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)

275908a0 mutate container base records
16fca11d add changelog entry
 2020-10-20 16:56:22 +00:00
Andrei Kortunov
6c591c190b Add support for service-specific refusals (feature #5580) 2020-10-20 18:58:26 +04:00
fredzio
a036183248 Use a much simpler and assert-free check for Bullet multithreading support 2020-10-19 21:31:52 +02:00
Mads Buvik Sandvei
ea9303e1c6 Deleted deprecated setting 'use steady clock'. Moved debug related settings to a separate [VR Debug] category. 2020-10-19 18:21:05 +02:00
Nelsson Huotari
fb4250a2b7 Strip the plugin index when looking for deleted refs. 2020-10-19 15:02:10 +03:00
Mads Buvik Sandvei
6425749b7e More accurate interpretation of openxr session states 2020-10-18 14:22:03 +02:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
psi29a
4adc689c7a Merge branch 'summoncrash' into 'master' 
Avoid summon spawn if actor isn't in a cell (bug #5644)

See merge request OpenMW/openmw!351
 2020-10-18 00:35:35 +00:00
Alexei Dobrohotov
f90e403bc1 Avoid summon spawn if actor isn't in a cell (bug #5644) 2020-10-18 01:42:32 +03:00
psi29a
f513ee1f1d Merge branch 'configurable_turning_delay' into 'master' 
Makes the delay of turning while run configurable (part of "smooth movement")

See merge request OpenMW/openmw!349
 2020-10-17 20:21:02 +00:00
psi29a
9d350ec824 Merge branch 'head_bobbing' into 'master' 
Add head bobbing in first person mode

Closes #5043

See merge request OpenMW/openmw!320
 2020-10-17 19:54:34 +00:00
Mads Buvik Sandvei
cf20faff21 Option to make use of XR_EXT_debug_utils if available 2020-10-17 21:11:31 +02:00
Petr Mikheev
9ec6fce446 Makes the delay of turning while run configurable (part of "smooth movement"). 2020-10-17 16:11:22 +02:00
Petr Mikheev
c72199155c Use full speed in the "NPCs give way" maneuver. 2020-10-17 15:33:23 +02:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides 
Mark overrided methods as overrides
 2020-10-17 13:32:08 +02:00
Mads Buvik Sandvei
c3a312f80d Squashed commit of the following: 
commit d8564b8e501c98fa2e3cde582b8d06d7c78ba6ce
Author: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date:   Fri Oct 16 23:43:39 2020 +0200

    bad assignment

commit 84f66e4bf1050ce8a316a27f8b10dc2243e35406
Author: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date:   Fri Oct 16 21:08:27 2020 +0200

    Removed the approach of abstracting xr paths with enums. It is not turning out to be useful. Use the explicit paths instead. Added some default bindings for most currently available controllers, except the xbox controller.

commit ae525d0a239c087a7344528634a078e0812af66d
Author: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date:   Fri Oct 16 21:05:37 2020 +0200

    Cleaned up openxr extensions code. Upgraded openxr to version 1.0.12 to enable support for certain controllers.

commit 2d71a5ecbf699c59f1fcdbebcad867fd28552929
Author: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date:   Thu Sep 24 22:18:25 2020 +0200

    simple_controller
 2020-10-17 12:33:46 +02:00
AnyOldName3
df178ed97c Merge branch 'container-regressions' into 'master' 
Fix container regressions

See merge request OpenMW/openmw!346

(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)

95e7a22d fix container regressions
 2020-10-16 22:55:10 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
fredzio
978af12c2d Restore fall damage 2020-10-16 19:30:03 +02:00
psi29a
c16fa27407 Merge branch 'async-physics' into 'master' 
Async physics

See merge request OpenMW/openmw!248
 2020-10-15 08:34:26 +00: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
fredzio
91b3926a49 We need to update the collision world after each step. 
Change order of traversal simulation step to make it rare enough to be parallelizable

Before:
for actor in actors:
    repeat numstep:
        solve(actor)
After:
repeat numstep:
    for actor in actors:
        solve(actor)

Introduce struct ActorFrameData to pack all data that is necessary for
the solver
 2020-10-15 06:41:22 +02:00
fredzio
d76cc5d0a9 Make the Object class manage its collision object and position. 2020-10-15 06:41:16 +02:00
fredzio
4ef36973fb Make the Actor class manage its collision object and position. 2020-10-15 06:41:08 +02:00
fredzio
82da2045a9 Non functionnal changes in preparation for async physics feature 2020-10-15 06:41:03 +02:00
Bret Curtis
425fa837d1
Merge pull request #3012 from akortunov/container_crash 
Fix crash on saving
 2020-10-14 12:43:31 +02:00
Andrei Kortunov
c3d84b2c7c Ability to attach arrows to shooter's hands (feature #5642) 2020-10-14 10:07:42 +04:00
Andrei Kortunov
8e647aa72a Fix crash on saving 2020-10-14 09:16:01 +04:00
Assumeru
72549651e0
Rework container resolution (#3006) 
* Rework container resolution

* add optional argument to getCount

* remove now-redundant changes

* undo worldimp changes

* move save-fixing code to InventoryState

* replace Rng instances with Seeds
 2020-10-13 17:46:32 +02:00
Bret Curtis
c99be77a32
Merge pull request #3008 from akortunov/strings 
Rework fixed strings handling
 2020-10-13 17:37:48 +02:00
Petr Mikheev
15078f5b3c Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat" 2020-10-10 23:06:43 +02:00
Alexei Dobrohotov
1842f546c3 Restore empty target check in spell absorption 2020-10-10 14:27:52 +03:00
Alexei Dobrohotov
e930251d92 Merge branch 'godmode' into 'master' 
Add many more godmode checks to harmful magic (bug #5633)

Closes #4264

See merge request OpenMW/openmw!336
 2020-10-09 22:09:46 +00:00
Alexei Dobrohotov
0e8c5c5034 Merge branch 'avoid_collision_update' into 'master' 
Update logic of "NPCs avoid collisions"

See merge request OpenMW/openmw!318
 2020-10-09 18:43:43 +00:00
Alexei Dobrohotov
b85875a354 Ignore Burden effect in god mode 2020-10-09 21:34:39 +03:00
Alexei Dobrohotov
39678c74bf Add many more godmode checks to harmful magic (bug #5633) 2020-10-09 20:36:51 +03:00
Alexei Dobrohotov
0dcb8c6b69 Fix pick/probe uses decrement 2020-10-09 19:20:50 +03:00
Alexei Dobrohotov
ec825b2510 Fix RayCastingResult warning 2020-10-08 22:44:46 +03:00
Mads Buvik Sandvei
70e8e818b6 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into multiview_test_branch 2020-10-08 19:28:51 +02:00
Mads Buvik Sandvei
189fc51811 ref_ptr > unique_ptr 2020-10-08 18:46:52 +02:00
Petr Mikheev
be27b51279 Add head bobbing in first person mode 2020-10-08 00:22:01 +02:00
psi29a
bca698d951 Merge branch 'shader_line_numbering' into 'master' 
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
 2020-10-07 07:16:45 +00:00
AnyOldName3
c9e3db40a1 Merge branch 'multi-config-build' into 'master' 
Add support for multi configurations generators on unix

See merge request OpenMW/openmw!198
 2020-10-06 14:02:04 +00:00
Andrei Kortunov
822764d0fa Rework fixed strings handling 2020-10-05 21:52:22 +04:00
Alexei Dobrohotov
29ccb09da5 Introduce some extended NIF definitions 2020-10-04 13:18:56 +03:00
Petr Mikheev
2835ea1e21 Update logic of "NPCs avoid collisions" 2020-10-03 22:58:00 +02:00
Charles Calhoun
14aacb81c5 Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation. 2020-10-03 20:05:17 +00:00
Mads Buvik Sandvei
d5450a7d88 Correctly resetting line numbering during shader processing. 2020-10-03 14:22:34 +02:00
psi29a
3040b3b2b6 Merge branch 'issue-5588' into 'master' 
Prevent empty right page of journal having invisible topics (Fixes #5588)

Closes #5588

See merge request OpenMW/openmw!310
 2020-10-03 10:55:44 +00:00
Kyle Shrader
845049a166 Prevent empty right page of journal having invisible topics (Fixes #5588) 2020-10-03 10:55:44 +00:00
AnyOldName3
9e78f3d936 Skip raycasting for zero-length rays 
Rays with no length can't intersect anything. This also prevents an
assertion triggering with Bullet built in Debug mode.
 2020-10-03 02:19:38 +01:00
psi29a
aa4e6c448b Merge branch 'spellabsorption' into 'master' 
Support enchantment absorption

See merge request OpenMW/openmw!307
 2020-09-29 15:27:52 +00:00
psi29a
d9dafbe45b Merge branch 'master' into 'uses' 
# Conflicts:
#   CHANGELOG.md
 2020-09-29 08:20:50 +00:00
psi29a
0438d9d5bb Merge branch 'enchanting' into 'master' 
Reset enchant effects displayed range when they are constant (bug #5603)

See merge request OpenMW/openmw!309
 2020-09-28 17:18:29 +00:00
psi29a
ad1021721f Merge branch 'master' into 'rotation' 
# Conflicts:
#   CHANGELOG.md
 2020-09-28 17:09:50 +00:00
Alexei Dobrohotov
f2af957647 Reset enchant effects displayed range when they are constant (bug #5603) 2020-09-25 02:13:57 +03:00
Alexei Dobrohotov
e0a5c24afe Handle 0-use items like vanilla (bug #5611) 2020-09-25 00:20:25 +03:00
AnyOldName3
73708a6f2a Install openmw-cs.cfg on single-config generators and from the right directory on multi-config 2020-09-23 20:00:32 +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
ad51a4be2e Changes in head tracking and greetings for "smooth movement". 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
79a72e4b44 Slightly modify aicombat to make it more difficult to get around an enemy. The difference is visible only if turning is slow (i.e. if smooth movement enabled). 2020-09-22 22:50:44 +02:00
Petr Mikheev
6a75942907 Fix CharacterController::setAttackTypeBasedOnMovement 2020-09-22 22:50:44 +02:00
Petr Mikheev
bd6b984022 Smoothing speed in CharacterController 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
Alexei Dobrohotov
f8389c6c37 Support enchantment absorption 2020-09-22 00:33:27 +03:00
Alexei Dobrohotov
387bda5e22 Add inverse order rotation support to SetAngle (feature #5579) 2020-09-21 22:27:01 +03:00
Andrei Kortunov
7d776609c8 Fix unsugned/signed comparison warning 2020-09-21 10:36:01 +04:00
Bret Curtis
dd7e964baf
Merge pull request #2999 from akortunov/spellfix 
Apply effects during rest before fast-forwarding spells state
 2020-09-20 14:47:37 +02:00
psi29a
22c3588d0d Merge branch '4771-and-4631' into 'master' 
Try lower MSAA level if the requested value isn't available

Closes #4471 and #4631

See merge request OpenMW/openmw!297

(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)

da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
 2020-09-20 12:35:26 +00:00
psi29a
b4ccd2658a Merge branch 'khr_debug' into 'master' 
Khr debug

See merge request OpenMW/openmw!302
 2020-09-20 12:14:57 +00:00
Bret Curtis
8f07b7e076
Merge pull request #3005 from Assumeru/dont-search-containers 
Don't search containers
 2020-09-20 11:48:26 +02:00
AnyOldName3
3f61ff3a44 Make OpenGL debugging optional 2020-09-19 23:30:34 +01:00
AnyOldName3
441c09578a Merge remote-tracking branch 'origin/khr_debug' into khr_debug 2020-09-19 23:09:11 +01:00
Mads Buvik Sandvei
8a6738469e Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into multiview_test_branch 2020-09-19 20:58:07 +02:00
Mads Buvik Sandvei
2952463112 Configurability. Brute force option. 2020-09-19 20:55:06 +02:00
Evil Eye
fe82cd9f92 Don't search containers 2020-09-15 21:13:18 +02:00
Petr Mikheev
874c754b68 Fix #5557 2020-09-15 20:24:16 +02:00
Mads Buvik Sandvei
9c171869cb Geometry shader stereo functional 2020-09-14 22:17:07 +02:00
tessa
58b5249e8b fix typo in terrainstorage.hpp 2020-09-13 10:46:27 -05:00
Bret Curtis
673f0f4f77
Merge pull request #3003 from akortunov/min_cost 
Set a minimum 1gp cost for services
 2020-09-08 17:00:49 +02:00
Andrei Kortunov
753ca91556 Set a minimum 1gp cost for services (regression #5600) 2020-09-08 17:04:31 +04:00
AnyOldName3
ffed6acc49 Merge branch 'patch-1' into 'master' 
force static data variance for water geometry

See merge request OpenMW/openmw!294
 2020-09-07 22:32:00 +00:00
Alexei Dobrohotov
99ab629a03
Merge pull request #2995 from akortunov/arrows 
Improve ammo resetting
 2020-09-06 13:30:55 +03:00
Mads Buvik Sandvei
2d021430b8 force static data variance for water geometry 2020-09-05 11:52:52 +00:00