Andrew Meadows
|
d3956b47d0
|
remove bad break
|
2017-05-19 15:35:29 -07:00 |
|
Andrew Meadows
|
bb4d366c40
|
use SmartPointer for Zone _model
|
2017-05-19 15:33:23 -07:00 |
|
Ryan Huffman
|
daff53aefb
|
Merge pull request #10505 from huffman/feat/tutorial-update-skybox
Update content set URL for RC40
|
2017-05-19 15:32:27 -07:00 |
|
David Rowe
|
0d6513c7dc
|
Merge branch 'master' into 21359
|
2017-05-20 10:11:25 +12:00 |
|
Ryan Huffman
|
26247e8653
|
Add check for valid mutableData in assignMipData
|
2017-05-19 15:00:53 -07:00 |
|
Sam Gateau
|
36ac623e66
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-19 13:25:36 -07:00 |
|
Andrew Meadows
|
7b879a7964
|
Model has a Rig rather than a RigPointer
|
2017-05-19 13:24:16 -07:00 |
|
Zach Fox
|
5e8f120138
|
Merge pull request #10510 from zfox23/snapshots_ImproveUploadRobustness
Ensure snapshots without story_ids get uploaded
|
2017-05-19 11:57:21 -07:00 |
|
Ryan Huffman
|
64bf5784e6
|
Fix FileStorage to not close files after they are opened
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
|
2017-05-19 11:16:20 -07:00 |
|
Ryan Huffman
|
c36b85bb05
|
Add notes to KtxStorage::maybeOpenFile
|
2017-05-19 11:11:00 -07:00 |
|
Anthony J. Thibault
|
6ae2e6778e
|
ensure left and right arm flexCoeff are the same.
|
2017-05-19 10:51:09 -07:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
Anthony J. Thibault
|
621d94eb91
|
removed temp comments
|
2017-05-19 10:38:16 -07:00 |
|
Zach Fox
|
6765451cc8
|
Ensure snapshots without story_ids get uploaded
|
2017-05-19 10:36:31 -07:00 |
|
Marko Kudjerski
|
986d63cdbb
|
making sure that the first time landing in *welcome domain is updated for dev builds too
|
2017-05-19 10:17:02 -07:00 |
|
Marko Kudjerski
|
303bb05b3d
|
changing the location in welcome to which a user is sent on the first run
|
2017-05-19 10:17:02 -07:00 |
|
Chris Collins
|
76a025aade
|
Merge pull request #10507 from Atlante45/merge-back
Merge Stable back into master
|
2017-05-19 06:58:10 -07:00 |
|
Atlante45
|
ee9b98ffd7
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-18 17:11:45 -07:00 |
|
Ryan Huffman
|
eb9acad42e
|
Update content set URL for RC40
|
2017-05-18 16:36:01 -07:00 |
|
Anthony J. Thibault
|
e99001d86c
|
debug draw ik chains, bug fix for flex coef on tips
And opened up hip constraints.
|
2017-05-18 16:29:55 -07:00 |
|
Zach Fox
|
48200fbd07
|
Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing
Prevent another GIF from being captured while one is processing
|
2017-05-18 15:53:57 -07:00 |
|
Ryan Huffman
|
72af4219b8
|
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
Fix ktx image size in progrssively loaded cubemaps
|
2017-05-18 15:26:52 -07:00 |
|
Andrew Meadows
|
17b6cf29df
|
check for valid resource pointer before use
|
2017-05-18 15:12:59 -07:00 |
|
Chris Collins
|
625bcdfd7e
|
Merge pull request #10498 from highfidelity/RC-39.3-HOTFIX
Build 39.3 Hotfix for T-Pose avatars
|
2017-05-18 14:57:57 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Zach Pomerantz
|
c5a0a1af2f
|
Merge pull request #10429 from zzmp/audio/close-device
Close audio device when switching outputs
|
2017-05-18 17:18:53 -04:00 |
|
Clément Brisset
|
55b5f08714
|
Merge pull request #10465 from Atlante45/fix/domain-settings
Fix domain settings not getting cleared on re-assignment
|
2017-05-18 14:16:35 -07:00 |
|
David Rowe
|
3aebe96afe
|
Merge branch 'master' into 21359
|
2017-05-19 09:03:11 +12:00 |
|
David Rowe
|
602e04dc60
|
Remove temporary fix
|
2017-05-19 09:02:23 +12:00 |
|
Atlante45
|
9044cb40d5
|
Compress Default Skybox with BC7
|
2017-05-18 13:13:40 -07:00 |
|
Atlante45
|
a8b1a29a4a
|
Add support for BC7 compression
|
2017-05-18 13:11:41 -07:00 |
|
Sam Gateau
|
a9fcdce95a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-18 13:08:35 -07:00 |
|
Sam Gateau
|
b8a2b38fd5
|
Displaying the stack of zone components
|
2017-05-18 12:54:25 -07:00 |
|
David Kelly
|
df5928c04a
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-18 11:47:53 -07:00 |
|
David Kelly
|
1fcf3b3a5f
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 11:47:44 -07:00 |
|
Zach Fox
|
8213a1b280
|
First pass - checking performance
|
2017-05-18 11:47:27 -07:00 |
|
howard-stearns
|
7ec073dce4
|
Ensure avatar identity packet at mixer.
|
2017-05-18 11:47:07 -07:00 |
|
Ryan Huffman
|
6d2d838510
|
Fix ktx image size in progrssively loaded cubemaps
The size being written was the full image size (size of all faces), when
it should have been the face size.
|
2017-05-18 11:46:14 -07:00 |
|
Anthony J. Thibault
|
87adeb0565
|
apply flexCoeff to tip of joint chain as well.
|
2017-05-18 11:26:49 -07:00 |
|
Anthony J. Thibault
|
abe19310da
|
WIP: checkpoint of ik changes
|
2017-05-18 11:26:48 -07:00 |
|
Andrew Meadows
|
8d3285f733
|
verify _rig is valid in Model::deleteGeometry()
|
2017-05-18 11:11:50 -07:00 |
|
David Kelly
|
c2b140cc03
|
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 10:09:42 -07:00 |
|
Sam Gateau
|
d9ad45bf4a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-18 09:37:04 -07:00 |
|
Brad Hefta-Gaub
|
fbc32e5ba1
|
Merge pull request #10485 from samcake/orange
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-18 08:47:58 -07:00 |
|
Chris Collins
|
9dcb3a3845
|
Merge pull request #10495 from highfidelity/RC-39.2-Hotfix
Build 39.1 Hotfix for 30 second wifi check causing an issue with Audio
|
2017-05-18 05:39:44 -07:00 |
|
Sam Cake
|
5edcc38eba
|
Polishing the scope shaders
|
2017-05-18 01:06:59 -07:00 |
|
David Rowe
|
017f5f5781
|
Temporary fix for recordings not playing back properly
|
2017-05-18 16:54:32 +12:00 |
|
David Rowe
|
f6c1fa4213
|
Merge branch 'master' into 21359
|
2017-05-18 16:40:20 +12:00 |
|
Brad Hefta-Gaub
|
014fd710de
|
Merge pull request #10490 from Atlante45/feat/settings-map
Enable Map/List storage in the settings
|
2017-05-17 21:24:04 -07:00 |
|
Brad Hefta-Gaub
|
e0b264cfd5
|
Merge pull request #10494 from sethalves/fix-nana
fix nan
|
2017-05-17 21:22:17 -07:00 |
|