Howard Stearns
|
0f90ba49ba
|
Merge pull request #10090 from howard-stearns/fix-location-node-id-update
restore lost code
|
2017-03-31 13:30:25 -07:00 |
|
howard-stearns
|
5c8b2ba1c3
|
restore lost code
|
2017-03-31 13:28:14 -07:00 |
|
Howard Stearns
|
fc1b2d8bee
|
Merge pull request #10086 from howard-stearns/PAL_v2
update from master to pal
|
2017-03-31 10:51:48 -07:00 |
|
howard-stearns
|
364bfd84bd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-31 10:46:35 -07:00 |
|
Zach Fox
|
4712ec7400
|
Reset pollCount; debug log when expired generated by client
|
2017-03-30 17:02:15 -07:00 |
|
Zach Fox
|
05c34fb3ee
|
Move some things around so ComboBox works (and layout improves)
|
2017-03-30 15:19:19 -07:00 |
|
Zach Fox
|
c24b8b47a9
|
Minor layout changes
|
2017-03-30 14:08:29 -07:00 |
|
Howard Stearns
|
0edbf1fbd9
|
Merge pull request #10044 from howard-stearns/pal-backend-integration
Pal backend integration
|
2017-03-30 12:55:11 -07:00 |
|
Howard Stearns
|
3056bb16a2
|
typo, and delete request on abort/fail
|
2017-03-30 12:40:54 -07:00 |
|
Andrew Meadows
|
76ef2b5d9f
|
Merge pull request #10059 from ZappoMan/addKinectHandRotation
some more kinect work
|
2017-03-30 11:05:44 -07:00 |
|
David Kelly
|
e66c075f8e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-30 10:14:29 -07:00 |
|
samcake
|
73a8ec3e72
|
Merge pull request #10068 from kencooke/audio-debugbuild-fix
Fix the crash in Debug builds
|
2017-03-30 10:12:37 -07:00 |
|
David Kelly
|
348674a267
|
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
bad serialization of Avatar Entity parentID
|
2017-03-30 10:12:19 -07:00 |
|
Ken Cooke
|
69863dd735
|
Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*
|
2017-03-30 08:52:04 -07:00 |
|
Howard Stearns
|
af25e0e21f
|
Don't consider changes to location details as update-worthy if we're not discoverable.
|
2017-03-29 17:55:57 -07:00 |
|
Zach Fox
|
4887081e2c
|
New PAL colors; slight layout changes
|
2017-03-29 16:30:24 -07:00 |
|
Howard Stearns
|
3a7edebb94
|
Adjust reporting of availability to metaverse.
|
2017-03-29 16:12:50 -07:00 |
|
Seth Alves
|
5375b87297
|
Merge pull request #10058 from hyperlogic/bug-fix/toolbar-hiding-woes
Fix for disappearing toolbar after reload all scripts
|
2017-03-29 16:04:37 -07:00 |
|
Zach Fox
|
a6ff3fcdb7
|
Tablet PAL bugfix; Connections help text v1
|
2017-03-29 15:47:19 -07:00 |
|
Zach Fox
|
1b74576259
|
Fix tablet-close behavior for PAL; remove users-tablet.js
|
2017-03-29 14:53:45 -07:00 |
|
ZappoMan
|
047a3b8d71
|
add debugging
|
2017-03-29 14:51:42 -07:00 |
|
ZappoMan
|
a4d1db1aeb
|
tweak
|
2017-03-29 14:40:47 -07:00 |
|
ZappoMan
|
4ed5219b57
|
add a sample script to drive feet
|
2017-03-29 14:36:27 -07:00 |
|
Anthony J. Thibault
|
332dfa098f
|
Fix for disappearing toolbar after reload all scripts
|
2017-03-29 14:10:26 -07:00 |
|
ZappoMan
|
6f2f80e334
|
make sure kinect plugin debugging setting is actually saved and loaded
|
2017-03-29 14:06:11 -07:00 |
|
Howard Stearns
|
b8f557ca54
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
|
2017-03-29 13:30:15 -07:00 |
|
Howard Stearns
|
53d484c318
|
makes connections!
|
2017-03-29 13:23:31 -07:00 |
|
Howard Stearns
|
b0c97d3a82
|
putative connection integration for 2-machine testing
|
2017-03-29 12:22:26 -07:00 |
|
Andrew Meadows
|
985924a476
|
Merge pull request #10040 from ZappoMan/addKinectHandRotation
add support for hand rotations to the kinect plugin
|
2017-03-29 10:25:04 -07:00 |
|
Seth Alves
|
63ccaee129
|
Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet
Open feed in tablet after sharing snapshot from tablet
|
2017-03-29 10:08:51 -07:00 |
|
samcake
|
8fd413e7c3
|
Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor
Don't hold KTX files open for longer than transfers require
|
2017-03-29 10:02:33 -07:00 |
|
Andrew Meadows
|
b69073a872
|
Merge pull request #10042 from samcake/blue
Clean up the utilities scrips of the render folder
|
2017-03-29 08:39:21 -07:00 |
|
David Rowe
|
c618e8e001
|
Open feed in tablet after sharing snapshot from tablet
|
2017-03-29 16:52:52 +13:00 |
|
Anthony Thibault
|
069ebaedf0
|
Merge pull request #10021 from huffman/fix/agent-animation-cache
Add AnimationCache to agent scripts
|
2017-03-28 20:15:21 -07:00 |
|
ZappoMan
|
9d3e8818f7
|
fix build
|
2017-03-28 18:49:36 -07:00 |
|
ZappoMan
|
80fb7bc287
|
add extra debugging to the kinect plugin
|
2017-03-28 18:42:15 -07:00 |
|
ZappoMan
|
a659b73edf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into addKinectHandRotation
|
2017-03-28 18:36:42 -07:00 |
|
Howard Stearns
|
c795d2ca3b
|
Four-way discoverability. (Needs testing.)
|
2017-03-28 18:31:08 -07:00 |
|
Anthony Thibault
|
aea5cf0ac0
|
Merge pull request #10045 from hyperlogic/feature/ac-avatar-translation
Added translation support to AC avatar animations.
|
2017-03-28 18:09:26 -07:00 |
|
Zach Fox
|
b776f25b3b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-28 18:09:17 -07:00 |
|
Zach Fox
|
81264c998b
|
Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
|
2017-03-28 17:39:45 -07:00 |
|
Zach Fox
|
b5ba4a109d
|
Merge from upstream/master
|
2017-03-28 17:37:34 -07:00 |
|
Anthony J. Thibault
|
e100e3d19b
|
made UNIT_SCALE const
|
2017-03-28 17:34:15 -07:00 |
|
Anthony J. Thibault
|
ecc31802b8
|
Added translation support to AC avatar animations.
|
2017-03-28 17:23:36 -07:00 |
|
Seth Alves
|
8dcbf33e16
|
Merge pull request #10041 from druiz17/tablet-improve-goto
added left out design elements to the tablet goto page
|
2017-03-28 17:19:50 -07:00 |
|
Seth Alves
|
22a6e669b4
|
Merge pull request #10043 from sethalves/fix-polyvox-shader
fix polyvox shader
|
2017-03-28 16:45:42 -07:00 |
|
Seth Alves
|
6080c4782a
|
fix polyvox shader
|
2017-03-28 16:44:31 -07:00 |
|
howard-stearns
|
c2a49a582e
|
send credentials to local metaverse servers, and initial users data
integration.
|
2017-03-28 16:44:16 -07:00 |
|
samcake
|
a03d3a1ca8
|
Clean up the utilities scrips of the render folder
|
2017-03-28 16:00:18 -07:00 |
|
howard-stearns
|
37ab0b57a7
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
|
2017-03-28 15:41:46 -07:00 |
|