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

24958 commits

This branch
This branch
All branches
Author SHA1 Message Date
fredzio
33eb09f534 Remove unused headers 2020-12-20 18:28:21 +01:00
AnyOldName3
7e045cff75 #include <memory> 2020-12-20 01:51:45 +00:00
AnyOldName3
657da50d99 Ensure GL_BLEND is disabled when drawing shadow maps 2020-12-20 01:36:34 +00:00
AnyOldName3
0e4e8eb0f3 Add glDebugGroup support 2020-12-20 01:22:14 +00:00
AnyOldName3
cc2ce9fa3e Explicitly default-construct array 
The docs seem to imply this is automatic when the array contains a
class-type, which osg::ref_ptr is, but I got a crash log that doesn't
make sense if that's true.
 2020-12-19 21:57:42 +00:00
Alexei Dobrohotov
6b5e614b1a Merge branch 'dont_cache_ptr' into 'master' 
Always use latest actor's Ptr

See merge request OpenMW/openmw!481
 2020-12-19 17:15:43 +00:00
Alexei Dobrohotov
eb6dad1a93 Merge branch 'fixstupidtypo' into 'master' 
Fix misplaced dummies (#5752)

Closes #5752

See merge request OpenMW/openmw!483
 2020-12-19 16:56:30 +00:00
fredzio
e5f0c7f117 Fix a typo introduced in 08e73a09ec 
It closes #5752
 2020-12-19 16:54:50 +01:00
AnyOldName3
6fa315b59e Merge branch 'madsbuvi-master-patch-39387' into 'master' 
Disable MSVC warning 4866

See merge request OpenMW/openmw!480
 2020-12-19 14:27:31 +00:00
Mads Buvik Sandvei
637c76f438 Update CMakeLists.txt 2020-12-19 08:34:36 +00:00
fredzio
93a12fe388 Avoid dynamic_cast when possible. 2020-12-18 23:47:01 +01:00
fredzio
8e084dea2e Don't cache Ptr, it can be updated while the simulation is running. 2020-12-18 22:22:37 +01:00
fredzio
58297ffbf4 Move stats update into their own function. 2020-12-18 21:18:04 +01:00
fredzio
24a8b8c66a Remove redundant call to resetPosition(). adjustPosition() takes care of 
it,
 2020-12-18 21:16:48 +01:00
Mads Buvik Sandvei
a2a462f416 Update CMakeLists.txt to disable MSVC warning 4866 2020-12-18 20:04:24 +00:00
psi29a
a1065c8376 Merge branch 'loadingScreen_initialdrawcallback' into 'master' 
Loading screen initialdrawcallback 4th time's the charm

See merge request OpenMW/openmw!479
 2020-12-18 18:15:14 +00:00
Mads Buvik Sandvei
eec2ba3623 Loading screen initialdrawcallback 4th time's the charm 2020-12-18 18:15:14 +00:00
AnyOldName3
2ecd00b6db Don't accidentally enable alpha testing for all shadow casting 2020-12-18 16:31:21 +00:00
AnyOldName3
264539cd63 Merge branch 'WindowCrashCatcher' into 'master' 
Handle Crashes on Windows

See merge request OpenMW/openmw!455
 2020-12-18 13:41:18 +00:00
psi29a
327df7457b Merge branch 'simulationresultinactor' into 'master' 
Embed physics simulation results inside of actor class.

See merge request OpenMW/openmw!478
 2020-12-18 12:50:20 +00:00
fredzio
4e7c9b6696 Embed physics simulation results inside of actor class. 
This gives finer control over reseting positions (switch off tcl is no
longer glitchy) and solve most of the erroneous usage of stale World::Ptr
indicated by:
"Error in frame: moveTo: object is not in this cell"
 2020-12-18 12:54:02 +01:00
psi29a
d01d5745c6 Merge branch 'relative_move' into 'master' 
Relative translation for scripts

See merge request OpenMW/openmw!477
 2020-12-18 09:23:18 +00:00
psi29a
e586544ade Merge branch 'loadingScreen_initialdrawcallback' into 'master' 
Wait for initialDrawCallback to finish before removing it

See merge request OpenMW/openmw!476
 2020-12-18 08:48:39 +00:00
Mads Buvik Sandvei
ea8f98b339 Wait for initialDrawCallback to finish before removing it 2020-12-18 08:48:39 +00:00
fredzio
7bae6691b6 Introduce World::moveObjectBy() function to translate an object relatively to 
its current position.
Use it in relevant MWScripts opcode (move and moveworld).
Remove the fragile detection of scripted translation from PhysicsTaskScheduler.

No user visible change, just a more robust mechanism.
 2020-12-18 08:40:38 +01:00
AnyOldName3
0b5d5eab4c Move is faster 2020-12-18 02:11:51 +00:00
AnyOldName3
05ad44d0b1 Set correct array size 2020-12-18 01:44:46 +00:00
AnyOldName3
a4f32a469e Work around Nvidia driver bug 
https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.1.20.pdf
Section 4.1.3 says that hexadecimal integer literals are supported, but
Nvidia have never read a specification since their founding, so their
engineers didn't know that hexadecimal integer literals are requires to
be supported to advertise support OpenGL versions with GLSL support.
 2020-12-18 01:36:20 +00:00
AnyOldName3
a080071588 Set default state sensibly 2020-12-18 00:02:51 +00:00
AnyOldName3
691b4d64fe Merge branch 'nigeometry' into 'master' 
Make sure NIFLoader avoids working further with empty geometry

Closes #5751

See merge request OpenMW/openmw!475
 2020-12-17 23:39:37 +00:00
psi29a
96a87b582c Merge branch 'loadingScreen_initialdrawcallback' into 'master' 
Fix for !472 for older versions of OSG

See merge request OpenMW/openmw!474

(cherry picked from commit 35e25d79b9a6c76807084be5ca2584c4fd9b9c35)

4447dd41 osg versions
06f4d63b Preserve callback in older osg version
 2020-12-17 23:37:21 +00:00
Alexei Dobrohotov
8db2ba2b38
Merge pull request #3032 from akortunov/gtest 
Mark mock methods as overrides (requires GTest 1.10)
 2020-12-18 01:46:42 +03:00
Alexei Dobrohotov
46ec40fa92 Make sure NIFLoader avoids working further with empty geometry 2020-12-18 01:22:34 +03:00
AnyOldName3
ce2bcba5d4 Replace deprecated alpha test in shader visitor 2020-12-17 14:57:43 +00:00
AnyOldName3
70bd9d395d Merge branch 'loadingScreen_initialdrawcallback' into 'master' 
Clean up use of initial draw callback in loadingscreen

See merge request OpenMW/openmw!472
 2020-12-16 22:10:03 +00:00
Mads Buvik Sandvei
bc961a13f5 avoid redundant calls to removeInitialDrawCallback 2020-12-16 22:03:16 +01:00
Mads Buvik Sandvei
640420eaaa No longer delete and recreate CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just remove the callback after the traversals. Use addInitialDrawCallback instead of setInitialDrawCallback to avoid messing with existing callbacks. 2020-12-16 21:46:52 +01:00
psi29a
9f81dcbd1a Per request via PM: 
"I would like to request that my name is removed from the teams page as my contributions has all been replaced by better solutions years ago." by vorenon, Manuel Edelmann
 2020-12-16 13:21:00 +00:00
psi29a
14a80d7d9e Merge branch 'niffix' into 'master' 
Turn all NIF records into structs

See merge request OpenMW/openmw!470
 2020-12-16 09:04:14 +00:00
Alexei Dobrohotov
1e6156e04a Turn all NIF records into structs 2020-12-16 01:54:31 +03:00
Alexei Dobrohotov
4490f89a3d Merge branch 'dontcollidewithowncollisionbox' into 'master' 
Don't explode spell mid-air (#5745)

See merge request OpenMW/openmw!468
 2020-12-15 21:50:24 +00:00
fredzio
259d522800 When doing a ray cast to the next projectile position, ignore collisions 
that occurs with the projectile own collision object. Otherwise a magic
bolt can explode "spontaneously".
 2020-12-15 21:34:58 +01:00
psi29a
884b434ee0 Merge branch 'fixfriendlyfire' into 'master' 
Fix projectiles friendly fire (#5744)

See merge request OpenMW/openmw!466
 2020-12-15 15:45:43 +00:00
psi29a
78e85fe011 Merge branch 'this_is_nife' into 'master' 
More NIF stuff

See merge request OpenMW/openmw!461
 2020-12-15 15:43:12 +00:00
psi29a
bc6bcda58f Merge branch 'wizard' into 'master' 
Wizard: fix "file is already opened" warning

See merge request OpenMW/openmw!465
 2020-12-15 15:35:47 +00:00
psi29a
ecdd5f1437 Merge branch 'fixosga' into 'master' 
Fix collada animation issues

See merge request OpenMW/openmw!467
 2020-12-15 15:34:35 +00:00
Nelsson Huotari
8b2bf12e8f Use bip01 for root bone name 2020-12-15 13:51:49 +02:00
Nelsson Huotari
6c1f6169c0 Fix root movement glitch 2020-12-15 13:50:19 +02:00
Nelsson Huotari
3195716a2c Don't force loop textkey 2020-12-15 13:49:25 +02:00
fredzio
b39437dfb6 Don't allow projectiles to stand still when they hit an ally. 
When an NPC fire a projectile, it should affect only its targeted actor.
To this end, after a hit is detected the target is checked against the
list of AI targets and reactivated if necessary.
Problem occurs when the hit occurs as a result of a friendly actor going
into the projectile (detected in ClosestNotMeConvexResultCallback):
while the projectile is inside the friend's collision box, it is
deactivated, just to be immediately reactivated. Effectively, the
projectile does nothing until the actor moves out.

Add a check inside the ClosestNotMeConvexResultCallback before declaring
a hit.
Since the necessary data is not safely accessible from the async thread,
maintain a copy inside the Projectile class.
 2020-12-14 22:23:01 +01:00