teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
11925 commits 34 branches 0 tags 66 MiB
Commit graph

7112 commits

Author SHA1 Message Date
Marc Zinnschlag
6beee95151 Merge remote-tracking branch 'terrorfisch/aistate' 2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d Merge remote-tracking branch 'internecine/master' 2014-10-13 19:11:14 +02: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
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
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
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
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
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
terrorfisch
c4badcea6e removed warning 2014-10-10 23:51:29 +02:00
terrorfisch
c28dfc2fa4 Travis CI fix? 2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467 references now initialized when they are needed 2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601 -improved trigonometric precision 
-cleanup
 2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c - changed namespace 2014-10-10 23:28:49 +02:00
Internecine
470d375177 Removed duplicate functions and moved pause check in weather.cpp 2014-10-10 23:29:51 +13:00
terrorfisch
db1b93498d Added comment. 2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841 Moved all variables in temporary storage for AiCombat and some more for AiWander. 
+Buxfix for previous AiWander changes
 2014-10-10 00:16:17 +02: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
terrorfisch
cae948df96 removed unecessary PathFinders 2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8 Updated AiCombat: 
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
 2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00 Addded the parts of AiWander that I fully understand to the temporary storage. 
The rest should be done by someone who has a clearer overview over the class.
 2014-10-08 22:11:45 +02:00
terrorfisch
0871d45790 Draft how to move temporary package state to CharacterController. 
Example for a few values shown in AiWander.
 2014-10-08 10:58:52 +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
Marc Zinnschlag
744c56943a Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup' 2014-10-07 18:03:25 +02:00
Jordan Ayers
56db525a93 Document the return value of getEffectMultiplier. 2014-10-06 21:56:41 -05:00
MiroslavR
d1dc9951d4 Do not display werewolf overlay in third person 2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb Silence werewolves' footstep sounds when they are running with their claws sheathed 2014-10-06 18:48:22 +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
b6abfb0145 Do not display hit fader if the player wasn't damaged 2014-10-06 18:31:02 +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
scrawl
8097d9801d Fix HasSoulgem function to return number of soulgems 2014-10-06 14:56:49 +02:00
Internecine
3dee4c2b0e Fixes #1706 2014-10-06 16:10:58 +13:00
Jordan Ayers
aac2de270e Cleanup: Don't call <environment obj>.get(). 
mEnvironment.get() is redundant.  Switch the call to resemble the
surrounding environment get() calls, instead.
 2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61 Fix typo in comments. 2014-10-05 18:12:33 -05:00
scrawl
9cce3bc31b Implement fDispositionMod according to research wiki 2014-10-05 23:03:30 +02: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
d9165593d9 Fix footstep sounds played during water-walking 2014-10-05 22:27:25 +02:00
scrawl
064f1964ba More efficient water walking 2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4 Fix a typo in condition 2014-10-05 19:53:36 +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
c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb Fix not being able to move with 0/0 encumbrance (Fixes #1979) 2014-10-05 15:52:33 +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
Jordan Ayers
663647bee8 Simplify getEffectMultiplier. 
Both return cases were same, except for some overflow conditions.
 2014-10-04 15:28:58 -05: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
db6b04d127 Use the footstep volume slider for jump landing sounds (Fixes #1968) 2014-10-04 19:50:38 +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
Marc Zinnschlag
cd7cc4bec9 Merge remote-tracking branch 'miroslavr/master' 2014-10-04 09:46:29 +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
MiroslavR
95be7ea738 Revert spelling change to preserve consistency, fix a typo 2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc Support "right" alignment in books 2014-10-03 22:30:46 +02:00
MiroslavR
a13039ad1f Allow alignment for images in books 2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef Fix line breaks around IMG tags. 2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc Merge branch 'master' of github.com:OpenMW/openmw 2014-10-03 21:02:15 +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
6fc53e73ad Don't run AI for knocked-out actors (Fixes #1854) 2014-10-03 15:58:14 +02:00
scrawl
81a9dc0655 Hotfix for not being able to scroll the world map 2014-10-02 22:44:06 +02:00
scrawl
083bcaf483 Fix journal quest logs not being marked finished when there are multiple quest IDs in the log 2014-10-02 19:26:37 +02:00
scrawl
8dc20712de Merge branch 'master' of https://github.com/OpenMW/openmw 2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5 Fix for crash in main menu when reflections are enabled 2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12 Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup' 2014-10-02 17:19:32 +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
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
scrawl
cc63f7f051 Fix broken idle camera 2014-10-02 14:23:13 +02:00
scrawl
afbd2de511 Fix broken alchemy magnitude/duration 2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf Fix uninitialized flags for custom-made spells 2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67 Remove comment for old MyGUI version 2014-10-02 13:55:42 +02:00