Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
2015-11-14 13:50:01 +01:00
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.
2015-11-14 13:50:01 +01:00
scrawl
0ec56d321a
Remove unneeded using namespace
2015-11-14 03:01:40 +01:00
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
2015-11-14 03:01:24 +01:00
scrawl
aae1aa3708
Adjust tests to work with esm_rewrite branch.
2015-11-14 00:27:59 +01:00
scrawl
f91aae2350
Tests: add record overwrite test
2015-11-14 00:27:59 +01:00
scrawl
1e817a976f
Tests: add record deletion test
2015-11-14 00:27:59 +01:00
scrawl
771193bae8
Tests: add content_diagnostics_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
d0d8c2eded
Delete empty test
2015-11-14 00:27:59 +01:00
scrawl
9116c701d5
esmtool fix
2015-11-14 00:27:59 +01:00
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.
2015-11-13 21:00:51 +01:00
Marc Zinnschlag
c312162b57
Merge branch 'openmw-37'
2015-11-13 14:24:57 +01:00
Marc Zinnschlag
fa9ebc50a2
Merge remote-tracking branch 'origin/master'
2015-11-13 13:34:03 +01:00
Marc Zinnschlag
b0d79ee790
Merge branch 'tooltip'
2015-11-13 11:40:10 +01:00
Marc Zinnschlag
63ee37d914
added 3D scene tooltips
2015-11-13 11:39:57 +01:00
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
2015-11-13 01:34:36 +01:00
scrawl
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
2015-11-12 23:05:44 +01:00
scrawl
9897400d97
Restore the previous key focus widget after playing video
2015-11-12 19:03:24 +01:00
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.
2015-11-12 17:53:17 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
Marc Zinnschlag
8b01f1f6fb
added instance tooltips
2015-11-12 15:09:43 +01:00
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
2015-11-12 15:06:37 +01:00
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.
2015-11-12 14:32:39 +01:00
scrawl
9e3eb8291f
Rotations: fix the rotation order for doors
2015-11-12 02:09:00 +01:00
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
2015-11-12 01:44:29 +01:00
scrawl
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
2015-11-12 01:44:00 +01:00
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.
2015-11-12 01:16:37 +01:00
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
2015-11-12 01:09:39 +01:00
scrawl
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
2015-11-12 00:58:29 +01:00
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.
2015-11-12 00:52:36 +01:00
scrawl
a68fd791c8
Remove a stray method declaration
2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe
Style fix
2015-11-11 17:23:47 +01:00
scrawl
02148a43f5
Node mask fix
2015-11-11 17:22:31 +01:00
scrawl
0a52ee17c3
Fix Drawable removal issues
2015-11-11 17:04:06 +01:00
scrawl
afa590bddb
Leak fix
2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
2015-11-11 01:47:26 +01:00
scrawl
2e9805fa0e
Leak fix
2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
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.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
scrawl
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
2015-11-10 01:01:41 +01:00
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.
2015-11-09 20:35:31 +01:00
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.
2015-11-09 20:35:31 +01:00
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
2015-11-09 20:35:31 +01:00
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
2015-11-09 20:17:21 +01:00
scrawl
1b52749ae1
Adjust third person camera height based on character height
2015-11-09 17:42:35 +01:00
scrawl
b89945804c
BookPage: implement hit test with margin for error
2015-11-09 02:57:49 +01:00
scrawl
055841e721
Improve cloud lighting
2015-11-09 02:22:40 +01:00
scrawl
f0a1434578
Dead actors underwater will float to the surface
2015-11-08 20:58:00 +01:00
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.
2015-11-08 19:59:33 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
2015-11-08 18:30:21 +01:00
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
2015-11-08 18:30:21 +01:00
scrawl
6c12c9a467
Layer renaming fix
2015-11-07 19:45:30 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
2407f393ce
Fix double update traversal in screenshot function
2015-11-06 23:14:27 +01:00
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
2015-11-06 23:14:27 +01:00
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
2015-11-05 01:18:01 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
2015-11-03 23:20:17 +01:00
scrawl
209fa52883
Hide weather particles underwater ( Fixes #2701 )
2015-11-03 23:15:43 +01:00
scrawl
e3b30baff9
clipFudge fix
2015-11-03 23:10:52 +01:00
scrawl
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
2015-11-03 19:05:36 +01:00
scrawl
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
2015-11-03 18:27:15 +01:00
scrawl
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
2015-11-03 18:15:47 +01:00
scrawl
de97a8a3da
Do not allow disabling the player object
2015-11-03 17:53:57 +01:00
scrawl
b72d5c5190
Don't play idlestorm animation when swimming
2015-11-03 17:48:35 +01:00
scrawl
c0a81030bb
Make use of INI settings for the simple water
2015-11-03 02:24:50 +01:00
scrawl
30c828dff0
Include cleanup
2015-11-03 02:17:42 +01:00
scrawl
8e8f72408d
Use diffuse/ambient lighting for the simple water
2015-11-03 02:12:00 +01:00
scrawl
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
2015-11-03 01:53:38 +01:00
scrawl
9902dfc9ef
Comment
2015-11-03 01:53:22 +01:00
scrawl
ad016da31d
Enable fog on weather particles
2015-11-03 01:42:37 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
scrawl
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
2015-11-02 21:51:01 +01:00
scrawl
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
2015-11-02 21:35:03 +01:00
Marc Zinnschlag
ab2df963e9
Merge remote-tracking branch 'origin/master'
2015-11-02 08:40:40 +01:00
scrawl
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
2015-11-02 01:23:21 +01:00
scrawl
3f988327c7
Destructor fix
2015-11-02 00:57:59 +01:00
scrawl
913bbe347b
Don't check the extension string every frame
2015-11-02 00:52:20 +01:00
scrawl
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
2015-11-02 00:29:09 +01:00
scrawl
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
2015-11-01 22:59:26 +01:00
scrawl
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
2015-11-01 21:45:58 +01:00
cc9cii
7f477e2fae
Fix include file issue.
2015-11-02 06:57:24 +11:00
cc9cii
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
2015-11-02 06:43:20 +11:00
cc9cii
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
2015-11-01 11:23:28 +11:00
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
2015-10-31 20:45:16 +11:00
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
2015-10-31 20:42:42 +11:00
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.
2015-10-31 03:14:05 +01:00
scrawl
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
2015-10-31 01:30:02 +01:00
scrawl
b9b154a015
Minor cleanup
2015-10-31 00:01:12 +01:00
scrawl
d90fa977e8
GL_DEPTH_COMPONEN24 fix
2015-10-29 13:52:48 +01:00
Marc Zinnschlag
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
2015-10-29 11:27:01 +01:00
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
2015-10-29 11:20:06 +01:00
Marc Zinnschlag
133e04a38e
Merge remote-tracking branch 'cc9cii/edit-ingredient'
2015-10-29 10:26:53 +01:00
scrawl
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
2015-10-29 01:17:23 +01:00
scrawl
9b8e45fc01
Fix ripple particles z-fighting with the water surface
2015-10-29 00:28:09 +01:00
scrawl
d394b0793f
waterLevel fix
2015-10-29 00:27:42 +01:00
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
2015-10-29 00:27:42 +01:00
scrawl
8433e0679f
Water: connect to settings window
2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573
Water code cleanup
2015-10-29 00:25:24 +01:00
scrawl
11c997d09d
Water: move reflection code to a new class
2015-10-29 00:25:24 +01:00
scrawl
ebdf25ccb9
Water: move refraction code to a new class
2015-10-29 00:25:24 +01:00
scrawl
7bbdb13138
Remove debug code
2015-10-29 00:25:24 +01:00
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
700a0099c3
Remove debug code
2015-10-29 00:25:23 +01:00
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...
2015-10-29 00:25:23 +01:00
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
2015-10-28 23:33:24 +11:00
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
2015-10-28 20:52:07 +11:00
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
2015-10-28 20:30:30 +11:00
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
2015-10-28 11:49:24 +11:00
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
2015-10-28 11:30:36 +11:00
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
2015-10-28 11:18:48 +11:00
Marc Zinnschlag
843225996c
get modifiers from event instead of from the application
2015-10-27 15:43:52 +01:00
Marc Zinnschlag
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
2015-10-27 15:30:51 +01:00
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.
2015-10-27 15:25:46 +01:00
Marc Zinnschlag
6c65081643
Merge branch 'marker'
2015-10-26 14:27:29 +01:00
scrawl
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
2015-10-26 14:26:02 +01:00
scrawl
515c52211e
Disable mipmaps for temporary screenshot texture
2015-10-25 18:28:50 +01:00
Marc Zinnschlag
e34af4c4b5
handle primary and secondary edit button clicks on cell arrows
2015-10-25 15:16:22 +01:00
scrawl
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
2015-10-24 16:04:08 +02:00
scrawl
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
2015-10-24 15:46:15 +02:00
scrawl
69f234d97b
Small delay before the loading screen shows
...
Kinda irritating to have the loading bar pop up for a fraction of a second.
2015-10-23 16:50:08 +02:00
scrawl
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
2015-10-19 22:17:04 +02:00
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
2015-10-18 21:40:16 +02:00
scrawl
04df656f54
Remove some junk
2015-10-18 21:39:53 +02:00
Marc Zinnschlag
8f0d7ec1ec
Merge remote-tracking branch 'artemutin/longStringEditor'
2015-10-16 09:15:48 +02:00
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.
2015-10-16 11:32:22 +10:00
Marc Zinnschlag
361634489e
properly handle cells that don't exist
2015-10-15 14:46:08 +02:00
artemutin@yandex.ru
33e12a99fa
If table dont use any filter, filter update now dont cause a reapply of empty filter
2015-10-14 21:22:28 +10:00
Marc Zinnschlag
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
2015-10-14 09:33:51 +02:00
scrawl
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
2015-10-13 19:05:17 +02:00
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.
2015-10-13 18:15:39 +02:00
scrawl
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
2015-10-13 17:55:57 +02:00
Marc Zinnschlag
773df6fd22
some OSG fixes
2015-10-13 16:53:40 +02:00
scrawl
a88d56148b
Read the Sun Glare Fader ini settings
2015-10-13 16:35:31 +02:00
Marc Zinnschlag
68115c4e8a
(somewhat) improved the colour scheme
2015-10-13 16:15:53 +02:00
Marc Zinnschlag
0b1d6bddc8
merged primitives arrays
2015-10-13 16:11:47 +02:00
Marc Zinnschlag
6e140c9cb1
proper shape for cell arrows (kinda)
2015-10-13 11:43:33 +02:00
Marc Zinnschlag
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
2015-10-12 18:00:44 +02:00
Marc Zinnschlag
b81ee606c8
use CellCoordinates instead of a pair of ints for cell coordinates
2015-10-12 14:31:55 +02:00
Marc Zinnschlag
0d35938794
basic cell arrow rendering (shape is a placeholder)
2015-10-12 14:12:01 +02:00
Marc Zinnschlag
3b39572274
Merge remote-tracking branch 'artemutin/scriptSearchRedirect'
2015-10-09 17:15:11 +02:00
artemutin@yandex.ru
4ca7b26609
Stream error handling, and other minor changes.
2015-10-09 21:57:02 +10:00
Marc Zinnschlag
a134b87e5b
Merge remote-tracking branch 'cc9cii/aiwander-fix'
2015-10-09 09:48:03 +02:00
cc9cii
64821b0785
Disable toolbar context menu. Should resolve bug #2953 .
2015-10-09 06:29:50 +11:00
artemutin@yandex.ru
e7a3f059aa
Implemented line and col calculations in scriptsubview
2015-10-09 00:29:18 +10:00
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
2015-10-08 14:01:29 +02:00
cc9cii
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
2015-10-08 12:47:23 +11:00
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
2015-10-08 12:35:09 +11:00
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.
2015-10-07 12:28:25 +02:00
Marc Zinnschlag
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
2015-10-07 08:12:02 +02:00
Marc Zinnschlag
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
2015-10-07 08:09:27 +02:00
scrawl
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
2015-10-07 02:43:21 +02:00
Marc Zinnschlag
231935356a
Merge remote-tracking branch 'origin/master'
2015-10-06 14:30:45 +02:00
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
2015-10-06 14:30:32 +02:00
scrawl
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
2015-10-05 15:41:43 +02:00
scrawl
77cb438714
Fix potential case smashing issue
2015-10-05 15:41:07 +02:00
scrawl
029a86267b
Merge pull request #781 from artemutin/magickaRecalculation
...
Fix to https://bugs.openmw.org/issues/2914
2015-10-05 15:32:37 +02:00
artemutin@yandex.ru
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
2015-10-05 23:07:13 +10:00
Alexander "Ace" Olofsson
b4132faaea
Update editmode.cpp
...
Fixes builds on Windows
2015-10-04 16:27:05 +02:00
Rohit Nirmal
0a8e2c0b21
Fix building OpenCS with Qt 5.
2015-10-03 00:07:08 -05:00
Marc Zinnschlag
6ef2319eb8
Merge branch 'sceneinput'
2015-10-02 15:07:01 +02:00
Marc Zinnschlag
4b0fa370e3
made WorldspaceWidget::getDocument public (EditModes will need the document later)
2015-10-02 15:06:42 +02:00
Marc Zinnschlag
323f8bb29f
sensitivity settings
2015-10-01 13:42:21 +02:00
Marc Zinnschlag
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
2015-10-01 13:19:48 +02:00
Marc Zinnschlag
0a5bfb2107
added framework for drag operations
2015-10-01 12:46:01 +02:00
artemutin@yandex.ru
ecce3a1975
Add StartScriptCreator to a factory manager.
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
903cd3322b
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
e672880f64
Fix namespace, add file to CMakeLists.txt
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
3f27c85630
Added StartScriptCreator class with redefined getErrors method.
2015-09-30 09:46:51 +10:00
Marc Zinnschlag
8e87b48866
handle context-sensitive select mode in instance editing
2015-09-29 16:07:14 +02:00
Marc Zinnschlag
2cb106f6ad
added missing flagAsModified calls
2015-09-29 16:06:55 +02:00
Marc Zinnschlag
f28fa9fc16
clear instance selection on select click on nothing/something that isn't an instance
2015-09-29 13:53:47 +02:00
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)
2015-09-29 13:48:04 +02:00
Marc Zinnschlag
981a8a2cc2
delegated editing and selection functions to mode objects
2015-09-27 16:18:22 +02:00
Marc Zinnschlag
9bf27c7e37
moved edit mode handling from SceneSubView to WorldspaceWidget
2015-09-27 14:38:12 +02:00
Marc Zinnschlag
5d9863aec1
removed a redundant check
2015-09-27 11:34:14 +02:00
Marc Zinnschlag
7bbc475bda
apply button mapping
2015-09-26 18:01:49 +02:00
Marc Zinnschlag
501ae6372d
factored out mouse picking into a separate function
2015-09-26 17:51:41 +02:00
Marc Zinnschlag
3844c94975
bit masking fix
2015-09-26 17:39:55 +02:00
Marc Zinnschlag
72bb33c2c4
filter mouse interaction by interaction mask
2015-09-26 12:24:41 +02:00