Marc Zinnschlag
|
ef8b23485e
|
Merge remote-tracking branch 'sandstranger/fix-errors-in-creating-sdl-window-for-nvidia-tegra3'
|
2014-10-12 13:50:41 +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 |
|
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 |
|
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 |
|
sylar
|
964e42ab02
|
fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android
|
2014-10-11 21:21:23 +04:00 |
|
Marc Zinnschlag
|
3fd10d2a82
|
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
|
2014-10-11 14:51:55 +02:00 |
|
Marc Zinnschlag
|
a0dbb40c8e
|
Allow script names starting with digits (Fixes #1730)
|
2014-10-11 14:48:52 +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 |
|
Marc Zinnschlag
|
3df7071d19
|
Merge remote-tracking branch 'lgro/mailmap'
|
2014-10-10 10:52:24 +02:00 |
|
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 |
|
Lukasz Gromanowski
|
136f1952c9
|
Completly removed .mailmap file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-10-09 12:04:09 +02:00 |
|
Lukasz Gromanowski
|
4adfbd5048
|
Added obfuscation for email addresses in .mailmap file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-10-09 11:59:55 +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 |
|