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
scrawl
7a5f220ac5
GlowTexture keeps the alpha channel from the previous texture stage
2015-06-19 17:43:13 +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
39539603bf
Re-enable a warning message
2015-06-18 03:03:30 +02:00
scrawl
a7c5beb7c5
Remove redundant allocations for NIF meshes
2015-06-18 01:26:45 +02:00
scrawl
43384596d4
Style fix
2015-06-18 01:26:10 +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
81a4a6da6b
Make better use of the available texture units (Bug #2702 )
...
Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit.
2015-06-17 20:43:39 +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
scrawl
934166a853
Ignore the alpha value for particle materials (Bug #2699 )
2015-06-17 18:04:33 +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
scrawl
6199c0bbc5
Use osgDB::SharedStateManager for sharing of StateSets across NIF files
2015-06-16 23:50:19 +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