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
Marc Zinnschlag
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
2015-09-26 12:18:18 +02:00
Marc Zinnschlag
748b13b45b
renamed ObjectHolder into ObjectTag
2015-09-26 12:05:44 +02:00
Marc Zinnschlag
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
2015-09-26 11:24:56 +02:00
Marc Zinnschlag
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
2015-09-26 11:23:33 +02:00
Emmanuel Anne
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
2015-09-26 09:24:56 +02:00
scrawl
899e35591c
Escape MyGUI markup codes in console output
2015-09-26 02:08:23 +02:00
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.
2015-09-26 02:02:50 +02:00
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".
2015-09-26 01:49:58 +02:00
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
2015-09-25 14:23:49 +02:00
Marc Zinnschlag
d46eeb04cd
removed a left-over debugging statement
2015-09-25 14:16:41 +02:00
Marc Zinnschlag
5c34a02058
store mouse bindings in WorldspaceWidget
2015-09-25 13:11:40 +02:00
Marc Zinnschlag
d597bef2cd
refined selection related user settings
2015-09-25 10:58:20 +02:00
Marc Zinnschlag
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
2015-09-24 16:07:39 +02:00
Marc Zinnschlag
3ada08af90
store lock state and pass it on to edit mode
2015-09-24 16:07:17 +02:00
Alexander "Ace" Olofsson
caa119f13c
Fix instantiation on non-Visual Studio
2015-09-24 15:55:38 +02:00
Marc Zinnschlag
b2cb5f0374
pass on user settings updates to potentially interested parties within a scene subview
2015-09-24 15:51:16 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
scrawl
12b8fcf0bf
OpenCS: Fix camera position retrieval in WorldspaceWidget
2015-09-23 23:37:09 +02:00
Marc Zinnschlag
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
2015-09-22 15:36:00 +02:00
Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
2015-09-22 08:33:33 +02:00
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87
Minor cleanup
2015-09-21 17:50:36 +02:00
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05
Remove dead code
2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71
Add the full-screen sun glare effect
2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
2015-09-21 17:20:08 +02:00
scrawl
d191a52847
Create occlusion query nodes for the sun flash
2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
2015-09-21 17:19:53 +02:00
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
2015-09-21 15:32:18 +02:00
Marc Zinnschlag
41191ea367
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-09-20 09:50:18 +02:00
scrawl
8de3ce90a7
Add comments for weather IDs
2015-09-19 18:04:24 +02:00
Marc Zinnschlag
1566f3568d
Merge remote-tracking branch 'origin/master'
2015-09-19 11:27:35 +02:00
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
2015-09-19 16:14:00 +12:00
dteviot
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
2015-09-18 21:30:02 +02:00
scrawl
18d0cae801
OpenCS: Select objects with the right mouse button
2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83
OpenCS: Add selection outline effect to CSVRender::Object
2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b
OpenCS: Remove margin around the render window
2015-09-18 18:29:22 +02:00
Marc Zinnschlag
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
2015-09-17 14:54:29 +02:00
Marc Zinnschlag
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f
more cleanup
2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb
removed some left-over signal slot stuff that shouldn't have been there in the first place
2015-09-17 11:27:55 +02:00
Marc Zinnschlag
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
2015-09-17 09:24:11 +02:00
scrawl
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6
durations in tooltips : water walking effects is seen differently
...
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583
add duration to spell icons too
...
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce
show duration of light sources in tooltip
...
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f
Move setAlpha from NpcAnimation to Animation ( Fixes #2917 )
2015-09-16 16:15:55 +02:00
scrawl
126960261f
Keep playing IdleSneak on the lower body when casting spells / using weapons
2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae
Add convenience operator [] to AnimPriority
2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7
Use the actual sneak state to determine visibility of indicator ( Fixes #2915 )
2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307
Merge branch 'localvarfix'
2015-09-15 14:01:45 +02:00
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
2015-09-15 13:58:07 +02:00
Marc Zinnschlag
82cb16b83c
Merge remote-tracking branch 'cc9cii/opencs-edit-creature'
2015-09-15 09:14:56 +02:00
dteviot
0feae19140
AiCombat use evadeObstacles() from AiPackage.
2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
cc9cii
1365b8edd1
Fix typo.
2015-09-12 11:18:07 +10:00
