samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07: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
samcake
3393456d91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-12 10:15:13 -07:00
samcake
737fdf9dd8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 17:28:07 -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
samcake
39f6e22da3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-10 09:48:26 -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
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -07: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
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07: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
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07: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
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8
clear domain octree details if ES killed
2017-04-27 17:47:18 -07:00
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538
restore RecordingScriptingInterface to Application
2017-04-27 13:16:50 -07:00
Andrew Meadows
65682a914d
remove cufty AvatarManager LocalLights feature
2017-04-27 13:11:57 -07:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
anshuman64
d146431e9b
Merge pull request #10268 from druiz17/input-recorder
...
Input recorder/ input playback system for all input actions
2017-04-26 16:20:20 -07:00
Ryan Huffman
8ba56a96df
Merge pull request #10240 from zzmp/fix/hmd-tutorial
...
Condition tutorial on active HMD
2017-04-26 14:00:02 -07:00
Anthony J. Thibault
ef43ff4b99
Add default pose matrices to InputCalibrationData structure
2017-04-26 11:55:24 -07:00
ZappoMan
5dd6daaad7
send identity on nodeActivated not nodeAdded
2017-04-26 11:42:38 -07:00
Dante Ruiz
d8e6e8e7d0
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-26 16:53:02 +01:00
ZappoMan
65801cbb4d
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7
Merge pull request #10242 from zzmp/fix/display-log
...
Send changed_display_mode after it changes
2017-04-25 16:36:12 -04:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Zach Pomerantz
4a26785eda
cleanup Audio bg threads in cleanupBeforeQuit
2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55
standardize Audio bg thread joins
2017-04-24 18:10:50 -04:00
Dante Ruiz
f69691afd5
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0
got input recording to work
2017-04-24 19:57:38 +01:00
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
Zach Pomerantz
b77917b8d1
Merge pull request #10241 from zzmp/fix/display-fail
...
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de
Merge branch 'master' into notify-sound-inject
2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8
Implemented snap sound using sound injector
2017-04-20 17:43:16 +02:00
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Zach Fox
50456f71ed
Merge pull request #10142 from Triplelexx/21258
...
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
Dante Ruiz
d4c8d06575
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe
exprting compressed file
2017-04-19 20:41:56 +01:00
Zach Pomerantz
e0cb809f58
add hmd:bool to changed_display_mode
2017-04-18 18:48:28 -04:00
Zach Pomerantz
858a1db38b
only log changed_display_mode on successful change
2017-04-18 18:48:23 -04:00
Zach Pomerantz
c7a7fa90ec
update Display menu on unsuccesful selection
2017-04-18 18:47:57 -04:00
Zach Pomerantz
a310acd37f
check HMD usage for tutorial teleport
2017-04-18 18:46:53 -04:00
Dante Ruiz
f8ec49eb96
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +01:00
Seth Alves
0807e036e8
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-18 11:59:23 -07:00
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a
more interface-only spaghetti out of Avatar
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Zach Fox
9c4e367245
Merge pull request #10213 from zfox23/fixGoToFocus
...
FB 4156; Fix GoTo text field focus; other GoTo tweaks
2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352
Entirely remove addressBarToggle()
2017-04-17 12:13:01 -07:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a
Merge pull request #10190 from samcake/ambient-bis
...
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Seth Alves
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -07:00
Zach Fox
75f1168b19
Clearer function names
2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b
Checkpoint!
2017-04-12 14:45:56 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
