Marc Zinnschlag
8fbc799655
Merge remote-tracking branch 'cc9cii/master'
2015-06-25 14:06:22 +02:00
Marc Zinnschlag
69db0179ca
update refresh menu item on stateChanged signal instead of when opening the menu
2015-06-25 13:05:57 +02:00
cc9cii
c0f3d70f06
Use the new severity message attribute.
2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f
Fix crash when user preference is missing.
2015-06-25 20:21:51 +10:00
Marc Zinnschlag
6fbdbb11d5
added refrash menu item to report table ( Fixes #2620 )
2015-06-25 12:03:40 +02:00
Stanislav Bas
d282bead23
InfoCreator accepts drops of Topic/Journal ID
2015-06-25 11:24:19 +03:00
Stanislav Bas
5b82b9d9d0
ReferenceCreator accepts drops of Cell ID
2015-06-25 11:20:35 +03:00
Stanislav Bas
21f0b586ec
Rows with the same topic but in different letter case can be reordered
2015-06-24 20:01:29 +03:00
Marc Zinnschlag
e29d9bcc8e
use a namespace instead of a class with only static functions
2015-06-24 17:29:47 +02:00
Marc Zinnschlag
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
2015-06-24 17:20:43 +02:00
Stanislav Bas
270c17faa7
Prevent drops on non-editable table cells
2015-06-24 16:36:09 +03:00
Stanislav Bas
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
2015-06-24 15:07:09 +03:00
scrawl
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
2015-06-24 05:17:45 +02:00
scrawl
d7695f2560
Remove unused NpcAnimation visibilityFlags
2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55
Move HeadAnimationTime to the implementation file
2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13
Move head tracking from NpcAnimation to Animation (Bug #2720 )
2015-06-22 21:06:27 +02:00
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-22 15:20:58 +02:00
scrawl
3f54f77647
essimporter build fix
2015-06-21 22:17:06 +02:00
Stanislav Bas
d606b62688
Nested tables accept drops
2015-06-21 21:35:00 +03:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
Stanislav Bas
b9882eb59a
DragRecordTable checks drag type before accepting it
2015-06-21 18:40:13 +03:00
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
Stanislav Bas
a23de394f8
Refine DropLineEdit code
2015-06-21 17:16:13 +03:00
Stanislav Bas
2565452052
Add some drag'n'drop utils to work with TableMimeData
2015-06-21 17:08:10 +03:00
dteviot
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
2015-06-21 16:23:40 +12:00
Stanislav Bas
dc37aea8eb
Add missing mappings to TableMimeData
2015-06-20 21:00:15 +03:00
Stanislav Bas
7dcdd130bb
Rework Dialogue subview code according to DropLineEdit changes
2015-06-20 20:52:47 +03:00
Marc Zinnschlag
c644f15167
calm down travis
2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86
standarised on the use of the Message struct when passing operations messages around
2015-06-20 17:56:42 +02:00
Stanislav Bas
64701b273d
LineEdits for ID values accept drops with a proper type
2015-06-20 18:29:31 +03:00
scrawl
ad6764fa6a
Fix bug #2715
2015-06-20 17:08:46 +02:00
Marc Zinnschlag
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
2015-06-20 16:55:34 +02:00
Stanislav Bas
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
2015-06-20 17:33:36 +03:00
Marc Zinnschlag
9a102f81c8
added setting for controlling script compiler warnings
2015-06-20 16:21:04 +02:00
Marc Zinnschlag
1ee1934053
framework for accessing user settings in operation stages
2015-06-20 16:20:31 +02:00
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
2015-06-20 12:43:53 +03:00
Marc Zinnschlag
8aba52170f
fixed a build error
2015-06-20 11:34:32 +02:00
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
2015-06-20 11:29:15 +03:00
scrawl
efad4efe19
Star fading (Bug #2693 )
2015-06-19 20:55:04 +02:00
scrawl
74260a9a44
Tweak moon sizes
2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581
Disable FreezeOnCull for effect particles
2015-06-19 18:38:44 +02:00
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
2015-06-19 19:24:06 +03:00
scrawl
1ed4e33815
Fading for mooncircle texture
2015-06-19 18:19:52 +02:00
scrawl
38d90f47a6
Moon fading fix (Bug #2713 )
2015-06-19 18:15:23 +02:00
Stanislav Bas
e212414bc7
Use an ID parent type as the collection ID in GenericCreator.
...
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
2015-06-19 13:49:48 +03:00
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
2015-06-19 12:51:50 +03:00
Stanislav Bas
a6734a0ea4
Add Cell Id completion to ReferenceCreator
2015-06-19 11:50:02 +03:00
scrawl
2b53e5d965
Fix for explosion effects playing when the game is paused
2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e
Correct moon blending
2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3
Cloud opacity & cross-fading
2015-06-19 01:03:12 +02:00
scrawl
fb94395628
Fix atmosphere lighting
2015-06-18 23:15:13 +02:00
Stanislav Bas
36271f25ec
Rework creator factories to accept Document as a parameter
2015-06-18 22:59:40 +03:00
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
2015-06-18 16:37:49 +02:00
Marc Zinnschlag
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
2015-06-18 16:36:27 +02:00
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-06-18 15:00:21 +02:00
scrawl
04010b8a1a
Set OnPcHitMe even for missed hits
2015-06-18 15:00:04 +02:00
scrawl
76799982a5
Add missing include
2015-06-18 14:56:43 +02:00
Stanislav Bas
cf487581f7
Show the pop-up of ColorEditor immediately after the editor creation in tables
2015-06-18 12:50:46 +03:00
Marc Zinnschlag
12e0873446
Merge remote-tracking branch 'smbas/feature-info-tables-sorting'
2015-06-18 10:31:44 +02:00
Marc Zinnschlag
63d46f7e66
removed an unused variable
2015-06-18 10:26:35 +02:00
Marc Zinnschlag
0b32b24d60
Merge remote-tracking branch 'smbas/fix-enumdelegates'
2015-06-18 10:21:27 +02:00
scrawl
fabc5126f3
Include cleanup
2015-06-18 00:30:51 +02:00
Stanislav Bas
c60fed89ac
Enable sorting for Info tables
2015-06-17 23:50:18 +03:00
scrawl
0ffa1f964b
Fix water ripple height
2015-06-17 22:49:20 +02:00
Stanislav Bas
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
2015-06-17 22:47:39 +03:00
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
2015-06-17 20:49:01 +02:00
scrawl
3ebfb4e0d9
Ignore particle systems in getScreenBounds
2015-06-17 18:22:31 +02:00
scrawl
b543308e3e
Remove an already resolved todo comment
2015-06-17 18:16:05 +02:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
7b35882814
RemoveParticlesVisitor fix
2015-06-17 15:13:17 +02:00
Stanislav Bas
ed09424223
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
2015-06-16 22:39:12 +03:00
scrawl
1c151f2f0a
Re-enable some outcommented sky code
2015-06-16 20:56:48 +02:00
Stanislav Bas
1e368de289
Adjust columns of nested tables when a dialog subview is opened
2015-06-16 21:47:27 +03:00
scrawl
3da8f6e62e
Water ripples
2015-06-16 20:36:48 +02:00
Stanislav Bas
6cfee630aa
Proper size hint for DataDisplayDelegate
2015-06-16 21:25:06 +03:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
b73947033d
Rotate sky meshes
2015-06-16 16:33:31 +02:00
Stanislav Bas
2c1ca33a20
Refactor Enum- and DataDisplayDelegate code
2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc
Proper size hint for EnumDelegate
2015-06-16 14:18:47 +03:00
Marc Zinnschlag
62c5f185d7
Merge remote-tracking branch 'cc9cii/master'
2015-06-16 12:30:21 +02:00
Marc Zinnschlag
13112c6d04
Merge remote-tracking branch 'scrawl/aiwanderfix'
2015-06-16 12:28:34 +02:00
cc9cii
6a47ea9a67
fix typo
2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
2015-06-16 00:19:51 +03:00
scrawl
2d072aab2d
Broken bone references from .kf files are no longer a fatal error (Bug #2687 )
2015-06-15 22:42:14 +02:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
609e146a22
Build fixes for windows
2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
2015-06-15 16:25:11 +02:00
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
2015-06-15 16:22:48 +02:00
scrawl
07937c741a
Improve exception handling when starting a new game from the main menu
2015-06-15 16:19:05 +02:00
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
2015-06-14 23:56:35 +02:00