mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-26 14:56:39 +00:00
Code Issues Releases Wiki Activity
26855 commits 115 branches 75 tags 128 MiB
Commit graph

26855 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
1332e57195 Merge branch 'outside_means_outside' into 'master' 
Make StayOutside only block teleportation from exteriors to interiors

Closes #6323

See merge request OpenMW/openmw!1268
 2021-10-08 06:46:42 +00:00
psi29a
88d5b4a90b Merge branch 'variable_function' into 'master' 
Parse local variables sharing a name with a function as variables

Closes #6291

See merge request OpenMW/openmw!1269
 2021-10-08 06:45:02 +00:00
psi29a
fc7e13d76a Merge branch 'omwaddon_dep' into 'master' 
Allow creating omwaddons without a dependency on an omwgame

See merge request OpenMW/openmw!1243
 2021-10-08 06:40:43 +00:00
Evil Eye
caafd0c667 Remove CE enchantments before saving stats when turning into a werewolf 2021-10-07 21:09:43 +02:00
psi29a
1f62fd3b56 Merge branch 'Fix_Keyword_Report_to_caius' into 'master' 
Fix keyword search when the keyword is preceded by a non whitespace non alpha character

Closes #6308

See merge request OpenMW/openmw!1266
 2021-10-07 13:26:40 +00:00
florent teppe
e5abadc234 Fix keyword search when the keyword is preceded by a non whitespace non alpha character 2021-10-07 13:26:40 +00:00
Bret Curtis
8d37d79d6c
Merge pull request #3154 from bosvensson1/patch-29 
improves RemoveRedundantNodesVisitor performance for large children vectors
 2021-10-07 15:00:38 +02:00
Bret Curtis
bf85745931
Merge pull request #3153 from bosvensson1/patch-27 
With this PR we fix a warning from coverity-ci triggered by inconsistent nullptr checks.
 2021-10-07 12:28:28 +02:00
psi29a
555224a0fb Merge branch 'fixes' into 'master' 
Make compilers happy and fix the changelog

See merge request OpenMW/openmw!1260
 2021-10-07 10:17:27 +00:00
