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 |
|
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 |
|
Zach Fox
|
9a22c29788
|
Get ready for merge
|
2016-11-03 11:20:08 -07:00 |
|
Zach Fox
|
e9e1d0cb2f
|
Remove erroneous exclamation mark
|
2016-11-03 11:10:32 -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 |
|
Zach Fox
|
b74c1d3476
|
tabs to spaces
|
2016-11-03 10:42:15 -07:00 |
|
Zach Fox
|
a12e0325bf
|
Making progress...
|
2016-11-03 10:39:55 -07:00 |
|
howard-stearns
|
f3d4821579
|
constrain toolbar based on setting. (ui for settings to come.)
|
2016-11-03 10:39:53 -07:00 |
|
Brad Hefta-Gaub
|
b1582b474b
|
Merge pull request #8986 from humbletim/allow-acscript-atp-uploads
allow assignment client scripts to create ATP assets
|
2016-11-03 10:10:37 -07:00 |
|
Seth Alves
|
339d6a55cf
|
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
|
2016-11-03 10:06:07 -07:00 |
|
Brad Hefta-Gaub
|
8fab554c55
|
Merge pull request #8967 from samcake/red
Fix the reported amount of GPU memory physically available for GPPU with video mem larger than 4Gb
|
2016-11-03 09:48:02 -07:00 |
|
Seth Alves
|
1d0c3d7168
|
fix checker for unreasonable size of vector of bools
|
2016-11-03 09:47:24 -07:00 |
|