4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
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
0ec56d321a
Remove unneeded using namespace
9 years ago
05498ad592
Refactor: InputManager no longer depends on Engine
9 years ago
aae1aa3708
Adjust tests to work with esm_rewrite branch.
9 years ago
f91aae2350
Tests: add record overwrite test
9 years ago
1e817a976f
Tests: add record deletion test
9 years ago
771193bae8
Tests: add content_diagnostics_test (requires some data files)
9 years ago
38c155c579
Tests: add dialogue_merging_test (requires some data files)
9 years ago
d0d8c2eded
Delete empty test
9 years ago
9116c701d5
esmtool fix
9 years ago
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
c312162b57
Merge branch 'openmw-37'
9 years ago
fa9ebc50a2
Merge remote-tracking branch 'origin/master'
9 years ago
b0d79ee790
Merge branch 'tooltip'
9 years ago
63ee37d914
added 3D scene tooltips
9 years ago
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
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
9 years ago
9897400d97
Restore the previous key focus widget after playing video
9 years ago
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
3ea3d07d44
really purge libav
9 years ago
8b01f1f6fb
added instance tooltips
9 years ago
01f4b8a182
added scene tooltips system (tag based)
9 years ago
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
9e3eb8291f
Rotations: fix the rotation order for doors
9 years ago
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
9 years ago
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
9 years ago
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
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
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
9 years ago
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
a68fd791c8
Remove a stray method declaration
9 years ago
79c44d0bfe
Style fix
9 years ago
02148a43f5
Node mask fix
9 years ago
0a52ee17c3
Fix Drawable removal issues
9 years ago
afa590bddb
Leak fix
9 years ago
c62c1693e9
Disable copy constructor and operator= in PartHolder
9 years ago
2e9805fa0e
Leak fix
9 years ago
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
9 years ago
8e3bc981a2
Fix self-referencing camera
9 years ago
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
9 years ago
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
35459f20d5
Refactor lighting mask
9 years ago
91583fc027
Fix MWRender::Mask_ParticleSystem
9 years ago
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
9 years ago
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
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
caa523a959
ObstacleCheck: fix the framerate not being taken into account
9 years ago
801dc8eee3
ObstacleCheck: fix weird distance calculation
9 years ago
1b52749ae1
Adjust third person camera height based on character height
9 years ago
b89945804c
BookPage: implement hit test with margin for error
9 years ago
055841e721
Improve cloud lighting
9 years ago
f0a1434578
Dead actors underwater will float to the surface
9 years ago
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
516f2765a1
Use the ScalingLayer for journal, books and scrolls
9 years ago
a7ad45e73e
WindowBase::center use the layer size instead of render window size
9 years ago
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
9 years ago
6c12c9a467
Layer renaming fix
9 years ago
d85d74e615
Use AdditiveLayer for the hit fader
9 years ago
a90ef8afd0
layer renaming
9 years ago
57b9eafa0f
osgMyGUI: implement AdditiveLayer
9 years ago
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
9 years ago
13c7235b6b
Remove old FPS setting code
9 years ago
2407f393ce
Fix double update traversal in screenshot function
9 years ago
6e69808129
Fix the frameNumber not being incremented in certain frames
9 years ago
8e4e4e5e38
Fix infinite loop in addToLevList
9 years ago
c996702b56
Fix some uninitialised variables found by static analysis
9 years ago
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
9 years ago
209fa52883
Hide weather particles underwater ( Fixes #2701 )
9 years ago
e3b30baff9
clipFudge fix
9 years ago
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
9 years ago
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
9 years ago
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
9 years ago
de97a8a3da
Do not allow disabling the player object
9 years ago
b72d5c5190
Don't play idlestorm animation when swimming
9 years ago
c0a81030bb
Make use of INI settings for the simple water
9 years ago
30c828dff0
Include cleanup
9 years ago
8e8f72408d
Use diffuse/ambient lighting for the simple water
9 years ago
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
9 years ago
9902dfc9ef
Comment
9 years ago
ad016da31d
Enable fog on weather particles
9 years ago
fd1ccd21ff
Disable freezeOnCull for weather particles
9 years ago
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
9 years ago
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
9 years ago
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
9 years ago
ab2df963e9
Merge remote-tracking branch 'origin/master'
9 years ago
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
9 years ago
3f988327c7
Destructor fix
9 years ago
913bbe347b
Don't check the extension string every frame
9 years ago
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
9 years ago
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
9 years ago
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
9 years ago
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
9 years ago
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
9 years ago
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
9 years ago
7f477e2fae
Fix include file issue.
9 years ago
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
9 years ago
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
9 years ago
7c007d9c6d
Rename a variable to make it less confusing.
9 years ago
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
9 years ago
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
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
9 years ago
b9b154a015
Minor cleanup
9 years ago
d90fa977e8
GL_DEPTH_COMPONEN24 fix
9 years ago
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
9 years ago
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
9 years ago
133e04a38e
Merge remote-tracking branch 'cc9cii/edit-ingredient'
9 years ago
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
9 years ago
9b8e45fc01
Fix ripple particles z-fighting with the water surface
9 years ago
d394b0793f
waterLevel fix
9 years ago
c9d7078b4b
Water: add texture quality setting to the settings window
9 years ago
8433e0679f
Water: connect to settings window
9 years ago
9f8d36b573
Water code cleanup
9 years ago
11c997d09d
Water: move reflection code to a new class
9 years ago
ebdf25ccb9
Water: move refraction code to a new class
9 years ago
7bbdb13138
Remove debug code
9 years ago
6ba9f561ea
Use simple water for the local map
9 years ago
09631385c3
Use boost ifstream for water resources
9 years ago
d485dd0782
Water: fix world UV coords
9 years ago
9f2f503d37
Water: pass the near and far planes
9 years ago
37c9c12962
Water: clipping plane offset
9 years ago
700a0099c3
Remove debug code
9 years ago
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
107ccd84d4
Move TableEditModes enum inside a class scope.
9 years ago
77471d1592
Re-add mistakenly removed line and fix a silly typo.
9 years ago
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
9 years ago
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
9 years ago
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
9 years ago
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
9 years ago
843225996c
get modifiers from event instead of from the application
9 years ago
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
9 years ago
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
6c65081643
Merge branch 'marker'
9 years ago
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
9 years ago
515c52211e
Disable mipmaps for temporary screenshot texture
9 years ago
e34af4c4b5
handle primary and secondary edit button clicks on cell arrows
9 years ago
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
9 years ago
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
9 years ago
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
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
9 years ago
93565eccbf
Update the dialogue topic list after running greeting script
9 years ago
04df656f54
Remove some junk
9 years ago
8f0d7ec1ec
Merge remote-tracking branch 'artemutin/longStringEditor'
9 years ago
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
361634489e
properly handle cells that don't exist
9 years ago
33e12a99fa
If table dont use any filter, filter update now dont cause a reapply of empty filter
9 years ago
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
9 years ago
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
9 years ago
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
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
9 years ago
773df6fd22
some OSG fixes
9 years ago
a88d56148b
Read the Sun Glare Fader ini settings
9 years ago
68115c4e8a
(somewhat) improved the colour scheme
9 years ago
0b1d6bddc8
merged primitives arrays
9 years ago
6e140c9cb1
proper shape for cell arrows (kinda)
9 years ago
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
9 years ago
b81ee606c8
use CellCoordinates instead of a pair of ints for cell coordinates
9 years ago
0d35938794
basic cell arrow rendering (shape is a placeholder)
9 years ago
3b39572274
Merge remote-tracking branch 'artemutin/scriptSearchRedirect'
9 years ago
4ca7b26609
Stream error handling, and other minor changes.
9 years ago
a134b87e5b
Merge remote-tracking branch 'cc9cii/aiwander-fix'
9 years ago
64821b0785
Disable toolbar context menu. Should resolve bug #2953 .
9 years ago
e7a3f059aa
Implemented line and col calculations in scriptsubview
9 years ago
2f808f957d
fixed for compiler not recognising script names in some situations
9 years ago
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
9 years ago
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
9 years ago
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
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
9 years ago
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
9 years ago
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
9 years ago
231935356a
Merge remote-tracking branch 'origin/master'
9 years ago
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
9 years ago
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
9 years ago
77cb438714
Fix potential case smashing issue
9 years ago
029a86267b
Merge pull request #781 from artemutin/magickaRecalculation
...
Fix to https://bugs.openmw.org/issues/2914
9 years ago
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
9 years ago
b4132faaea
Update editmode.cpp
...
Fixes builds on Windows
9 years ago
0a8e2c0b21
Fix building OpenCS with Qt 5.
9 years ago
6ef2319eb8
Merge branch 'sceneinput'
9 years ago
4b0fa370e3
made WorldspaceWidget::getDocument public (EditModes will need the document later)
9 years ago
323f8bb29f
sensitivity settings
9 years ago
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
9 years ago
0a5bfb2107
added framework for drag operations
9 years ago
ecce3a1975
Add StartScriptCreator to a factory manager.
9 years ago
903cd3322b
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
9 years ago
e672880f64
Fix namespace, add file to CMakeLists.txt
9 years ago
3f27c85630
Added StartScriptCreator class with redefined getErrors method.
9 years ago
8e87b48866
handle context-sensitive select mode in instance editing
9 years ago
2cb106f6ad
added missing flagAsModified calls
9 years ago
f28fa9fc16
clear instance selection on select click on nothing/something that isn't an instance
9 years ago
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
981a8a2cc2
delegated editing and selection functions to mode objects
9 years ago
9bf27c7e37
moved edit mode handling from SceneSubView to WorldspaceWidget
9 years ago
5d9863aec1
removed a redundant check
9 years ago
7bbc475bda
apply button mapping
9 years ago
501ae6372d
factored out mouse picking into a separate function
9 years ago
3844c94975
bit masking fix
9 years ago
72bb33c2c4
filter mouse interaction by interaction mask
9 years ago
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
9 years ago
748b13b45b
renamed ObjectHolder into ObjectTag
9 years ago
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
9 years ago
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
9 years ago
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
9 years ago
899e35591c
Escape MyGUI markup codes in console output
9 years ago
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
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
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
d46eeb04cd
removed a left-over debugging statement
9 years ago
5c34a02058
store mouse bindings in WorldspaceWidget
9 years ago
d597bef2cd
refined selection related user settings
9 years ago
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
9 years ago
3ada08af90
store lock state and pass it on to edit mode
9 years ago
caa119f13c
Fix instantiation on non-Visual Studio
9 years ago
b2cb5f0374
pass on user settings updates to potentially interested parties within a scene subview
9 years ago
7d4125d97f
Fixes for building with unity build
9 years ago
12b8fcf0bf
OpenCS: Fix camera position retrieval in WorldspaceWidget
9 years ago
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
9 years ago
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
9 years ago
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
9 years ago
1a1f1fae87
Minor cleanup
9 years ago
d812434fee
Add a subtle fading effect to the sun flash texture
9 years ago
854fd9fe05
Remove dead code
9 years ago
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
9 years ago
96b31d3bba
Scale the sun flash texture depending on occlusion query
9 years ago
a2a4532e71
Add the full-screen sun glare effect
9 years ago
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
9 years ago
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
9 years ago
d191a52847
Create occlusion query nodes for the sun flash
9 years ago
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
9 years ago
39b7340580
added mouse button settings for 3D scene (not in use yet)
9 years ago
41191ea367
Merge remote-tracking branch 'dteviot/FixStuckDraft'
9 years ago
8de3ce90a7
Add comments for weather IDs
9 years ago
1566f3568d
Merge remote-tracking branch 'origin/master'
9 years ago
60d0ad9283
When stuck, try moving backwards as well as to side.
9 years ago
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
9 years ago
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
9 years ago
18d0cae801
OpenCS: Select objects with the right mouse button
9 years ago
41ea76fd83
OpenCS: Add selection outline effect to CSVRender::Object
9 years ago
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
9 years ago
169fc6a61b
OpenCS: Remove margin around the render window
9 years ago
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
9 years ago
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
9 years ago
659b87b25f
more cleanup
9 years ago
b3b4fb3efb
removed some left-over signal slot stuff that shouldn't have been there in the first place
9 years ago
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
9 years ago
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
9 years ago
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
9 years ago
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
9 years ago
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
9 years ago
29a84452ab
durations in tooltips : use "show effect duration" setting
9 years ago
Nikolay Kasyanov
scrawl
Marc Zinnschlag
Emmanuel Anne
Bret Curtis
cc9cii
artemutin@yandex.ru
Alexander "Ace" Olofsson
Rohit Nirmal
dteviot