Bo Svensson
08608da62c
optimizer.cpp 2021-10-07 08:29:38 +00:00
Evil Eye
5037def3b3 Parse local variables sharing a name with a function as variables 2021-10-06 21:27:08 +02:00
Evil Eye
dfc72e9b7e Make StayOutside only block teleportation from exteriors to interiors 2021-10-06 18:25:28 +02:00
Evil Eye
a1825980c4 Define OpenMW specific C++ flags 2021-10-06 17:28:48 +02:00
Evil Eye
7540265432 Fix regression #6328 2021-10-06 17:14:00 +02:00
Bo Svensson
87d52dc1fd
fixes coverity-ci warning 2021-10-06 10:04:03 +00:00
Bo Svensson
cd4d76f8c5
discard off-screen lights (#3120) 
Currently, we run culling tests against all lights in the scene during LightListCallback::pushLightState. We can avoid most of these tests by removing off-screen lights at an earlier stage. We should benchmark the cumulative time spent within LightListCallback::pushLightState before and after this PR.
 2021-10-06 11:53:24 +02:00
Bo Svensson
787f91211d resets state updater to apply light settings (#3141) 
resets state updater to apply light settings

With this PR we achieve the same effect with fewer lines of code.
 2021-10-06 11:21:30 +02:00
psi29a
c3f5e8f968 Merge branch 'lua_transform' into 'master' 
3D transforms in Lua

See merge request OpenMW/openmw!1235
 2021-10-06 09:21:21 +00:00
Bret Curtis
e581b61ecb check if FORCE_OPAQUE is available before using it. 2021-10-06 08:05:10 +02:00
elsid
035307b012
Add tests for openmw options 
In attempt to document current behaviour. Add commented out checks as desired
behaviour.
 2021-10-05 22:51:12 +02:00
Kindi
ce54edf011 Update tradewindow.cpp 
Additional check
 2021-10-05 18:00:53 +00:00
Bret Curtis
40f18d6a8b
Update cmake.yml to modify cxxflags (#3151) 
Use the same CXXFLAGS in Github Pipelines as we do in Gitlab Pipelines
 2021-10-05 16:39:50 +02:00
Bo Svensson
442a0e8434
avoids two transforms in sky.cpp (#3150) 
As we discovered in #3148, `Transform` nodes and their low level equivalence `pushModelViewMatrix` are somewhat costly involving a `Matrix::invert` operation per frame.

With this PR we avoid one `Transform` node for sun flashes and avoid another `pushModelViewMatrix` call in case the sun is fully visible.
 2021-10-05 16:00:30 +02:00
fredzio
3b174d72d8 Introduce 3 scoped mutex wrappers to allow to conditionally skip taking 
mutexes in synchronous case.
 2021-10-05 15:52:27 +02:00
fredzio
21dbe314bf Use common function for sync and async case. Now both cases follow the 
same flow, synchronous simulation is just a special case.
 2021-10-05 15:44:20 +02:00
Frederic Chardon
499b161e7b Merge handleFall() and updateMechanics() into updateActor(). It remove gratuitious differences between sync and async cases. Also, it will make the after simulation update logic easier to follow when projectiles move into the simulation thread. 2021-10-05 15:44:20 +02:00
Bret Curtis
0d1d3e67bc
Merge pull request #3149 from bosvensson1/patch-24 
With this PR we fix a -Wreorder warning.
 2021-10-05 15:07:02 +02:00
Bo Svensson
4b1c009ffd
use StateSet define for translucentFramebuffer (#3138) 
With this PR we test out osg's shader define system for a somewhat harmless feature. As we can see, our code becomes more concise and efficient in this case. Most importantly, we no longer create unneeded vertex shader objects.
 2021-10-05 14:37:08 +02:00
Bo Svensson
b2af81bc18
converts remaining osg::NodeCallback (#3147) 
With this PR we convert remaining instantiations of the deprecated osg::NodeCallback in Open MW to SceneUtil::NodeCallback.
 2021-10-05 14:21:12 +02:00
Bo Svensson
9f58616aa0
fixes -Wreorder warning 2021-10-05 12:02:49 +00:00
Bo Svensson
8e9851c97c
npcanimation.cpp (#3148) 2021-10-05 13:52:19 +02:00
Kindi
4ce8c1e1ab Update AUTHORS.md 2021-10-04 20:54:28 +00:00
Kindi
2a1cb939ba Update CHANGELOG.md 2021-10-04 20:50:40 +00:00
Kindi
d9b254178f Update tradewindow.hpp 
remover redundant
 2021-10-04 20:47:45 +00:00
Kindi
f28d6738bf Update tradewindow.cpp 2021-10-04 20:44:56 +00:00
Bo Svensson
3f731cd102
attempts to fix spellcasting freezes (#3146) 
Firstly, this PR reintroduces commit "Recreate a special case for IntersectionVisitor on QuadTreeWorld" we forgot to reapply while reverting a revert commit. Secondly, in cases we still need to build a view for an intersection visitor, we now use the available `osgUtil::IntersectionVisitor::getReferenceEyePoint` instead of falling back to the origin position that was previously causing long rebuild times.
 2021-10-04 22:00:31 +02:00
Bo Svensson
14d15dcfac
cleans up osgacontroller.cpp (#3142) 
`handle_stateset` is not needed because `UpdateMatrixTransform` is a `NodeCallback` only allowed to be set on a `Node`. `Geode` and `Drawable` do not need explicit logic because they are both derived from `Node`.
 2021-10-04 12:20:33 +02:00
Bo Svensson
e4a9eefc2a
uses a bitfield in refdata.hpp (#3143) 
* uses a bitfield in refdata.hpp

With this simple change we pack boolean values to reduce the memory requirements of game objects.

* refdata.hpp [ci skip]

* refdata.cpp
 2021-10-04 12:12:00 +02:00
Andrei Kortunov
61168c3583
Add missing changelog entries for 0.47 (#3145) 2021-10-04 11:12:54 +02:00
Bo Svensson
aaf7b423d6
adds a replacement for osg::NodeCallback (#3144) 
* nodecallback.hpp

* lightmanager.hpp

* lightmanager.cpp

* lightmanager.hpp

* nodecallback.hpp

* nodecallback.hpp

* [ci skip]

* lightmanager.hpp

* nodecallback.hpp

* nodecallback.hpp

* lightmanager.cpp

* lightmanager.cpp

* nodecallback.hpp

* [ci skip]

* [ci skip]

* controller.cpp

* [ci skip]

* osgacontroller.cpp

* keyframe.hpp

* controller.hpp

* keyframe.hpp

* [ci skip]

* keyframe.hpp

* animation.hpp

* [ci skip]

* weaponanimation.cpp

* nodecallback.hpp
 2021-10-04 10:56:55 +02:00
Kindi
0c1b78c42a Update tradewindow.cpp curly 2021-10-04 02:16:01 +00:00
kuyondo
071793eeb3 Merge branch 'master' of https://gitlab.com/Kuyondo/openmw 2021-10-04 08:12:56 +08:00
kuyondo
49da33a129 comiit 2021-10-04 08:12:15 +08:00
Evil Eye
d680aa26e9 Disallow switch fallthrough 2021-10-03 21:58:10 +02:00
Evil Eye
686268b2f9 Remove incorrect changelog entries 2021-10-03 21:39:43 +02:00
psi29a
0e07fc38e5 Merge branch 'opencs-ui-tweaks' into 'master' 
Minor UI tweaks all around OpenMW-CS

See merge request OpenMW/openmw!1212
 2021-10-03 19:13:51 +00:00
Matjaž Lamut
1c9f06f742 Minor UI tweaks all around OpenMW-CS 2021-10-03 19:13:51 +00:00
psi29a
1644430bc0 Merge branch 'effective_magic' into 'master' 
Overhaul magic effects

Closes #6087, #5863, #5801, #5621, #5596, #5454, #5207, #5198, #4414, #4297, and #1751

See merge request OpenMW/openmw!1116
 2021-10-01 21:44:42 +00:00
psi29a
2c8c36fe5d Merge branch 'master' into 'effective_magic' 
# Conflicts:
#   CHANGELOG.md
 2021-10-01 21:20:08 +00:00
psi29a
bd866cf210 Merge branch 'fix_infidelities' into 'master' 
Fix Infidelities quest from Tribunal (#6307)

Closes #6307

See merge request OpenMW/openmw!1248
 2021-10-01 21:12:15 +00:00