David Rowe
8cceda1cfe
Tidy UI text
2016-11-08 13:23:44 +13:00
David Rowe
afd2a900a3
Improve error handling for case that don't have permissions
2016-11-08 13:22:50 +13:00
David Rowe
090065ee34
Add user feedback on download process
2016-11-08 13:05:35 +13:00
David Rowe
d33ac21aaa
Merge branch 'master' into 21089
2016-11-08 08:23:10 +13: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
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
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
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
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
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
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
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
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
Clément Brisset
00a94bdd6d
Merge pull request #8974 from huffman/feat/help-select-xbox-tab
...
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-03 14:42:23 -07:00
samcake
ce89f811f3
better loggin of the sparse switch
2016-11-03 14:35:44 -07:00
samcake
4104aa6286
avoid warning?
2016-11-03 14:31:28 -07:00
Brad Hefta-Gaub
206f1ead1a
Merge pull request #8990 from howard-stearns/centered-toolbar
...
centered toolbar
2016-11-03 14:18:32 -07:00
Brad Hefta-Gaub
c1841f9add
more conservative texture memory budget
2016-11-03 14:10:07 -07:00
Ryan Huffman
687605ad38
Add proper adding and removal of subdeviceNames in SDL2Manager after startup
2016-11-03 14:02:58 -07:00
Ryan Huffman
413199459b
Fix the name searched for in isViveControllerAvailable
2016-11-03 14:02:18 -07:00
Ryan Huffman
625c98820d
Fix isSubdeviceContainingNameAvailable
2016-11-03 14:01:52 -07:00
Howard Stearns
54f7ab271e
Merge pull request #8977 from howard-stearns/use-snapshot-data-from-file
...
Use snapshot data from file
2016-11-03 13:55:20 -07:00
Brad Hefta-Gaub
961e17bc48
Merge pull request #8989 from sethalves/fix-polyvox-bitrot
...
fix a couple of minor polyvox problems
2016-11-03 13:43:52 -07:00
Brad Hefta-Gaub
f10e43d148
Merge pull request #8992 from AndrewMeadows/fix-autoresize
...
fix autoresize of Entities.addEntity() and fix Quat.lookAtSimple()
2016-11-03 13:41:47 -07:00
howard-stearns
b6e440f891
delete this and formatting
2016-11-03 13:26:50 -07:00
David Kelly
920cd90afa
CR feedback
2016-11-03 13:23:05 -07:00
howard-stearns
7c45a78cb0
Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file
2016-11-03 13:17:47 -07:00
samcake
6a39ad3b5a
Prevent sparse texture on AMD gpus for now
2016-11-03 13:01:41 -07:00
howard-stearns
3a072b5bf9
tell desktop about preference changes
2016-11-03 12:17:28 -07:00
howard-stearns
6aad78c8e8
Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar
2016-11-03 11:23:47 -07:00
