Ryan Huffman
710e038737
Merge pull request #9018 from ctrlaltdavid/21098
...
Display "content loading" while there are pending GPU texture transfers
2016-11-07 09:09:30 -08:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Brad Hefta-Gaub
4d1fed7dfa
Merge pull request #9019 from highfidelity/stable
...
Stable to master
2016-11-06 16:59:22 -08:00
David Rowe
852218815b
Display "content loading" while there are pending GPU texture transfers
2016-11-07 13:40:49 +13:00
humbletim
28eadc149f
switch to apply normalizeURL only and move to top of for loop
2016-11-06 16:08:42 -05:00
humbletim
144983a943
Merge remote-tracking branch 'upstream/master' into script-retry-improvements
2016-11-06 11:36:50 -05:00
Seth Alves
e9194619bd
Merge pull request #9013 from huffman/fix/max-retry-blocked
...
Fix failed script includes from locking the ScriptEngine up
2016-11-06 08:29:24 -08:00
humbletim
61452c21a2
bail early from irrecoverable retry situations
2016-11-06 10:31:28 -05:00
humbletim
2139e979da
map specific HTTP errors to corresponding ResourceRequest enums
2016-11-06 10:31:02 -05:00
Seth Alves
51f6b5af78
code review
2016-11-05 10:35:21 -07:00
Ryan Huffman
1a704f8d0a
Fix ScriptCacheSignalProxy not being properly cleaned up
2016-11-05 10:16:35 -07:00
Ryan Huffman
5287ec1eee
Fix includes hitting max retries locking the script up
2016-11-05 10:15:56 -07:00
Ryan Huffman
d108d2fa70
Merge pull request #8999 from hyperlogic/feature/atp-extract
...
Add tools/atp-extract.py
2016-11-04 19:44:49 -07:00
Brad Hefta-Gaub
25b9b97609
Merge pull request #9004 from highfidelity/rc-26
...
Beta Release 26 - Includes up to Developer Release 5648
2016-11-04 19:34:04 -07:00
sam
bcef138545
FIx the context stats
2016-11-04 18:59:30 -07:00
Anthony J. Thibault
620fd3713c
Add color support to debug draw marker rendering
2016-11-04 17:09:25 -07:00
howard-stearns
84eb1721e7
fix numeric keyboard for hmd Window.prompt
2016-11-04 17:02:14 -07:00
samcake
f274ef1a59
Merging back with upstream and trying to fix counter for them to be more stable
2016-11-04 16:56:03 -07:00
samcake
e12040a98a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-04 14:54:18 -07:00
Brad Hefta-Gaub
e763082afc
Merge pull request #9001 from davidkelly/dk/useKilledNode
...
Seems we were not deleting the right hrtfs when a node is killed
2016-11-04 14:34:52 -07:00
Brad Hefta-Gaub
2684aed523
Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion
...
normalize quaternions submitted to C++ from JS
2016-11-04 14:34:42 -07:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
Anthony J. Thibault
69fc048e5e
typo fixes in license comments
2016-11-04 14:03:59 -07:00
Anthony J. Thibault
1732448d3c
Added tools/skeleton-dump tool
...
Debug tool that prints out the skeleton hierarchy of fbx files including joint indices, bindPose and defaultPoses.
The verbose option also prints the full FBX transformation set, pre/post rotations etc.
2016-11-04 13:52:16 -07:00
samcake
449add6b34
Fix bad variable initialization
2016-11-04 13:29:27 -07:00
David Kelly
21d1f40f59
Seems we were not deleting the right hrtfs when a node is killed
...
Simple fix, just make sure we delete the hrtfs associated with the
killedNode. The test is to delete some nodes (agents) and make sure
nothing bad happens to audio mixer, or the audio itself.
2016-11-04 13:15:02 -07:00
Ryan Huffman
0cec62b3a3
Revert "Update interface to default to HMD display plugin"
...
This reverts commit bbef071723
2016-11-04 12:27:15 -07:00
Ryan Huffman
0dac2c999e
Revert "Remove unused 'first' variable"
...
This reverts commit 26e0d02d60
2016-11-04 12:27:04 -07:00
Ryan Huffman
3ad9c1a797
Add check to go into HMD on first run if available
2016-11-04 12:26:20 -07:00
samcake
76aa541d4a
Adding the frame gpu and batch timer
2016-11-04 11:49:52 -07:00
Seth Alves
689fdfb35f
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:42:31 -07:00
Brad Hefta-Gaub
9a774553ae
Merge pull request #8998 from AndrewMeadows/ellipsoids-sorta
...
use ConvexHull shape for irregular "spheres"
2016-11-04 11:39:32 -07:00
Anthony J. Thibault
38a2ce67bb
Add tools/atp-extract.py
...
Tool to list and extract files from the atp assets directory.
2016-11-04 11:23:10 -07:00
Andrew Meadows
836aad7d0b
Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it
...
raise desktop when showing it
2016-11-04 10:45:05 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
samcake
3db1831841
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2016-11-04 09:59:28 -07:00
samcake
7655f906f1
Starting adding a timer for the frame
2016-11-03 19:26:30 -07:00
Andrew Meadows
4b623f72c3
compute correct volume for ellipsoid
2016-11-03 18:05:50 -07:00
Andrew Meadows
0d2cec290d
use convexHull for ellipsoidal "spheres"
2016-11-03 17:56:38 -07:00
Andrew Meadows
3ed3a74b7d
oops, don't forget to remove the sqrt
2016-11-03 17:08:42 -07:00
howard-stearns
c5ee1941d1
raise desktop when showing it
2016-11-03 17:02:47 -07:00
Andrew Meadows
c9c0b9ebc4
tighten rejection of zero-length quaternions
2016-11-03 17:01:09 -07:00
Brad Hefta-Gaub
7cca8f0a66
Merge pull request #8993 from samcake/blue
...
Prevent sparse texture on AMD gpus for now
2016-11-03 16:48:52 -07:00
Brad Hefta-Gaub
4b1034a5e6
Merge pull request #8994 from ZappoMan/reduceTextureMax
...
more conservative texture memory budget
2016-11-03 16:30:04 -07:00
samcake
4f0f64e2b5
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2016-11-03 16:26:50 -07:00
Andrew Meadows
757ec5fff4
normalize quaternions submitted from scriptland
2016-11-03 16:02:39 -07:00
samcake
1086585559
fixing the test to actually capture ati correctly and add the report to the ui
2016-11-03 15:15:05 -07:00
David Kelly
388c1c8efe
Merge pull request #8966 from davidkelly/dk/noMoAgentAudioStreams
...
Send KillAvatar message to AudioMixer
2016-11-03 14:51:14 -07:00
David Rowe
d1e54a9217
Fix Clara download failing if move mouse after initiating download
2016-11-04 10:49:16 +13:00
