mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 05:53:54 +00:00
Code Issues Releases Wiki Activity
11794 commits 108 branches 66 tags 133 MiB
Commit graph

8931 commits

Author SHA1 Message Date
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277 Merge remote-tracking branch 'miroslavr/master' 2014-10-13 10:57:04 +02:00
cc9cii
43838ccf01 Remove override (c++11) 2014-10-13 16:42:50 +11:00
cc9cii
e58e5c2bf5 Update overlays independently from multiple viewports. 2014-10-13 15:57:01 +11:00
Thoronador
46496a35a1 fix uninitialized pointer variable in CSVDoc::SubView class 2014-10-12 23:42:44 +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
cc9cii
47c5bc9a19 Set bounding box on manual objects rather than creating meshes. 2014-10-13 07:42:43 +11:00
MiroslavR
8456741eaa Fix blindness and create a separate fader for it 2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec Don't remove player's sounds when unloading a cell 2014-10-12 18:35:15 +02:00
scrawl
d51daf5875 Fix AI not using F_Always spells, for example "vampire touch" 2014-10-12 17:18:27 +02:00
scrawl
9323f96211 Move terrainstorage to opencs_units_noqt 2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +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
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11: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
ad253059b1 Hit indicator for absorb/damage health effect 2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e Construct hit fader with correct texture right away to prevent mygui warning 2014-10-12 00:40:31 +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
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
MiroslavR
2162a9e1b9 Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available 2014-10-11 23:09:20 +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
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
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
Marc Zinnschlag
3fd10d2a82 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498 remove unused var. mSoftwareCursor in WindowManager 2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce Fix: initialize boolean field with boolean value, not NULL 2014-10-11 10:07:01 +04: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
Thoronador
db38108801 fix uninitialized pointer variables in some classes 2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13 remove unused dummy variable 2014-10-11 00:56:57 +02:00
Thoronador
ab364c9440 fix some more uninitialized class member fields 2014-10-11 00:50:32 +02:00
Thoronador
51cd2bb5d9 remove unused/double variable from CSMWorld::Column class 2014-10-11 00:15:36 +02:00
Thoronador
a799353f60 fix uninitialized fields in CSMDoc::Operation class 2014-10-11 00:06:50 +02:00
Thoronador
deb6452e0d fix uninitialized pointer fields in CS::Editor class 2014-10-10 23:57:10 +02:00
Thoronador
f0d3fc73d5 fix uninitialized pointer fields in GraphicsPage class 2014-10-10 23:47:27 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
 2014-10-10 16:11:54 +02:00
Marc Zinnschlag
23e969eae7 fixed pathgrid saving again (previous fix was incomplete) 2014-10-10 15:29:21 +02:00
cc9cii
3e5027abbb Incorporate terrain height to labels and camera. 2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0 User configuration manager's resource directory. 2014-10-10 13:35:14 +11:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
cc9cii
13f028e27b Avoid out of range exceptions. 2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00