MiroslavR
|
29f5cb46ac
|
Merge branch 'master' of github.com:OpenMW/openmw
|
2014-10-09 19:17:39 +02:00 |
|
Marc Zinnschlag
|
e00771cccd
|
Merge remote-tracking branch 'scrawl/master'
|
2014-10-09 15:03:00 +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 |
|
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
2014-10-08 17:17:31 +02:00 |
|
sylar
|
70fd531722
|
None texturing filtering enable for android by default
|
2014-10-08 00:15:22 +04:00 |
|
sylar
|
3a625c567d
|
fixes for shaders glsles
|
2014-10-07 23:32:19 +04:00 |
|
sylar
|
4c46da79de
|
changed android configs paths
|
2014-10-07 23:31: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
|
8097d9801d
|
Fix HasSoulgem function to return number of soulgems
|
2014-10-06 14:56:49 +02:00 |
|
scrawl
|
9ab8d0a8e6
|
Hotfix for crash when deleting an actor
|
2014-10-06 14:56:49 +02:00 |
|
scrawl
|
012928c082
|
Fix HasSoulgem function to return number of soulgems
|
2014-10-06 14:36:29 +02:00 |
|
Marc Zinnschlag
|
ea8635f44c
|
Merge remote-tracking branch 'scrawl/master'
|
2014-10-06 13:12:28 +02: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 |
|
Nikolay Kasyanov
|
8b2b54d89a
|
Travis CI: enable OS X build
Refactor platform-specific calls from .travis.yml to separate .sh scripts.
Test suite still needs to be enabled & tested for OS X though.
|
2014-10-05 19:31:43 +04: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 |
|
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 |
|
Marc Zinnschlag
|
cd7cc4bec9
|
Merge remote-tracking branch 'miroslavr/master'
|
2014-10-04 09:46:29 +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 |
|