psi29a
cfd04fcaec
Merge branch 'recast_test_fix_c17' into 'master'
...
be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float...
See merge request OpenMW/openmw!447
2020-12-10 21:30:05 +00:00
psi29a
7156b11dbc
be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float *') cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
2020-12-10 21:30:05 +00:00
Mads Buvik Sandvei
d125464533
Uninitialized data bugs.
2020-12-10 21:30:54 +01:00
Mads Buvik Sandvei
76fc1a8f84
Stereo now initializes before anything is drawn. Added option to add initial/pre/post draw callbacks to stereo.
2020-12-10 21:29:56 +01:00
Mads Buvik Sandvei
d3d81a98e5
Make VRGUI use shaders
2020-12-10 21:28:20 +01:00
Mads Buvik Sandvei
7c9d2a8095
Fix bad check for frame number. Fixed accidentally duplicated stereo settings section.
2020-12-10 21:27:54 +01:00
Evil Eye
525292b184
Add graphic herbalism to the launcher
2020-12-10 19:02:38 +01:00
psi29a
686692519c
Merge branch 'fix-tests' into 'master'
...
Use correct variable types when loading config for tests
See merge request OpenMW/openmw!446
2020-12-09 21:25:30 +00:00
Mads Buvik Sandvei
b98b4db4c1
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-09 21:11:53 +01:00
Mads Buvik Sandvei
c974e1dde3
Merge remote tracking branch multiview_test_branch
2020-12-09 19:42:15 +01:00
AnyOldName3
15f03ae375
Merge branch 'logging2' into 'master'
...
Print '--version' and '--help' messages without timestamps
Closes #2686
See merge request OpenMW/openmw!444
2020-12-09 16:27:54 +00:00
psi29a
0e5af74a2f
Merge branch 'masterindexloadfix' into 'master'
...
[OpenMW-CS] Load master index from refId to mContentFile
See merge request OpenMW/openmw!445
2020-12-09 10:12:10 +00:00
AnyOldName3
fd4a62ce35
Use correct variable types when loading config for tests
2020-12-09 00:32:01 +00:00
Petr Mikheev
49c6e50c31
Print '--version' and '--help' messages without timestamps
2020-12-08 23:14:49 +01:00
Nelsson Huotari
61a4a0807b
Load master index in refId to mContentFile, keep master index also in mIndex
2020-12-09 00:10:58 +02:00
Mads Buvik Sandvei
1bebe51c29
Make use of shared shadow maps in the brute force method
2020-12-08 21:37:27 +01:00
Mads Buvik Sandvei
5beb0bc799
Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch
2020-12-08 20:50:27 +01:00
Mads Buvik Sandvei
059861f517
Merge remote-tracking branch 'remotes/origin/master' into shared_shadow_maps
2020-12-08 20:49:35 +01:00
Mads Buvik Sandvei
09ed3850af
Merge branch 'multiview_test_branch' of https://gitlab.com/madsbuvi/openmw into multiview_test_branch
2020-12-08 20:14:02 +01:00
Mads Buvik Sandvei
7a023e33ef
Revert pointless shader version bump.
2020-12-08 20:13:42 +01:00
psi29a
afaacedf67
Merge branch 'placeatmecrash' into 'master'
...
Don't crash the game when placing a non-actor
See merge request OpenMW/openmw!443
2020-12-08 17:37:01 +00:00
Evil Eye
39ac0cbb4a
Don't crash the game when placing a non-actor
2020-12-08 17:47:25 +01:00
Chris Djali
21de3fa7e8
Merge pull request #3033 from akortunov/main_messages
...
Use a logging system instead of cout for a couple of missing messages
2020-12-08 15:49:19 +00:00
psi29a
fd64aacf7d
Merge branch 'cliherbalism' into 'master'
...
Add a setting to disable graphical herbalism
See merge request OpenMW/openmw!440
2020-12-08 10:02:15 +00:00
psi29a
8d8a4a890c
Merge branch 'projectiles_collisions_mk2' into 'master'
...
Projectiles collisions
See merge request OpenMW/openmw!369
2020-12-08 09:24:36 +00:00
fredzio
4fbe1ed12c
Ignore caster collision shape. Sometimes the magic bolt get launched
...
inside too near its caster.
2020-12-08 09:06:34 +01:00
fredzio
7e85235220
Projectile to projectile collision
2020-12-08 09:06:34 +01:00
fredzio
66fe3b0d38
Modify projectile collision to work with async physics
2020-12-08 09:06:33 +01:00
Andrei Kortunov
dc7b48e92e
Generate physics collisions for projectiles (bug #3372 )
...
Remove redundant now mHit field
2020-12-08 09:05:38 +01:00
Andrei Kortunov
242dd8d496
Use a logging system instead of cout for a couple of missing messages
2020-12-08 11:06:30 +04:00
Evil Eye
275b9aea4d
rename setting
2020-12-07 21:56:41 +01:00
Evil Eye
e62fff5f2e
Add a setting to disable graphical herbalism
2020-12-07 19:04:32 +01:00
Andrei Kortunov
807367ca3f
Mark mock methods as overrides (requires GTest 1.10)
2020-12-07 19:09:58 +04:00
CedricMocquillon
86c31ded53
Update changelog
2020-12-07 14:57:26 +01:00
CedricMocquillon
2d3d22025a
Avoid height for empty message in AutoSizedTextBox
2020-12-07 14:57:25 +01:00
CedricMocquillon
6bfdf0e57f
Add more information on mouse over level
2020-12-07 14:57:25 +01:00
psi29a
c2933721c6
Merge branch 'explodespell' into 'master'
...
Make AI cast self-targeted spells at the ground (bug #5695 )
Closes #5695
See merge request OpenMW/openmw!426
2020-12-07 12:35:58 +00:00
psi29a
a3dfdde9ef
Merge branch 'move_actors_into_scene' into 'master'
...
Move actors into the scene after a teleport
See merge request OpenMW/openmw!438
2020-12-07 10:19:32 +00:00
psi29a
c742c15f6d
Merge branch 'autogoesbrr' into 'master'
...
Use range based for loops and auto
See merge request OpenMW/openmw!400
2020-12-07 09:12:50 +00:00
psi29a
b22418d053
Merge branch 'fix_spawn' into 'master'
...
Fix spawn #5724
See merge request OpenMW/openmw!439
2020-12-07 08:20:35 +00:00
Mads Buvik Sandvei
01cc9cb848
Update sdlgraphicswindow.cpp
2020-12-06 16:04:45 +00:00
Mads Buvik Sandvei
c870749c39
Merge remote-tracking branch 'remotes/origin/master' into multiview_test_branch
2020-12-06 15:24:12 +01:00
Mads Buvik Sandvei
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-12-06 15:14:53 +01:00
fredzio
c6c02a6f16
Remove useless code. ipos is already initialized with the correct
...
values.
2020-12-06 13:26:43 +01:00
fredzio
08e73a09ec
Make the code more compact by mean of std::min / max and ternary
...
operator.
2020-12-06 13:24:42 +01:00
fredzio
b79f6ac808
Force reset position of actor after snapping to the ground. Otherwise
...
the interpolation calculation would kick in and make the actor goes upward if the
spawn point is higher than summoner or downward if lower. The actor
would then either jump or fall through terrain.
2020-12-06 13:20:37 +01:00
Mads Buvik Sandvei
5148f4ecb0
Fix use of deallocated data.
2020-12-06 12:05:07 +01:00
Mads Buvik Sandvei
c11d6a48e4
Improved logic for selecting swapchain formats, and listed more options.
...
SteamVR and Oculus will now both choose rgba
2020-12-06 12:03:34 +01:00
AnyOldName3
a8ab81cfa3
Merge branch 'logging' into 'master'
...
Add time to logs. Redirect OSG log to OpenMW log.
See merge request OpenMW/openmw!436
2020-12-05 20:44:05 +00:00
Petr Mikheev
5734551ff3
Add time to logs. Redirect OSG log to OpenMW log.
2020-12-05 13:46:02 +01:00
