Stephen Birarda
77ede81fc9
limit MyAvatar scale to limits from domain settings
2016-11-10 13:27:13 -08:00
Seth Alves
f6318fe619
Merge pull request #9043 from ZappoMan/avatarEntityGreifingVector
...
add support for whitelist entity scripts
2016-11-10 08:17:30 -08:00
Brad Hefta-Gaub
8758e4a9ba
add support for whitelist entity scripts
2016-11-09 19:17:24 -08:00
samcake
f5fd4bf8d1
Merge pull request #9014 from jherico/texture_derez
...
Re-enable downsampling for non-sparse textures
2016-11-09 17:18:03 -08:00
Brad Davis
f7d1b3c823
Fix non-incremental transfers when sparse enabled
2016-11-09 12:13:35 -08:00
Brad Davis
192c72ff99
Update menu, initial state for texture management
2016-11-09 12:09:25 -08:00
Bradley Austin Davis
9e929ca629
Re-enable downsampling for non-sparse textures
2016-11-09 12:09:24 -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
Brad Hefta-Gaub
5454dca82e
Merge pull request #9030 from highfidelity/stable
...
Update master with Stable hotfix
2016-11-07 18:48:54 -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
Seth Alves
c8a654a915
Merge pull request #9006 from Atlante45/logging
...
Logging improvements
2016-11-07 13:35:13 -08:00
humbletim
144983a943
Merge remote-tracking branch 'upstream/master' into script-retry-improvements
2016-11-06 11:36:50 -05: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
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
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
76aa541d4a
Adding the frame gpu and batch timer
2016-11-04 11:49:52 -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
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
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
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
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
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
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
Brad Hefta-Gaub
e1837c90e2
Merge pull request #8991 from sethalves/fix-8981
...
fix QVector<bool> packing when number of joints isn't a multiple of 8
2016-11-03 10:59:06 -07:00
Seth Alves
1d0c3d7168
fix checker for unreasonable size of vector of bools
2016-11-03 09:47:24 -07:00
Andrew Meadows
b7c6922545
proper corner case check for Quat::lookAtSimple()
2016-11-03 09:17:22 -07:00
Andrew Meadows
cd5826e2ce
load model of new entity with unknown dimensions
2016-11-03 09:03:04 -07:00
Seth Alves
cfea3cba9b
guard against heap-overflow in the event of bogus entity network data
2016-11-03 06:54:11 -07:00
