Commit graph

53198 commits

Author SHA1 Message Date
David Rowe
23c937e55d Make avatar recording and upload to asset server 2017-04-06 18:50:47 +12:00
David Rowe
5676364aec Fix missing return value in Recording.saveRecordingToAsset() 2017-04-06 18:50:15 +12:00
David Rowe
a9f5b60319 Fix recording starting on tablet when close dialog rather than tablet 2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559 Display countdown in overlay 2017-04-06 15:01:53 +12:00
David Rowe
4580b89aa6 Add countdown delay before starting recording 2017-04-06 12:08:27 +12:00
David Rowe
096909d423 Close dialog if open when stop script 2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12 Make toolbar icon close dialog if it's open 2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
David Rowe
b29bfd4bb4 Dialog instructions refer to tablet or window as appropriate 2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0 Toolbar icon state and start/stop recording with window closing/opening 2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523 Add dialog with "Enable recording" checkbox 2017-04-05 16:20:04 +12:00
David Rowe
d748068373 Stub new avatar recording script that records when tablet is hidden 2017-04-05 13:19:46 +12:00
Seth Alves
384f404602 Merge pull request #10109 from mittens/21240
OBJ Loader Rewrite to Support Multiple Materials
2017-04-04 15:56:44 -07:00
Philip Rosedale
b59d0bcd59 Merge pull request #10122 from hyperlogic/bug-fix/fix-sliding-feed-in-HMD-mode
Fix for sliding feet when leaning in HMD mode.
2017-04-04 15:32:46 -07:00
Howard Stearns
fa7baaa5ba Merge pull request #10124 from howard-stearns/send-initial-path
send initial path in location update (e.g., on login)
2017-04-04 12:40:09 -07:00
howard-stearns
6f79b2eaeb send initial path in location update (e.g., on login) 2017-04-04 12:05:43 -07:00
Anthony J. Thibault
c58fdb590a Fix for sliding feet when leaning in HMD mode. 2017-04-04 11:00:34 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Howard Stearns
b0fa784267 Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach
Dk/pal improvements mostly zach
2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f wording change 2017-04-04 09:53:09 -07:00
trent
362ffba117 Fixes to OBJReader.cpp style inconsistencies. 2017-04-03 21:54:19 -04:00
Thijs Wenker
2b85563413 Merge pull request #10115 from sethalves/fix-fast-talking
Fix fast talking
2017-04-04 02:13:09 +02:00
Brad Davis
9942770761 Merge pull request #10105 from samcake/ambient
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 17:04:56 -07:00
David Kelly
4d6886d1f4 cr feedback, plus changed 'People' to 'Connections' in a couple places 2017-04-03 17:03:14 -07:00
trent
5cc87ccc4a Fixed warning for subtly-stupid unused variable. 2017-04-03 19:38:34 -04:00
Seth Alves
e7f458ccaf Merge pull request #10107 from birarda/bug/recording-cache
make sure HeadData is present before processing recording frames
2017-04-03 16:11:18 -07:00
Seth Alves
cb787c2862 Merge pull request #10104 from druiz17/tablet-webView3.0
Remove unnecessary prints and code for tabletWebView.qml
2017-04-03 16:10:54 -07:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto
Put current address to location instead of inputfield
2017-04-03 16:09:58 -07:00
Seth Alves
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth
Photobooth Improvements: Using Tablet & Ability to Rotate Model
2017-04-03 16:05:13 -07:00
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts.
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
David Kelly
4629accc9c style updates 2017-04-03 15:35:53 -07:00
Seth Alves
55c2d36752 math fixes, cleanups 2017-04-03 15:30:06 -07:00
Seth Alves
2a43c41954 Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking 2017-04-03 14:44:13 -07:00
Seth Alves
7ac09398be include deltaTime in audioAttack running average 2017-04-03 14:44:05 -07:00
Stephen Birarda
6ed4295b8b make sure HeadData is present before processing recording frames 2017-04-03 13:55:11 -07:00
trent
bec46747dd Merge branch 'master' of https://github.com/highfidelity/hifi into 21240 2017-04-03 16:46:36 -04:00
trent
2991332652 Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win. 2017-04-03 16:46:22 -04:00
Faye Li
2ca4203d85 fix for submerge in floor issue 2017-04-03 12:57:51 -07:00
Faye Li
d726bd352d fix for locked camera state issue 2017-04-03 12:14:29 -07:00
Andrew Meadows
66ff551a7c Merge pull request #10080 from ZappoMan/footActions
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
Seth Alves
7f1095c590 use deltaTime rather than calling usecTimestampNow 2017-04-03 11:55:08 -07:00
samcake
c3c73b209a Fixing the bad rendering of the instanced primitives on 4.1 2017-04-03 11:49:00 -07:00
Seth Alves
9e08925d7e involve clock time in _mouthTime calculation 2017-04-03 11:34:29 -07:00
David Kelly
2f1b6be24d Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi 2017-04-03 10:55:55 -07:00
Dante Ruiz
3090629f77 clean up code 2017-04-03 18:51:39 +01:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
c45514a557 Merge pull request #10066 from vladest/tablet-ui-connection-dialog
Implemented no connection dialog for Tablet UI
2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119 Merge pull request #10101 from ctrlaltdavid/21252
Fix tablet scrolling getting stuck to mouse pointer
2017-04-03 09:52:45 -07:00
Seth Alves
b9e84691ad Merge pull request #10092 from ctrlaltdavid/dead-code
Remove some dead code in edit.js
2017-04-03 09:40:30 -07:00
Seth Alves
0f936f7511 Merge pull request #10078 from hyperlogic/feature/avatar-skeleton
Expose Avatar Skeleton to JavaScript
2017-04-03 09:39:35 -07:00