Zach Pomerantz
|
637a448c2c
|
abstract toggleMenu
|
2017-05-26 17:12:15 -04:00 |
|
Zach Pomerantz
|
380a16f9dd
|
use SYSTEM_TABLET static
|
2017-05-26 17:11:32 -04:00 |
|
Anthony Thibault
|
84901ba94b
|
Merge pull request #10542 from druiz17/arm-pucks
Added pucks calibration for upper arm/shoulders
|
2017-05-26 11:17:15 -07:00 |
|
Clément Brisset
|
efe72e1b85
|
Merge pull request #10530 from Atlante45/fix/default-scripts
Ensure user never loses its running scripts
|
2017-05-25 18:33:11 -07:00 |
|
Dante Ruiz
|
8cb9bfcc81
|
fixed merge conflict
|
2017-05-24 19:35:41 +01:00 |
|
Sam Gateau
|
f9c6cecb23
|
Merge pull request #10529 from samcake/ambient
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
|
2017-05-24 10:48:21 -07:00 |
|
Dante Ruiz
|
ac3c9655ec
|
added arms
|
2017-05-24 01:28:08 +01:00 |
|
Dante Ruiz
|
0cbdeaa1e8
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-23 18:26:58 +01:00 |
|
Dante Ruiz
|
54d63f5155
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-23 18:19:38 +01:00 |
|
Sam Cake
|
7f9c98a922
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-22 22:54:43 -07:00 |
|
Atlante45
|
10eb353126
|
Ensure user never loses its running scripts
|
2017-05-22 18:55:58 -07:00 |
|
Dante Ruiz
|
d98e7d5bc6
|
adding left and right arm
|
2017-05-23 00:26:12 +01:00 |
|
David Rowe
|
9f83ca518f
|
Merge branch 'master' into 21359
|
2017-05-23 09:18:10 +12:00 |
|
samcake
|
c5b5aa93b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-19 18:13:42 -07:00 |
|
David Rowe
|
768415695d
|
Tidying
|
2017-05-20 12:43:47 +12:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Dante Ruiz
|
984f9e1ba5
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-18 21:23:06 +01:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Dante Ruiz
|
90ddc16d09
|
add calibration data to filters
|
2017-05-18 17:07:28 +01:00 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
Zach Fox
|
d4752926b8
|
First pass - checking performance
|
2017-05-17 13:51:27 -07:00 |
|
Dante Ruiz
|
a18940142e
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-17 16:23:50 +01:00 |
|
Atlante45
|
201f81f20a
|
Don't wait on the sandbox
|
2017-05-16 14:41:57 -07:00 |
|
Dante Ruiz
|
975b1ab077
|
moved low velocity filter in the input system
|
2017-05-16 00:15:06 +01:00 |
|
Clément Brisset
|
1658ced671
|
Merge pull request #10437 from Atlante45/feat/faster-startup
Use baked default skybox
|
2017-05-12 11:35:51 -07:00 |
|
Atlante45
|
79d53d92a1
|
Use baked default skybox
|
2017-05-10 16:03:02 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2328da3c48
|
Merge branch 'master' into audio-source-sync
|
2017-05-10 21:22:40 +02:00 |
|
Brad Hefta-Gaub
|
f91f42b0c8
|
Merge pull request #10411 from zzmp/feat/tester-flag
Add launch.tester to user_actions
|
2017-05-10 11:58:24 -07:00 |
|
Zach Pomerantz
|
45feee38b2
|
Merge pull request #10269 from zzmp/fix/audio-bg-join
Cleanup Audio background threads on shutdown
|
2017-05-09 17:23:36 -04:00 |
|
Vladyslav Stelmakhovskyi
|
7ab6909c77
|
Merge branch 'master' into audio-source-sync
|
2017-05-09 11:08:08 +02:00 |
|
Andrew Meadows
|
2835a73c6b
|
Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
|
2017-05-08 18:17:16 -07:00 |
|
Zach Pomerantz
|
defc3c1c4f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
|
2017-05-08 19:55:10 -04:00 |
|
Zach Pomerantz
|
929079df97
|
add launch.tester to user_actions
|
2017-05-08 19:33:09 -04:00 |
|
Vladyslav Stelmakhovskyi
|
d0111ac0bb
|
Merge branch 'master' into audio-source-sync
|
2017-05-08 20:09:34 +02:00 |
|
Zach Pomerantz
|
ca7cd61c64
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
|
2017-05-05 13:04:01 -04:00 |
|
Andrew Meadows
|
e21bd7a67a
|
help avatar walk up steps
|
2017-05-05 09:35:49 -07:00 |
|
Vladyslav Stelmakhovskyi
|
e395a51c60
|
Merge with master
|
2017-05-05 07:05:16 +02:00 |
|
Brad Davis
|
9def788956
|
Merge pull request #10314 from jherico/avatars-renderer
Migrate Avatar rendering code to library
|
2017-05-04 14:23:49 -07:00 |
|
Brad Davis
|
2d0bbf70ae
|
Migrate core avatar rendering functionality to library
|
2017-05-04 14:08:59 -07:00 |
|
Vladyslav Stelmakhovskyi
|
ba5a371da1
|
Decrease CPU usage in tabletUI periodical updates
|
2017-05-04 22:54:41 +02:00 |
|
Zach Pomerantz
|
ad8d3e5490
|
continue idling while minimized
|
2017-05-02 20:05:55 -04:00 |
|
Vladyslav Stelmakhovskyi
|
e789b69a8e
|
Merge branch 'master' into audio-source-sync
|
2017-05-02 20:57:01 +02:00 |
|
Brad Davis
|
425405f72d
|
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
|
2017-05-02 10:37:22 -07:00 |
|
Seth Alves
|
a75544a9fb
|
Merge pull request #10319 from hyperlogic/feature/head-standard-action
Head, Hips and Chest IK can now be controlled from Controller inputs
|
2017-05-01 13:03:23 -07:00 |
|
Brad Davis
|
40e4e2f307
|
Merge pull request #10327 from jherico/face_tracker_refactor
Remove Faceshift
|
2017-05-01 12:14:55 -07:00 |
|
Vladyslav Stelmakhovskyi
|
dde363ef3d
|
Merge branch 'master' into audio-source-sync
|
2017-05-01 18:42:53 +02:00 |
|
Vladyslav Stelmakhovskyi
|
28447cde0b
|
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
|
2017-05-01 18:41:38 +02:00 |
|
Brad Davis
|
2b43a1989f
|
Moving face and eye trackers out of interface
|
2017-04-28 23:28:17 -07:00 |
|
Brad Davis
|
5e1bc0d908
|
Remove faceshift
|
2017-04-28 16:34:54 -07:00 |
|