Chris Robinson
b5ed2e65f8
Add a method to get the sound stream delay
...
This helps avoid a lock during the movie player's read method, since it needs
to sync with the current playback position which would otherwise need to get
the movie decoder's current position.
9 years ago
Chris Robinson
f3c035907c
Rename Sound::update to Sound::applyUpdates
9 years ago
Chris Robinson
9568aa6a84
Use a condition variable to wake up the audio stream thread
...
This should make starting streams a bit more responsive, and allows us to do
more in it that really shouldn't wait for its next wake up.
9 years ago
Chris Robinson
4a078725d4
Play player voices locally
9 years ago
Chris Robinson
449eca4fb4
Properly mark streams as 2D or 3D
9 years ago
Chris Robinson
21bb2e9314
Use a deque for loudness buffers with a map lookup
...
Similar to Sound_Buffer, this allows individual Sound_Loudness objects to
retain a constant pointer when new ones are inserted on to the end.
9 years ago
Chris Robinson
5f8a09df97
Play player sounds (except footsteps) local to the listener
9 years ago
Chris Robinson
82f3651f81
Treat the sound offset as the offset in seconds
9 years ago
Chris Robinson
8b7587f9a6
Track whether a sound is 3D
9 years ago
Chris Robinson
fc912b135f
Avoid unnecessarily friending classes
9 years ago
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
9 years ago
Marc Zinnschlag
b3532b6274
Merge remote-tracking branch 'scrawl/spells'
9 years ago
scrawl
44dd62067e
Remove some unnecessary per-frame store searches
9 years ago
scrawl
783594033a
Optimize MWMechanics::Spells
...
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.
The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
9 years ago
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
9 years ago
scrawl
984c455027
Fix Show Owned option affecting tooltips that are not objects ( Fixes #3036 )
9 years ago
scrawl
2ffcc2a2b4
Fix incorrect path encoding handling in debug message
9 years ago
scrawl
bcca1beb69
Merge branch 'configwriter' into HEAD
9 years ago
scrawl
d894d54e41
Improve path conversions
9 years ago
scrawl
84aceedfa2
Add comment
9 years ago
scrawl
325d208b4a
Fix incorrect error message
9 years ago
scrawl
3747843c92
Use QString::toInt instead of atoi
9 years ago
cfcohen
c26463fd91
Should have coded it the way scrawl said, since it's cleaner.
9 years ago
cfcohen
a9c9cc5508
Remove unnecessary copy of mEngineSettings in mInitialSettings.
9 years ago
Chris Robinson
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
9 years ago
Chris Robinson
8715add72f
Store sound buffers in a deque that's filled in as needed
...
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
9 years ago
cfcohen
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
9 years ago
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
9 years ago
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
9 years ago
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1
, reversing
changes made to da856eed95
.
9 years ago
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
9 years ago
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
9 years ago
Marc Zinnschlag
cc9cab6fd1
Merge remote-tracking branch 'sandstranger/opengles'
9 years ago
cfcohen
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
9 years ago
Chris Robinson
8f08ca9cba
Revert "Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting"
...
This reverts commit 0d4fea896c
.
9 years ago
Chris Robinson
04f885d8cc
Rename mReferences to mUses
9 years ago
Chris Robinson
0d4fea896c
Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting
9 years ago
Chris Robinson
a1bdb544db
Avoid an unnecessary string copy
9 years ago
Chris Robinson
aac903484c
Remove a really unnecessary method
9 years ago
Chris Robinson
73448c72f6
Replace Play_NoTrack with playManualSound3D, and rename the latter
9 years ago
Chris Robinson
caae305ddd
Use a sorted list for unused buffers
...
Helps ensure the buffers being unloaded due to cache limits are not likely to
be needed anytime soon.
9 years ago
Chris Robinson
669b7a2295
Batch update changes together, when possible
...
Certain OpenAL implementations, including Rapture3D, Creative's hardware
drivers, and more recent versions of OpenAL Soft, can batch together changes so
that they all occur at once, avoiding potential discontinuities with one sound
being changed before another, or the listeenr being changed before sounds are.
On other implementaitons, this is a no-op and maintains existing behavior.
9 years ago
Chris Robinson
ea70b0baee
Don't store the buffer in the sound struct
9 years ago
Chris Robinson
fd7d58fe7e
Reset the sound handle back to null after unloading
9 years ago
Chris Robinson
4801661b34
Stop all sounds of the given id
9 years ago
Chris Robinson
8a69f676ec
Remove some duplicate code
9 years ago
Chris Robinson
45628316f8
Remove an unnecessary check
9 years ago
Chris Robinson
574c1923fe
Clear unused buffers after unloading them all
9 years ago
Chris Robinson
5ad772c3b3
Fix streaming sound time
9 years ago
Chris Robinson
3ce6aee98b
Return a decoder from the loadVoice function
9 years ago
Chris Robinson
24f8c78fca
Store sound buffer references by index instead of string
9 years ago
Chris Robinson
f7218f5a25
Use proper mutex mechanisms and don't check al errors in the stream thread
9 years ago
Chris Robinson
f9e18cd966
Prepare all Sound_Buffer objects when one is needed
...
This simply sets up the Sound record data to be used by the sound output. The
actual audio buffers, stored in the Sound_Handle, are still loaded on-demand.
9 years ago
Chris Robinson
6c3953766e
Use separate lists for the sound name and its buffer
...
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
9 years ago
Chris Robinson
fbfcc4050f
Stream voice clips
...
Voices tend to be a bit long, and not individually replayed often. So it's
better to stream them instead of loading theminto a sound buffer. The loudness
data is very small, though, so that can be kept buffered indefinitely.
9 years ago
Chris Robinson
eee6a19e31
Add a method to stream sounds in 3D
9 years ago
Chris Robinson
f1a1dc8408
Pass relevant sound parameters to the OpenAL_SoundStream constructor
9 years ago
Chris Robinson
83721092f2
Refactor the audio streaming code to be a bit saner
9 years ago
Chris Robinson
16f72886e9
Use separate lists for openal sounds and streams
9 years ago
Chris Robinson
0f33f41d8d
Actually unload sounds when running over
9 years ago
Chris Robinson
22a6811425
Limit the sound buffer cache to 15MB
9 years ago
Chris Robinson
0b2747098c
Keep track of unused sound buffers
9 years ago
Chris Robinson
4073495070
Add some missing sound handling
9 years ago
Chris Robinson
e362896817
Combine some duplicate code
9 years ago
Chris Robinson
febc7b510a
Remove an unneeded method
9 years ago
Chris Robinson
3fdc3c4ea9
Use a separate map for say sounds
...
Also restores lip movement
9 years ago
Chris Robinson
9d0018e1bc
Reorder active sound data to make lookup by Ptr better
9 years ago
Chris Robinson
495e138907
Load sound loudness and store it with the Sound_Buffer
...
Still not used for say yet, though
9 years ago
Chris Robinson
f4c22ec49e
Hold a separate list for voice sound buffers
...
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
9 years ago
Chris Robinson
4571218827
Load the sound as needed and pass it directly to the play methods
...
This breaks say sounds, loudness handling, and the cache limit. Fixes are
forthcoming.
9 years ago
Chris Robinson
e2beefd8b5
Store info calculated from the ESM::Sound record
9 years ago
scrawl
edfcb45ad7
Fix crash when onPcEquip script removes the equipped item ( Fixes #3016 )
9 years ago
sandstranger
69acacefff
openmw building on Android with Opengl es
9 years ago
Marc Zinnschlag
da856eed95
Merge remote-tracking branch 'origin/master'
9 years ago
scrawl
3fe38e3556
Remove unused setting
9 years ago
scrawl
71cd57a3b5
Optimize World::getTimeStamp
...
World::getTimeStamp was searching through the globals store on every call. Not a big issue, but slow enough to show up in the profiler.
9 years ago
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
9 years ago
cfcohen
b507d5da5d
One more tooltip fix. This one in the review dialog with Socucius Ergalla.
9 years ago
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
9 years ago
Marc Zinnschlag
f5c61ee616
remember script error panel height per scriptsubview
9 years ago
Marc Zinnschlag
26640d17eb
do not adjust error panel height if panal was already open
9 years ago
Marc Zinnschlag
1093a53cf9
hide script error list when there are no errors ( Fixes #2867 )
9 years ago
Marc Zinnschlag
b74b274ac0
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
9 years ago
Marc Zinnschlag
e0e9e7f8c2
adjusted startup warning message for recent improvements regarding loading/saving
9 years ago
Marc Zinnschlag
8da04bf76f
Merge remote-tracking branch 'scrawl/master'
9 years ago
scrawl
1b1d9a7a9c
Fixed another tooltip
9 years ago
cfcohen
cf4f3d9ebc
Correct tooltip for Magicka in stats window.
9 years ago
scrawl
43de13fa99
Do not allow resting on lava
9 years ago
scrawl
2d302aef99
Implement stayOutside script variable
9 years ago
scrawl
27617468c8
Fix the collision shape not updating when scaling an object via script
9 years ago
scrawl
5f143dee2d
Fix lighting incontinuity at nightfall and sunrise
9 years ago
scrawl
61314e1db1
Fix bounding box of bullet debug drawer
9 years ago
scrawl
706b1d4c28
Disable culling of ClipNode
9 years ago
scrawl
cbf344663f
animateCollisionShape checks if the shape is really animated
9 years ago
scrawl
894477849a
Store animated collision objects in a separate container
9 years ago
scrawl
8c268f239e
Set the object node scale before inserting model
...
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
9 years ago
scrawl
ccc721ba3f
Print the OpenMW version to the logfile
9 years ago
scrawl
f08cfa19ea
Fix SoundManager::isPlaying to consider multiple entries with the same Ptr/id
...
Now it returns true if *any* sounds matching the given Ptr and id are playing. The previous behaviour was causing problems with "zombie" sounds (sounds that have finished playing, but weren't removed from the map yet) making the isPlaying method return false even though there's another legitimately playing sound in the map.
9 years ago
scrawl
a49058721e
Use a contactTest for collision script functions
...
The previous method didn't work for stationary actors. This change fixes the grinder in "Sotha Sil, Dome of Kasia" not registering collisions if the player stands still. (Fixes #1934 )
9 years ago
scrawl
9fce428929
ContactTestResultCallback: do not rely on col1 being the object tested against
...
Unsure why, but in some cases col0 and col1 are swapped.
9 years ago
scrawl
3453353091
AiCombat distance check takes into account collision box ( Fixes #1699 )
9 years ago
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
9 years ago
Marc Zinnschlag
5de9a5e840
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
9 years ago
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
9 years ago
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
9 years ago
scrawl
eb2f16d682
Support for loading .osg mesh format
9 years ago
scrawl
71d9e7dc52
Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file
9 years ago
scrawl
e9e12d396d
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
scrawl
0f347eccbf
Flip the origin of global map texture
...
Now it's consistent with the overlay texture.
9 years ago
scrawl
8b7bdcd127
Fix the global map overlay viewport (Bug #3018 )
9 years ago
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
9 years ago
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago
Alexander "Ace" Olofsson
d2a4175804
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
9 years ago
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
9 years ago
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
Nikolay Kasyanov
4e3bbe01b6
OS X: disable `glTexStorage2D` because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
9 years ago
scrawl
0ec56d321a
Remove unneeded using namespace
9 years ago
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
9 years ago
scrawl
aae1aa3708
Adjust tests to work with esm_rewrite branch.
9 years ago
scrawl
f91aae2350
Tests: add record overwrite test
9 years ago
scrawl
1e817a976f
Tests: add record deletion test
9 years ago
scrawl
771193bae8
Tests: add content_diagnostics_test (requires some data files)
9 years ago
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
9 years ago
scrawl
d0d8c2eded
Delete empty test
9 years ago
scrawl
9116c701d5
esmtool fix
9 years ago
scrawl
1402a16702
SceneWidget: change the threading model to DrawThreadPerContext
...
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
9 years ago
Marc Zinnschlag
c312162b57
Merge branch 'openmw-37'
9 years ago
Marc Zinnschlag
fa9ebc50a2
Merge remote-tracking branch 'origin/master'
9 years ago
Marc Zinnschlag
b0d79ee790
Merge branch 'tooltip'
9 years ago
Marc Zinnschlag
63ee37d914
added 3D scene tooltips
9 years ago
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
scrawl
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
9 years ago
scrawl
9897400d97
Restore the previous key focus widget after playing video
9 years ago
Emmanuel Anne
af7b5e636e
improves InterpreterContext::updatePtr
...
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
9 years ago
Bret Curtis
3ea3d07d44
really purge libav
9 years ago
Marc Zinnschlag
8b01f1f6fb
added instance tooltips
9 years ago
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
9 years ago
scrawl
19cd987208
Fix Ptr updates in PositionCell
...
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
9 years ago
scrawl
9e3eb8291f
Rotations: fix the rotation order for doors
9 years ago
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
9 years ago
scrawl
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
9 years ago
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
9 years ago
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
9 years ago
scrawl
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
9 years ago
scrawl
8aacbc398f
Rotations: don't wrap the angle values for non-actors
...
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
9 years ago
scrawl
a68fd791c8
Remove a stray method declaration
9 years ago
scrawl
79c44d0bfe
Style fix
9 years ago
scrawl
02148a43f5
Node mask fix
9 years ago
scrawl
0a52ee17c3
Fix Drawable removal issues
9 years ago
scrawl
afa590bddb
Leak fix
9 years ago
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
9 years ago
scrawl
2e9805fa0e
Leak fix
9 years ago
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
9 years ago
scrawl
8e3bc981a2
Fix self-referencing camera
9 years ago
MatthewRock
a662a00c62
Fixing bug for merchant
9 years ago
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
9 years ago
scrawl
f1ac408f35
Place Drawables directly in the scene graph when built with OSG 3.4
...
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.
There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
9 years ago
scrawl
35459f20d5
Refactor lighting mask
9 years ago
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
9 years ago
scrawl
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
9 years ago
scrawl
3c338b9da9
ObstacleCheck: tweak the stuck detection parameters
...
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
9 years ago
scrawl
d233bc483d
ObstacleCheck: fix evasion issue
...
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
9 years ago
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
9 years ago
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
9 years ago
scrawl
1b52749ae1
Adjust third person camera height based on character height
9 years ago
scrawl
b89945804c
BookPage: implement hit test with margin for error
9 years ago
scrawl
055841e721
Improve cloud lighting
9 years ago
scrawl
f0a1434578
Dead actors underwater will float to the surface
9 years ago
scrawl
66925be440
Partially revert 682f30ef9c
...
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
9 years ago
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
9 years ago
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
9 years ago
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
9 years ago
scrawl
6c12c9a467
Layer renaming fix
9 years ago
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
9 years ago
scrawl
a90ef8afd0
layer renaming
9 years ago
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
9 years ago
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
9 years ago
scrawl
13c7235b6b
Remove old FPS setting code
9 years ago
scrawl
2407f393ce
Fix double update traversal in screenshot function
9 years ago
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
9 years ago
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
9 years ago
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
9 years ago
scrawl
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
9 years ago
scrawl
209fa52883
Hide weather particles underwater ( Fixes #2701 )
9 years ago
scrawl
e3b30baff9
clipFudge fix
9 years ago
scrawl
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
9 years ago
scrawl
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
9 years ago
scrawl
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
9 years ago
scrawl
de97a8a3da
Do not allow disabling the player object
9 years ago
scrawl
b72d5c5190
Don't play idlestorm animation when swimming
9 years ago
scrawl
c0a81030bb
Make use of INI settings for the simple water
9 years ago
scrawl
30c828dff0
Include cleanup
9 years ago
scrawl
8e8f72408d
Use diffuse/ambient lighting for the simple water
9 years ago
scrawl
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
9 years ago
scrawl
9902dfc9ef
Comment
9 years ago
scrawl
ad016da31d
Enable fog on weather particles
9 years ago
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
9 years ago
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
9 years ago
scrawl
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
9 years ago
scrawl
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
9 years ago
Marc Zinnschlag
ab2df963e9
Merge remote-tracking branch 'origin/master'
9 years ago
scrawl
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
9 years ago
scrawl
3f988327c7
Destructor fix
9 years ago
scrawl
913bbe347b
Don't check the extension string every frame
9 years ago
scrawl
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
9 years ago
scrawl
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
9 years ago
scrawl
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
9 years ago
scrawl
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
9 years ago
scrawl
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
9 years ago
scrawl
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
9 years ago
cc9cii
7f477e2fae
Fix include file issue.
9 years ago
cc9cii
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
9 years ago
cc9cii
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
9 years ago
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
9 years ago
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
9 years ago
scrawl
7b817ba010
Fix the node masks of water cameras being reset (Bug #2984 )
...
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
9 years ago
scrawl
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
9 years ago
scrawl
b9b154a015
Minor cleanup
9 years ago
scrawl
d90fa977e8
GL_DEPTH_COMPONEN24 fix
9 years ago
Marc Zinnschlag
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
9 years ago
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
9 years ago
Marc Zinnschlag
133e04a38e
Merge remote-tracking branch 'cc9cii/edit-ingredient'
9 years ago
scrawl
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
9 years ago
scrawl
9b8e45fc01
Fix ripple particles z-fighting with the water surface
9 years ago
scrawl
d394b0793f
waterLevel fix
9 years ago
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
9 years ago
scrawl
8433e0679f
Water: connect to settings window
9 years ago
scrawl
9f8d36b573
Water code cleanup
9 years ago
scrawl
11c997d09d
Water: move reflection code to a new class
9 years ago
scrawl
ebdf25ccb9
Water: move refraction code to a new class
9 years ago
scrawl
7bbdb13138
Remove debug code
9 years ago
scrawl
6ba9f561ea
Use simple water for the local map
9 years ago
scrawl
09631385c3
Use boost ifstream for water resources
9 years ago
scrawl
d485dd0782
Water: fix world UV coords
9 years ago
scrawl
9f2f503d37
Water: pass the near and far planes
9 years ago
scrawl
37c9c12962
Water: clipping plane offset
9 years ago
scrawl
700a0099c3
Remove debug code
9 years ago
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
9 years ago
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
9 years ago
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
9 years ago
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
9 years ago
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
9 years ago
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
9 years ago
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
9 years ago
Marc Zinnschlag
843225996c
get modifiers from event instead of from the application
9 years ago
Marc Zinnschlag
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
9 years ago
Marc Zinnschlag
f3ee3f5be1
Do not call base class event functions in WorldspaceWidget
...
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
9 years ago
Marc Zinnschlag
6c65081643
Merge branch 'marker'
9 years ago
scrawl
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
9 years ago
scrawl
515c52211e
Disable mipmaps for temporary screenshot texture
9 years ago
Marc Zinnschlag
e34af4c4b5
handle primary and secondary edit button clicks on cell arrows
9 years ago
scrawl
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
9 years ago
scrawl
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
9 years ago
scrawl
69f234d97b
Small delay before the loading screen shows
...
Kinda irritating to have the loading bar pop up for a fraction of a second.
9 years ago
scrawl
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
9 years ago
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
9 years ago
scrawl
04df656f54
Remove some junk
9 years ago
Marc Zinnschlag
8f0d7ec1ec
Merge remote-tracking branch 'artemutin/longStringEditor'
9 years ago
artemutin@yandex.ru
eae36f8005
Fixed filter reapplication on Description column change and on State
...
column change.
Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
9 years ago
Marc Zinnschlag
361634489e
properly handle cells that don't exist
9 years ago
artemutin@yandex.ru
33e12a99fa
If table dont use any filter, filter update now dont cause a reapply of empty filter
9 years ago
Marc Zinnschlag
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
9 years ago
scrawl
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
9 years ago
scrawl
f36d463617
Enchantment error handling fix ( Fixes #2959 )
...
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
9 years ago
scrawl
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
9 years ago
Marc Zinnschlag
773df6fd22
some OSG fixes
9 years ago
scrawl
a88d56148b
Read the Sun Glare Fader ini settings
9 years ago
Marc Zinnschlag
68115c4e8a
(somewhat) improved the colour scheme
9 years ago
Marc Zinnschlag
0b1d6bddc8
merged primitives arrays
9 years ago
Marc Zinnschlag
6e140c9cb1
proper shape for cell arrows (kinda)
9 years ago
Marc Zinnschlag
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
9 years ago
Marc Zinnschlag
b81ee606c8
use CellCoordinates instead of a pair of ints for cell coordinates
9 years ago
Marc Zinnschlag
0d35938794
basic cell arrow rendering (shape is a placeholder)
9 years ago
Marc Zinnschlag
3b39572274
Merge remote-tracking branch 'artemutin/scriptSearchRedirect'
9 years ago
artemutin@yandex.ru
4ca7b26609
Stream error handling, and other minor changes.
9 years ago
Marc Zinnschlag
a134b87e5b
Merge remote-tracking branch 'cc9cii/aiwander-fix'
9 years ago
cc9cii
64821b0785
Disable toolbar context menu. Should resolve bug #2953 .
9 years ago
artemutin@yandex.ru
e7a3f059aa
Implemented line and col calculations in scriptsubview
9 years ago
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
9 years ago
cc9cii
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
9 years ago
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
9 years ago
Emmanuel Anne
944dfa5372
a light without the carry flag can't be equipped !
...
it fixes Antares big mod teaching disciplines, it adds a light which should
not be equipped to npcs which have learnt something.
9 years ago
Marc Zinnschlag
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
9 years ago
Marc Zinnschlag
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
9 years ago
scrawl
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
9 years ago
Marc Zinnschlag
231935356a
Merge remote-tracking branch 'origin/master'
9 years ago
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
9 years ago
scrawl
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
9 years ago
scrawl
77cb438714
Fix potential case smashing issue
9 years ago
scrawl
029a86267b
Merge pull request #781 from artemutin/magickaRecalculation
...
Fix to https://bugs.openmw.org/issues/2914
9 years ago
artemutin@yandex.ru
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
9 years ago
Alexander "Ace" Olofsson
b4132faaea
Update editmode.cpp
...
Fixes builds on Windows
9 years ago
Rohit Nirmal
0a8e2c0b21
Fix building OpenCS with Qt 5.
9 years ago
Marc Zinnschlag
6ef2319eb8
Merge branch 'sceneinput'
9 years ago
Marc Zinnschlag
4b0fa370e3
made WorldspaceWidget::getDocument public (EditModes will need the document later)
9 years ago
Marc Zinnschlag
323f8bb29f
sensitivity settings
9 years ago
Marc Zinnschlag
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
9 years ago
Marc Zinnschlag
0a5bfb2107
added framework for drag operations
9 years ago
artemutin@yandex.ru
ecce3a1975
Add StartScriptCreator to a factory manager.
9 years ago
artemutin@yandex.ru
903cd3322b
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
9 years ago
artemutin@yandex.ru
e672880f64
Fix namespace, add file to CMakeLists.txt
9 years ago
artemutin@yandex.ru
3f27c85630
Added StartScriptCreator class with redefined getErrors method.
9 years ago
Marc Zinnschlag
8e87b48866
handle context-sensitive select mode in instance editing
9 years ago
Marc Zinnschlag
2cb106f6ad
added missing flagAsModified calls
9 years ago
Marc Zinnschlag
f28fa9fc16
clear instance selection on select click on nothing/something that isn't an instance
9 years ago
Marc Zinnschlag
319e3f24a3
on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet)
9 years ago
Marc Zinnschlag
981a8a2cc2
delegated editing and selection functions to mode objects
9 years ago
Marc Zinnschlag
9bf27c7e37
moved edit mode handling from SceneSubView to WorldspaceWidget
9 years ago
Marc Zinnschlag
5d9863aec1
removed a redundant check
9 years ago
Marc Zinnschlag
7bbc475bda
apply button mapping
9 years ago
Marc Zinnschlag
501ae6372d
factored out mouse picking into a separate function
9 years ago
Marc Zinnschlag
3844c94975
bit masking fix
9 years ago
Marc Zinnschlag
72bb33c2c4
filter mouse interaction by interaction mask
9 years ago
Marc Zinnschlag
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
9 years ago
Marc Zinnschlag
748b13b45b
renamed ObjectHolder into ObjectTag
9 years ago
Marc Zinnschlag
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
9 years ago
Marc Zinnschlag
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
9 years ago
Emmanuel Anne
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
9 years ago
scrawl
899e35591c
Escape MyGUI markup codes in console output
9 years ago
scrawl
387624e158
Add a threshold to AiFollow distance
...
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
9 years ago
scrawl
b9c6a6862a
Don't reset god mode, scripts enabled and sky enabled flags when loading a save game
...
These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
9 years ago
Emmanuel Anne
2fff6b06cc
removed items by mods do not break cell loading
...
like fortify intelligence potions removed by sris_alchemy which break the
loading of the firewatch mages guild
9 years ago
Marc Zinnschlag
d46eeb04cd
removed a left-over debugging statement
9 years ago
Marc Zinnschlag
5c34a02058
store mouse bindings in WorldspaceWidget
9 years ago
Marc Zinnschlag
d597bef2cd
refined selection related user settings
9 years ago
Marc Zinnschlag
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
9 years ago
Marc Zinnschlag
3ada08af90
store lock state and pass it on to edit mode
9 years ago
Alexander "Ace" Olofsson
caa119f13c
Fix instantiation on non-Visual Studio
9 years ago
Marc Zinnschlag
b2cb5f0374
pass on user settings updates to potentially interested parties within a scene subview
9 years ago
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
9 years ago
scrawl
12b8fcf0bf
OpenCS: Fix camera position retrieval in WorldspaceWidget
9 years ago
Marc Zinnschlag
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
9 years ago
Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
9 years ago
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
9 years ago
scrawl
1a1f1fae87
Minor cleanup
9 years ago
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
9 years ago
scrawl
854fd9fe05
Remove dead code
9 years ago
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
9 years ago
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
9 years ago
scrawl
a2a4532e71
Add the full-screen sun glare effect
9 years ago
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
9 years ago
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
9 years ago
scrawl
d191a52847
Create occlusion query nodes for the sun flash
9 years ago
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
9 years ago
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
9 years ago
Marc Zinnschlag
41191ea367
Merge remote-tracking branch 'dteviot/FixStuckDraft'
9 years ago
scrawl
8de3ce90a7
Add comments for weather IDs
9 years ago
Marc Zinnschlag
1566f3568d
Merge remote-tracking branch 'origin/master'
9 years ago
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
9 years ago