Marc Zinnschlag
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
2014-10-13 11:03:03 +02:00
Thoronador
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa
Fix blindness and create a separate fader for it
2014-10-12 19:06:40 +02:00
Marc Zinnschlag
aefe8cd4ae
Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
...
Conflicts:
apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
e1663de7cf
Fixes #1887 : Equipped items do not emit sounds
...
Added getSound() method to MWClass class and implementation
into Light class.
Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
Lukasz Gromanowski
b44ba84a80
Issue #1887 : Equipped items do not emit sounds
...
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 23:20:40 +02:00
Lukasz Gromanowski
1a0c3dc6cf
Issue #1887 : Equipped items do not emit sounds
...
Removed unused mUnequipping and mFirstEquip member variables.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c
Issue #1887 : Equipped items do not emit sounds
...
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:21:59 +02:00
MiroslavR
4dc613a04b
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a
Issue #1887 : Equipped items do not emit sounds
...
Played sound items are based on parts not inserted items.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 21:05:12 +02:00
Thoronador
8361019456
fix uninitialized (pointer) vars in more classes
2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c
fix uninitialized member variables in OcclusionQuery class
2014-10-11 01:35:12 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
MiroslavR
d1dc9951d4
Do not display werewolf overlay in third person
2014-10-06 20:24:53 +02:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
Lukasz Gromanowski
bcb38c3eba
Issue #1887 : Equipped items do not emit sounds
...
Added handling of autoEquip and unequipAll cases.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
db6b04d127
Use the footstep volume slider for jump landing sounds ( Fixes #1968 )
2014-10-04 19:50:38 +02:00
Lukasz Gromanowski
e566e4abf2
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
scrawl
2066097202
Fix incorrect reading of global map state in some cases when the map size changed ( Fixes #1946 )
2014-09-25 15:28:02 +02:00
Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
cc9cii
1107156334
Workaround incorrectly reported channel_layout
2014-09-12 21:18:54 +10:00
cc9cii
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
2014-09-12 08:27:25 +10:00
cc9cii
48a36442c6
Add libswresample and libavresample support for sounds.
2014-09-11 21:15:18 +10:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
scrawl
8b0cb239a9
Ignore text keys for zero-length animations ( Fixes #1876 )
...
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
2014-09-08 15:23:35 +02:00
cc9cii
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
2014-09-08 15:24:39 +10:00
cc9cii
f616000afb
More fix based on code review.
2014-09-07 21:17:34 +10:00
cc9cii
c396149f23
Code review fix.
2014-09-07 20:35:32 +10:00
Rohit Nirmal
e315a72582
Remove extra semicolons at the end of some lines.
2014-09-06 13:04:52 -05:00
cc9cii
7ae8d04c47
Arrgh... silly typo
2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
2014-09-04 18:55:10 +10:00
