Anthony J. Thibault
778521f664
Improvement to bone link rendering when bones are large.
2015-08-27 10:21:23 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Brad Hefta-Gaub
87c604a475
Merge pull request #5655 from jherico/sideshow-bob
...
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 16:44:35 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33
Merge pull request #5646 from birarda/ds-cleanup
...
de-bloat the domain-server by adding a gatekeeper
2015-08-26 15:42:43 -07:00
Brad Hefta-Gaub
cd2cd90d8f
Merge pull request #5664 from sethalves/quiet-obj-reader
...
ifdef out debug prints in OBJ reader
2015-08-26 15:32:17 -07:00
Seth Alves
f53704051f
ifdef out debug prints in OBJ reader
2015-08-26 15:09:58 -07:00
Stephen Birarda
cd7d0f383b
allow editors who can't be verified in the short term
2015-08-26 15:07:29 -07:00
Seth Alves
d2eb3108d5
Merge pull request #5644 from howard-stearns/eye-correction-application
...
eye correction correction
2015-08-26 14:46:48 -07:00
Anthony J. Thibault
c1333e16ed
Merge branch 'master' into ajt/new-anim-system
2015-08-26 11:59:03 -07:00
Anthony Thibault
b5bfc84521
Merge pull request #5662 from AndrewMeadows/copper
...
fix Vectors::MIN
2015-08-26 11:54:59 -07:00
Andrew Meadows
f857ccfe16
fix Vectors::MIN
2015-08-26 11:46:50 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Brad Hefta-Gaub
aa80fc9127
Merge pull request #5653 from jherico/homer
...
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
b19f1e0631
Merge pull request #5658 from ctrlaltdavid/20653
...
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d
Merge pull request #5657 from birarda/master
...
fix for 0 entity avg ping
2015-08-25 22:27:44 -07:00
Brad Hefta-Gaub
029c59fb77
Merge pull request #5654 from jherico/barney
...
Fix stereo modes aspect ratio
2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3
Merge pull request #5659 from jherico/nelson
...
Fix UserInputMapper event generation
2015-08-25 22:14:37 -07:00
Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63
AnimVariantMap is used in eval, MyAvatar loads avatar.json via url
2015-08-25 20:28:17 -07:00
samcake
fda9827100
Merge pull request #5529 from SeijiEmery/gputest
...
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
073567558e
Fix UserInputMapper event generation
2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
Seiji Emery
d29a368688
removed debug
2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589
try removing quotes...
2015-08-25 16:21:38 -07:00
David Rowe
9d3d104ec3
Add Desktop object to JavaScript with width and height properties
2015-08-25 16:13:36 -07:00
Seiji Emery
248d0729a6
test
2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32
test
2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8
changed setup_project to only use the generated shader source files
2015-08-25 14:40:52 -07:00
Stephen Birarda
c776f04ab2
don't allow in a user who should have edit but not verified
2015-08-25 14:36:22 -07:00
Seiji Emery
316ddd68ef
force cmake autoscribe to use full paths
2015-08-25 13:46:50 -07:00
Stephen Birarda
6f14eb2206
fix for 0 entity avg ping
2015-08-25 12:35:34 -07:00
Clément Brisset
08ee5cbc17
Merge pull request #5656 from howard-stearns/fix-direct-url-avatars
...
fix direct-url avatars
2015-08-25 21:30:05 +02:00
Anthony J. Thibault
496c706bba
Added AnimVariantMap argument to evaluate.
2015-08-25 11:59:24 -07:00
Anthony J. Thibault
62f86e6a46
Added AnimVariant, renamed AnimClipTests to AnimTests.
...
* Added test for AnimVariant.
2015-08-25 11:33:57 -07:00
Howard Stearns
6508d5943a
textChanged has to do something
2015-08-25 11:29:27 -07:00
Stephen Birarda
9940f375ea
repairs for CR comments
2015-08-25 10:02:43 -07:00
Anthony J. Thibault
4bdb00bbc5
Added setCurrentFrame interface to AnimClip.
...
This will recurse the tree and call setCurrentFrameInternal on each node.
This method can be overriden, currently the only meaningful implementation is AnimClip.
2015-08-25 09:58:36 -07:00
Howard Stearns
2ed6900c7e
Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in.
2015-08-25 09:55:04 -07:00
Philip Rosedale
ff3a0480fe
Merge pull request #5652 from birarda/master
...
tweaks to domain-server web interface
2015-08-24 21:36:52 -07:00
Anthony J. Thibault
7a2ca047cb
Added network resource download support to AnimNodeLoader.
2015-08-24 19:00:12 -07:00
Brad Davis
f9f5743fd7
Merge pull request #5650 from ZappoMan/fixCrashInController
...
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00
Stephen Birarda
17befac262
use fixed width for stats tables
2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb
update jquery and bootstrap in DS
2015-08-24 18:02:26 -07:00