Seth Alves
|
59d88cb564
|
Merge pull request #10941 from sethalves/audio-injector-smart-pointers
Audio injector smart pointers
|
2017-07-13 11:00:02 -07:00 |
|
utkarshgautamnyu
|
35f97837e7
|
ensured clean install state is not saved in the registry
|
2017-07-13 10:50:14 -07:00 |
|
Dante Ruiz
|
b46dc7d389
|
removed space
|
2017-07-13 18:42:26 +01:00 |
|
Dante Ruiz
|
3cbfd4c917
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
|
2017-07-13 18:40:54 +01:00 |
|
Dante Ruiz
|
070db2922d
|
fixed warning compile error
|
2017-07-13 18:40:38 +01:00 |
|
David Kelly
|
60751f07bd
|
Merge pull request #10961 from davidkelly/dk/hmdPreviewFix
hmd preview fix
|
2017-07-13 10:32:33 -07:00 |
|
Andrew Meadows
|
01bbd8d89d
|
Merge pull request #10950 from samcake/hobbes
add custom shape pipeline, use for Polyvox and Particle system entities
|
2017-07-13 10:16:46 -07:00 |
|
Brad Hefta-Gaub
|
b063c2f45d
|
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
Cleanup OctreeSendThread::packetDistributor()
|
2017-07-13 09:58:28 -07:00 |
|
Seth Alves
|
463316e66d
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-13 09:17:03 -07:00 |
|
NeetBhagat
|
11f8f5cffc
|
Solve : implicit conversion from ‘float’ to ‘double’ issue
|
2017-07-13 18:26:52 +05:30 |
|
Sam Gateau
|
1557b985c4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
|
2017-07-13 09:30:33 +02:00 |
|
Sam Gateau
|
b065b99b0b
|
fix linux compilation maybe
|
2017-07-13 09:30:04 +02:00 |
|
Seth Alves
|
85d0b68284
|
try again on putting result of Avatar::getJointNames in index order
|
2017-07-12 20:36:37 -07:00 |
|
Seth Alves
|
44de1dd2be
|
put result of Avatar::getJointNames back in index-order
|
2017-07-12 19:25:39 -07:00 |
|
Zach Fox
|
a6ae50fcd9
|
Merge pull request #10958 from zfox23/spectatorCamera_CameraFacesYou
Spawn the Spectator Camera facing the user; New icons; Sound
|
2017-07-12 16:59:49 -07:00 |
|
David Kelly
|
4b3cf5ee2e
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix
|
2017-07-12 16:50:51 -07:00 |
|
David Kelly
|
88a449c1af
|
Fixes hmd preview when resizing
|
2017-07-12 16:49:26 -07:00 |
|
Zach Fox
|
dc1b4b5324
|
New icons
|
2017-07-12 16:48:04 -07:00 |
|
Zach Fox
|
a4d95f9bf8
|
Play sound when turning camera on
|
2017-07-12 16:39:56 -07:00 |
|
utkarshgautamnyu
|
902705297f
|
indentation fix
|
2017-07-12 16:28:21 -07:00 |
|
Zach Fox
|
6237b5fc0a
|
Camera faces you, but offset
|
2017-07-12 16:24:56 -07:00 |
|
Zach Fox
|
b5a1c65622
|
New model, smaller filesize
|
2017-07-12 16:10:20 -07:00 |
|
utkarshgautamnyu
|
d6ac67d221
|
Added option for clean install
|
2017-07-12 16:09:30 -07:00 |
|
Zach Fox
|
aab04042b2
|
Merge pull request #10960 from zfox23/spectatorCamera_MarketplacePreparation
Spectator camera marketplace preparation
|
2017-07-12 16:02:47 -07:00 |
|
Zach Fox
|
5f50f29060
|
New model
|
2017-07-12 15:56:39 -07:00 |
|
Zach Fox
|
8294df8b76
|
!= to !==
|
2017-07-12 15:37:06 -07:00 |
|
Zach Fox
|
e6f7457d0c
|
Fixes
|
2017-07-12 15:17:23 -07:00 |
|
Clément Brisset
|
d346b1c68f
|
Merge pull request #10924 from Atlante45/fix/debug-asserts
Misc servers debug asserts fixes
|
2017-07-12 15:05:15 -07:00 |
|
Zach Fox
|
d37789234d
|
Remove from default scripts
|
2017-07-12 14:37:57 -07:00 |
|
Zach Fox
|
63b0e70833
|
Prepare for marketplace submission
|
2017-07-12 14:19:08 -07:00 |
|
Zach Fox
|
8553277c56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-12 14:18:50 -07:00 |
|
Cain Kilgore
|
43782a29c7
|
Avatar Scaler - WIP
|
2017-07-12 22:04:58 +01:00 |
|
Seth Alves
|
06618e81d0
|
remove unneeded <>
|
2017-07-12 13:14:32 -07:00 |
|
Dante Ruiz
|
e07b067d7b
|
fixed tablet getting in the wrong state
|
2017-07-12 21:09:54 +01:00 |
|
Seth Alves
|
59ad3d50ec
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-12 12:45:58 -07:00 |
|
Seth Alves
|
ddf2312dc6
|
code review
|
2017-07-12 12:45:52 -07:00 |
|
Zach Fox
|
d6798c070e
|
Merge pull request #10957 from zfox23/spectatorCamera_noFarClipMagicNumbers
Cleanup; no magic numbers for default cam params
|
2017-07-12 12:35:14 -07:00 |
|
Zach Fox
|
bd4fe416b4
|
Cleanup; no magic numbers for default cam params
|
2017-07-12 12:08:36 -07:00 |
|
Zach Fox
|
34d0363ae5
|
Merge pull request #10955 from zfox23/spectatorCamera_farClipDistance
Make far clip plane distance equal to main camera's
|
2017-07-12 11:37:43 -07:00 |
|
Zach Fox
|
9fe6fbd811
|
View frustums are strange.
|
2017-07-12 11:37:18 -07:00 |
|
Stephen Birarda
|
d347eab42c
|
Merge pull request #10952 from highfidelity/revert-10922-revert-10835-bug/invisible-avatars
Revert "Revert "fix for invisible avatars after radius ignore""
|
2017-07-12 11:20:16 -07:00 |
|
utkarshgautamnyu
|
6b969bc39d
|
added code to record total number of ATP/HTTP/File bytes downloaded during session
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update Application.cpp
Update Application.cpp
|
2017-07-12 11:13:13 -07:00 |
|
Andrew Meadows
|
364600c447
|
fix rendering of simulation ownership debug icons
|
2017-07-12 11:12:47 -07:00 |
|
Brad Davis
|
0e9f8cc103
|
Still trying to address QML crashes
|
2017-07-12 11:04:33 -07:00 |
|
Zach Fox
|
79cf242fc9
|
Make far clip plane distance equal to main camera's
|
2017-07-12 10:51:14 -07:00 |
|
Atlante45
|
b3d73fd0df
|
Add comments to DebugDraw instanciation
|
2017-07-12 10:39:15 -07:00 |
|
Stephen Birarda
|
f6d9a79fb5
|
Revert "Revert "fix for invisible avatars after radius ignore""
|
2017-07-12 10:36:53 -07:00 |
|
Dante Ruiz
|
12206cf711
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
|
2017-07-12 16:56:25 +01:00 |
|
Ken Cooke
|
77705c5ffa
|
Merge pull request #10948 from Tingjin/Tingjin-V1
Change AudioDevices.cpp
|
2017-07-12 08:38:06 -07:00 |
|
Sam Gateau
|
5394ac8672
|
Cleaning up changes, removing comments and dead code etc...
|
2017-07-12 17:33:05 +02:00 |
|