scrawl
|
3ef9b3f44d
|
Merge pull request #1025 from Allofich/anim
Use loopfallback for idle animation groups
|
2016-08-16 16:30:55 +02:00 |
|
Allofich
|
c05782581e
|
Account for all instances of play()
|
2016-08-16 02:52:55 +09:00 |
|
Allofich
|
6163c7bb03
|
Use loopfallback for idle animation groups
|
2016-08-16 01:15:26 +09:00 |
|
scrawl
|
641005b317
|
Remove Camera's children before removing the Camera
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
|
2016-08-15 18:12:46 +02:00 |
|
scrawl
|
a44ba0e461
|
Merge pull request #966 from kpp/find_mygui
Find mygui
|
2016-08-15 16:36:48 +02:00 |
|
Roman Proskuryakov
|
4cffdb67d8
|
Uses case-sensitive MyGUI_* variables
|
2016-08-15 15:59:02 +03:00 |
|
scrawl
|
71f786ff84
|
Delete the WorkQueue first
Fixes a potential crash on exit.
|
2016-08-14 18:10:29 +02:00 |
|
scrawl
|
3732979eec
|
Revert "Merge pull request #993 from mrcheko/pathfinding"
This reverts commit 5190275b37 , reversing
changes made to d7845012bf .
|
2016-08-14 18:04:33 +02:00 |
|
scrawl
|
c3340ec143
|
Merge pull request #1022 from Allofich/anim
Make loopgroup loop correct number of times
|
2016-08-14 17:02:38 +02:00 |
|
scrawl
|
1edcea2ff5
|
Merge pull request #1023 from psi29a/small_fixes
small fixes
|
2016-08-14 16:49:26 +02:00 |
|
scrawl
|
30b549124e
|
Fix use-after-free
|
2016-08-14 16:42:29 +02:00 |
|
scrawl
|
c65492193c
|
Use osg::clone
|
2016-08-14 16:41:44 +02:00 |
|
scrawl
|
0fbc0d0da7
|
Attempt to silence warning
|
2016-08-14 16:41:17 +02:00 |
|
Bret Curtis
|
0547d4b937
|
clang says that these must be in the MWWorld namespace
|
2016-08-14 16:17:09 +02:00 |
|
scrawl
|
8c44334409
|
Merge pull request #1021 from Allofich/weight
Corrections to tooltip displays of zero-weight items
|
2016-08-14 15:14:58 +02:00 |
|
scrawl
|
2f6075329b
|
Clang warning fixes
|
2016-08-14 15:10:50 +02:00 |
|
Allofich
|
a381a15b19
|
Make loopgroup loop correct number of times
|
2016-08-14 21:57:06 +09:00 |
|
Allofich
|
7bf04b5014
|
Allow showing value of zero-weight lights
|
2016-08-14 21:15:22 +09:00 |
|
Allofich
|
502a26a7ff
|
Use getWeightString() to avoid casting to int
|
2016-08-14 19:38:53 +09:00 |
|
Allofich
|
4f5d676b4e
|
Allow weight tooltips for gold and keys if not 0
|
2016-08-14 19:32:43 +09:00 |
|
Allofich
|
caf025f93d
|
Don't show 0 weight tooltips except for potions
|
2016-08-14 19:27:59 +09:00 |
|
Allofich
|
cf7278f8ae
|
Don't show weight tooltip for 0-weight equipment
|
2016-08-14 18:37:41 +09:00 |
|
Allofich
|
ee2702087c
|
Make zero-weight boots play light boot footsteps
|
2016-08-14 17:27:47 +09:00 |
|
scrawl
|
f3f02fe154
|
Merge pull request #1019 from Allofich/bound
Don't allow re-casting of bound equipment spells
|
2016-08-13 21:02:32 +02:00 |
|
Allofich
|
d617651307
|
Don't allow re-casting of bound equipment spells
|
2016-08-14 02:05:23 +09:00 |
|
MiroslavR
|
ddbfe0c944
|
Fix disabled door markers appearing on the map (Fixes #3348)
|
2016-08-12 03:14:36 +02:00 |
|
Allofich
|
cb9bb92b26
|
Play locked sounds on locked objects instead of actors
|
2016-08-10 21:31:14 +09:00 |
|
Allofich
|
83b715734f
|
Move part of addGlow() to addSpellCastGlow()
|
2016-08-10 02:52:43 +09:00 |
|
Allofich
|
1c76c93ed8
|
Use raw pointer to node in glowupdater
|
2016-08-10 01:35:22 +09:00 |
|
Allofich
|
67f31d948e
|
Add removeTexture method
|
2016-08-10 01:11:14 +09:00 |
|
Allofich
|
4b9aff7a03
|
Glowupdater fix when using shaders
|
2016-08-10 00:43:14 +09:00 |
|
Allofich
|
9b2cb2fb8c
|
Cleanups
|
2016-08-10 00:25:33 +09:00 |
|
Allofich
|
775162ccdf
|
Rewrite spell glow implementation
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
cad41599cf
|
Fix travis build error and warnings
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
1910128e9c
|
Don't remove uniform when spell glow ends
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
35c14bb9bb
|
Minor rewrite, make "open" spells play glow effect
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
e132b52a69
|
Handle spell glows within updatecallback
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
123c626f2d
|
Add glow when using telekinesis on doors
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
57138b416e
|
Fix spell glows to only run one at a time
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
3841a8fb40
|
Make non-actors glow when they cast spells
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
dca7b4beb7
|
Make non-actors also play spell casting sounds
|
2016-08-09 22:56:53 +09:00 |
|
Marc Zinnschlag
|
a563a9d336
|
added missing Q_OBJECT
|
2016-08-09 10:21:37 +02:00 |
|
Marc Zinnschlag
|
96fd9263bf
|
Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'
|
2016-08-09 10:17:26 +02:00 |
|
Aesylwinn
|
448c9d5a5b
|
Fix globals not being initialized with a valid type.
|
2016-08-09 00:17:41 -04:00 |
|
scrawl
|
0bbd715f65
|
Fix the cloned StateSet not being assigned
|
2016-08-09 01:13:19 +02:00 |
|
scrawl
|
5190275b37
|
Merge pull request #993 from mrcheko/pathfinding
Pathfinding unification
|
2016-08-09 00:41:03 +02:00 |
|
Aesylwinn
|
0963adb2f4
|
Fix pointer being deleted twice.
|
2016-08-08 14:36:50 -04:00 |
|
scrawl
|
46538b9438
|
Merge pull request #1011 from devnexen/master
Mainly making compilable under OpenBSD.
|
2016-08-07 20:34:03 +02:00 |
|
mrcheko
|
e2cd87fcc7
|
fix veritcal aiming
|
2016-08-07 19:23:08 +03:00 |
|
Marc Zinnschlag
|
aa1ed9b172
|
Merge remote-tracking branch 'aesylwinn/RenderWater'
|
2016-08-07 17:03:58 +02:00 |
|