Commit graph

1931 commits

Author SHA1 Message Date
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
dteviot
3fa5c6a0e7 fixed travis build failure 2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb replaced FLT_MAX with numeric_limits. 2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
scrawl
681183df31 Restore handling of fog depth == 0 values (Bug #1549) 2015-08-19 01:13:14 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00
dteviot
942a987d52 centralize the world/cell coordinate conversion logic. 2015-08-16 18:55:02 +12:00
scrawl
58cd2b1a84 Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? (Fixes #2148) 2015-08-15 19:01:21 +02:00
scrawl
56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 2015-08-07 15:34:01 +02:00
slothlife
3235cecddf Use Glare View for visibility of celestial bodies
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
slothlife
238ae419a3 Fix use of incorrect material for Sun 2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579 Use diffuse alpha to fade Sun 2015-08-05 21:03:21 -05:00
slothlife
ea2f88a355 Fix several sky rendering bugs, maybe also #639
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
scrawl
664ae079db Improve setting of culling mask for the savegame screenshot camera 2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6 Fix NotifyDrawCompletedCallback in single threaded mode 2015-08-02 17:57:50 +02:00
Marc Zinnschlag
e73c115ff5 Merge remote-tracking branch 'origin/master' 2015-08-02 13:44:17 +02:00
slothlife
0244a9b329 Correct moon texture with respect to trajectory 2015-08-01 07:57:05 -05:00
scrawl
1f755a2bc0 Don't use a shared Material in AlphaFader 2015-07-31 00:03:01 +02:00
slothlife
24ba54f4fe Implement accurate moon settings (fixes #672) 2015-07-29 23:57:45 -05:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
a33ca75742 Pass AnimPriority by const reference 2015-07-18 03:23:41 +02:00
scrawl
f6f82d433c Fix bug with loop key assignment
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.

This fixes incorrect playing of the jump animation, one aspect of Bug #2286.
2015-07-16 19:55:05 +02:00
scrawl
3656851750 Remove the now unused changeBlendMask 2015-07-15 16:43:11 +02:00
scrawl
50db6ed396 Use the extended animation priority for weapon animations 2015-07-15 14:40:36 +02:00
scrawl
e93a578f23 Extend the animation priority system to one priority value per bone group / distinct blend mask 2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5 Rename Animation::Group to Animation::BlendMask
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
2015-07-15 13:49:16 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a Add brackets around a correct expression to fix coverity warning 2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993 Fix code that I forgot to uncomment (thanks coverity) 2015-07-11 03:34:08 +02:00
scrawl
49c07de773 Merge pull request #643 from ace13/win-build-fix
Fix build error and a pair of warnings
2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d Fix the comments 2015-07-05 21:56:04 +02:00
Marc Zinnschlag
432384d280 Merge remote-tracking branch 'scrawl/aicombat' 2015-07-05 14:47:20 +02:00
scrawl
c90841d649 Fix head tracking for NPCs 2015-07-04 21:00:01 +02:00
scrawl
6724585777 Light magic effect
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)
2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42 Fix for some coverity scan defects 2015-07-02 20:46:34 +02:00
scrawl
dcb8fbc69c Accurate handling of fog depth/density (Fixes #2752) 2015-07-02 20:46:34 +02:00
Alexander "Ace" Olofsson
5d24091364 Fix build error and a pair of warnings
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
2015-07-01 15:06:38 +02:00
scrawl
4b2391c60f Ignore effect meshes in getScreenBounds 2015-06-30 02:51:32 +02:00
scrawl
d5a47cfafe Include cleanup 2015-06-30 01:41:03 +02:00
scrawl
017c9f7ac9 Fading for weather particle effects 2015-06-29 20:19:46 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
2015-06-26 05:15:07 +02:00
scrawl
4ef6aa6b7f Fix weather particles disappearing 2015-06-26 02:30:39 +02:00
scrawl
8a3889a81e Rain fading 2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e Rain effect 2015-06-25 17:23:01 +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
ad6764fa6a Fix bug #2715 2015-06-20 17:08:46 +02:00