samcake
0f39934ec3
Merge branch 'master' of https://github.com/highfidelity/hifi into green
2016-11-08 14:52:21 -08:00
samcake
a4e75b4dcf
FIx an obvious mistake, good catch MR Zappoman
2016-11-08 14:51:48 -08:00
Howard Stearns
666d2dd2fc
Merge pull request #9031 from davidkelly/dk/2178
...
Log snapshot upload and user story creation errors
2016-11-08 12:11:16 -08:00
Howard Stearns
0a56f7c4fe
Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt
...
fix numeric keyboard for hmd Window.prompt
2016-11-08 12:05:13 -08:00
Dante Ruiz
4b087a2718
fixed unable to remove menus from vrmenu context
2016-11-08 12:03:53 -08:00
Dante Ruiz
7f355c48b1
saving work progress
2016-11-08 12:03:53 -08:00
Ryan Huffman
5dab2ac2a7
Add margin to left and right side of users.js
2016-11-08 09:47:09 -08:00
Ryan Huffman
284b458148
Increase margin at bottom of users.js
2016-11-08 09:46:47 -08:00
David Kelly
1766ebab2c
Added a bit more logging
2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub
5454dca82e
Merge pull request #9030 from highfidelity/stable
...
Update master with Stable hotfix
2016-11-07 18:48:54 -08:00
David Kelly
3105299670
Log snapshot upload and user story creation errors
...
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
2016-11-07 18:13:10 -08:00
Chris Collins
31ff26368d
Merge pull request #9029 from highfidelity/hotfix-steam-auto-updater
...
Disable Sandbox auto-update popup when the application is running from Steam
2016-11-07 17:21:19 -08:00
Chris Collins
4700c80e38
Merge pull request #9003 from hyperlogic/feature/skeleton-dump-tool
...
Added tools/skeleton-dump tool
2016-11-07 16:17:43 -08:00
Chris Collins
eec8e2f19b
Merge pull request #9000 from samcake/punk
...
Add Frame Timing and GPU memory to the Stats and user activity log
2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e
Disable updater on Steam
2016-11-07 16:09:56 -08:00
samcake
86a569651c
Add more precuation when extracting the opengl version in the openGLVersionChecker to avoid crashing
2016-11-07 14:45:26 -08:00
Seth Alves
773529c799
Merge pull request #9023 from Atlante45/sandbox
...
Force sandbox config saves
2016-11-07 13:40:30 -08:00
Seth Alves
42d13f7e77
Merge pull request #9024 from huffman/fix/userdata-showing-old-data
...
Fix userData in edit.js sometimes showing wrong value when locked
2016-11-07 13:37:03 -08:00
Seth Alves
24556fc70d
Merge pull request #8980 from huffman/feat/default-to-hmd
...
Update interface to default to HMD display plugin
2016-11-07 13:36:39 -08:00
Seth Alves
c8a654a915
Merge pull request #9006 from Atlante45/logging
...
Logging improvements
2016-11-07 13:35:13 -08:00
Clément Brisset
11720c6ad8
Merge pull request #9025 from huffman/feat/udpate-tutorial-firecracker-audio
...
Decrease the volume of the tutorial firecracker
2016-11-07 12:51:33 -08:00
Ryan Huffman
e3941617c1
Decrease the volume of the tutorial firecracker
2016-11-07 11:43:29 -08:00
Ryan Huffman
c4f35bf7bf
Fix userData in edit.js sometimes showing wrong value when locked
2016-11-07 11:39:36 -08:00
Atlante45
3c76dad454
Force sandbox config saves
2016-11-07 10:42:59 -08:00
Andrew Meadows
5c6ab5d0c3
Merge pull request #9016 from humbletim/script-retry-improvements
...
Prevent Script retries when HTTP errors are irrecoverable
2016-11-07 09:34:38 -08:00
Dante Ruiz
e22c36b4b7
fixed menu pop up delay
2016-11-07 17:16:24 +00:00
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
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
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
