Alexei Dobrohotov
|
264a6e0269
|
Merge branch 'unbreak_actors_loading' into 'master'
Unbreak floating corpses and spawn
Closes #5735
See merge request OpenMW/openmw!457
|
2020-12-12 18:00:05 +00:00 |
|
fredzio
|
a314f196eb
|
Unconditionally call actor->resetPosition in adjustPosition.
Revert broken change that would force adjust all actors in cell upon
loading. That break floating corpses (and probably others things).
|
2020-12-12 18:17:26 +01:00 |
|
psi29a
|
daf6c9f88f
|
Merge branch 'collisionbox' into 'master'
Make actor collision box components a struct
See merge request OpenMW/openmw!454
|
2020-12-11 22:09:06 +00:00 |
|
Mads Buvik Sandvei
|
d03f55bc2d
|
Basic functions in place. Still bad handling of GUI
|
2020-12-11 18:37:50 +01:00 |
|
Alexei Dobrohotov
|
15291f15d3
|
Make actor collision box components a struct
|
2020-12-11 20:07:59 +03:00 |
|
psi29a
|
11eff02a1d
|
Merge branch 'Show-more-information-about-level-on-menu' into 'master'
Show more information about level on menu
See merge request OpenMW/openmw!437
|
2020-12-11 12:04:15 +00:00 |
|
psi29a
|
9a35c5815e
|
Merge branch 'nofallfloor' into 'master'
Update physics object position after spawning.
See merge request OpenMW/openmw!449
|
2020-12-11 11:28:29 +00:00 |
|
psi29a
|
789d034432
|
Merge branch 'skirts' into 'master'
Editor: Properly reserve body parts for skirts (bug #5731)
Closes #5731
See merge request OpenMW/openmw!452
|
2020-12-11 11:09:32 +00:00 |
|
psi29a
|
acd5109897
|
Merge branch 'dontcopysimulationresults' into 'master'
explicitely use a reference for physics simulation results to avoid a copy
See merge request OpenMW/openmw!450
|
2020-12-11 11:08:46 +00:00 |
|
Frederic Chardon
|
460e5abb55
|
Update physics object position after spawning.
|
2020-12-11 08:57:08 +01:00 |
|
Frederic Chardon
|
899b8422fa
|
explicitely use a reference, auto can't infer it and make a copy
|
2020-12-11 08:56:54 +01:00 |
|
Alexei Dobrohotov
|
32601e0ae4
|
Properly reserve body parts for skirts (bug #5731)
|
2020-12-11 10:39:57 +03:00 |
|
Alexei Dobrohotov
|
1d03b46422
|
Merge branch 'cleanup-improve-scene-colors' into 'master'
[OpenMW-CS][FIX] Clean up PR !442
See merge request OpenMW/openmw!451
|
2020-12-11 02:19:26 +00:00 |
|
Coleman Smith
|
3b9db41346
|
removing unneeded variable
|
2020-12-10 17:03:10 -08:00 |
|
Bret Curtis
|
d35715e5dc
|
add olcoal to authors and feature 5199 to changelog
|
2020-12-10 22:39:54 +01:00 |
|
psi29a
|
d77f122289
|
Merge branch 'gl-5199-improve-scene-colors' into 'master'
[OpenMW-CS] Issue #5199: Improve Scene Colors
See merge request OpenMW/openmw!442
|
2020-12-10 21:36:46 +00:00 |
|
Coleman Smith
|
842ea9d6ed
|
simplifying a bit
- attaching gradient camera directly to the main camera
- using Vec4ub
|
2020-12-10 21:36:46 +00:00 |
|
psi29a
|
c8fa8cfe74
|
Merge branch 'herbalmenu' into 'master'
Add graphic herbalism to the launcher
Closes #5730
See merge request OpenMW/openmw!448
|
2020-12-10 21:31:53 +00:00 |
|
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 |
|