Siana Gearz c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

2012-08-09 02:11:14 +02:00

..

CMakeLists.txt

…

llanimationstates.cpp

…

llanimationstates.h

…

llbvhconsts.h

…

llbvhloader.cpp

Removed exportFileXML, and importXML, updated indra/test's

2012-07-03 10:07:14 -04:00

llbvhloader.h

…

llcharacter.cpp

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llcharacter.h

Emerald physics cleanup. Removed unused cruft. Disabling by default since it never worked (although it does now if set to enabled).

2012-06-18 14:50:39 -05:00

lleditingmotion.cpp

…

lleditingmotion.h

…

llgesture.cpp

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

2012-02-16 12:00:38 -06:00

llgesture.h

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

2012-02-16 12:00:38 -06:00

llhandmotion.cpp

…

llhandmotion.h

…

llheadrotmotion.cpp

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00

llheadrotmotion.h

…

lljoint.cpp

…

lljoint.h

…

lljointsolverrp3.cpp

…

lljointsolverrp3.h

…

lljointstate.h

…

llkeyframefallmotion.cpp

…

llkeyframefallmotion.h

…

llkeyframemotion.cpp

STORM-1870 and Have a space before old names in parentheses, like V3.

2012-06-09 17:07:20 -04:00

llkeyframemotion.h

…

llkeyframemotionparam.cpp

…

llkeyframemotionparam.h

…

llkeyframestandmotion.cpp

…

llkeyframestandmotion.h

…

llkeyframewalkmotion.cpp

…

llkeyframewalkmotion.h

…

llmotion.cpp

…

llmotion.h

…

llmotioncontroller.cpp

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llmotioncontroller.h

…

llmultigesture.cpp

V3 merge pt 2 / 2

2012-04-13 23:24:39 -05:00

llmultigesture.h

V3 merge pt 2 / 2

2012-04-13 23:24:39 -05:00

llpose.cpp

…

llpose.h

…

llstatemachine.cpp

…

llstatemachine.h

…

lltargetingmotion.cpp

…

lltargetingmotion.h

…

llvisualparam.cpp

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

2012-02-16 12:00:38 -06:00

llvisualparam.h

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00