1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 04:53:51 +00:00
Commit graph

1918 commits

Author SHA1 Message Date
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
Marc Zinnschlag
528dcf761d Merge remote-tracking branch 'internecine/master' 2014-10-13 19:11:14 +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
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
a6a3eca930 Fixes #1887: Equipped items do not emit sounds
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +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
MiroslavR
a5e972aeb5 Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode 2014-10-12 00:13:24 +02:00
MiroslavR
0ae604990e Implement continuous damage indication (Fixes #1970) 2014-10-11 22:21:48 +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
Internecine
470d375177 Removed duplicate functions and moved pause check in weather.cpp 2014-10-10 23:29:51 +13:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
Internecine
782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 2014-10-09 19:41:51 +13:00
Marc Zinnschlag
744c56943a Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup' 2014-10-07 18:03:25 +02:00
MiroslavR
4086bc4848 Do not spawn blood vfx on player if hit fader is enabled 2014-10-06 18:33:41 +02:00
MiroslavR
ff74d54e98 Merge branch 'master' of github.com:OpenMW/openmw 2014-10-06 18:24:41 +02:00
scrawl
9ab8d0a8e6 Hotfix for crash when deleting an actor 2014-10-06 14:56:49 +02:00
Internecine
3dee4c2b0e Fixes #1706 2014-10-06 16:10:58 +13:00
Jordan Ayers
2f5721bf61 Fix typo in comments. 2014-10-05 18:12:33 -05:00
scrawl
39bc11681e Fix broken onGround status when levitating 2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b Fix being able to rest while water-walking (Fixes #1712) 2014-10-05 22:35:53 +02:00
scrawl
064f1964ba More efficient water walking 2014-10-05 22:27:20 +02:00
scrawl
04614651fa Fix recharging items not being updated for actor's initial inventory 2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a Feature #1697: Queue fade operations, implement hit fader & werewolf overlay 2014-10-05 17:53:50 +02:00
scrawl
d790506525 Fix projectiles colliding with dead actors (Fixes #1971) 2014-10-05 17:41:56 +02:00
scrawl
5c3bc6563b Fix divisions by zero in normalizedEncumbrance 2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96 Teleport indirect followers as well when using a door (Fixes #1974) 2014-10-05 15:18:32 +02:00
scrawl
ff11745429 Fix magic projectile sound disappearing after multiple save/load cycles 2014-10-05 14:47:23 +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
20777c1b2e Optimize physics shape scaling on cell load 2014-10-04 20:37:35 +02:00
scrawl
95378aa6ac Fix crash when a magic projectile has no sound defined (Fixes #1967) 2014-10-04 18:37:35 +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
Lukasz Gromanowski
6a89b67cb1 Revert "Issue #1887: Equipped items do not emit sounds"
This reverts commit 566211e753.
2014-10-04 13:34:36 +02:00
Lukasz Gromanowski
566211e753 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-03 22:39:05 +02:00
scrawl
cecc64752e Increase maximum height for finding spawn points (Fixes #1633, Fixes #1881) 2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57 Use a raycast to find spawn point if convexSweepTest doesn't find one (Fixes #1623, Fixes #1679) 2014-10-03 18:49:41 +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
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
scrawl
3e153d0a9b Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2 2014-09-29 22:30:21 +02:00
scrawl
b345c50a86 Run stepSimulation before moving actors
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
bdab3fa321 Bullet optimization: Don't update AABBs of static objects every frame 2014-09-28 18:02:57 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
a7c0e07d78 Add missing World cleanup for mLevitationEnabled 2014-09-24 12:21:19 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
aa7fc8ee47 fix for potential script problem during saved game loading 2014-09-22 10:12:07 +02:00
Marc Zinnschlag
e4b6f135b6 catch exceptions from adding local scripts 2014-09-21 12:43:19 +02:00
scrawl
b6c6bfe943 Merge cell names when merging cells (Fixes #1929) 2014-09-19 05:02:54 +02:00