Commit graph

8170 commits

Author SHA1 Message Date
Zach Fox
a6bcbe4c66 DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial 2019-10-23 14:32:03 -07:00
Sam Gateau
32b23c70e6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-22 16:25:38 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Shannon Romano
a6842b5cba
Merge pull request #16346 from dooglifeSF/change_away_animation
New AFK "away" animation
2019-10-16 09:17:51 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
2019-10-15 14:56:25 -07:00
Zach Fox
9b9110e163 Remove cachebusting code 2019-10-15 12:26:18 -07:00
Zach Fox
4770008383 DEV-2426: Update Emote Indicator icon 2019-10-15 11:39:00 -07:00
dooglifeSF
e757a6fd86 Merge branch 'master' into change_away_animation 2019-10-15 10:46:24 -07:00
dooglifeSF
589d4e992c Change away anim to hosted afk_texting animation. 2019-10-14 16:48:45 -07:00
RebeccaStankus
5831eb261f Changed calculation of overlay size 2019-10-14 16:08:01 -07:00
RebeccaStankus
4720c64af8 Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay 2019-10-14 13:02:54 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
2019-10-14 11:50:59 -07:00
Rebecca Stankus
4ac87ef503 Moved position of settings app 2019-10-11 16:20:37 -07:00
Rebecca Stankus
377ffe9698 Fixed calculation of overlay position 2019-10-11 16:02:55 -07:00
David Rowe
5292dddc39 Rewrite toolbarTest.js 2019-10-12 10:10:41 +13:00
Zach Fox
222b1fbd20 Fix bug with debugFTUE === 1 2019-10-11 12:26:12 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
Sam Gateau
597d4b1af7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-10 09:02:44 -07:00
Zach Fox
a5caa36f07
Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag
dev-2082/cannot-click-yourself-in-third-person-for-nametag
2019-10-09 19:34:00 -04:00
Zach Fox
609f6f9a25 Fix minimize bug; fix bug where FTUE window appears behind Interface window 2019-10-09 15:46:50 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Seth Alves
1ce3cebe1f force LOD to be 20-20 on android, and force lodAngleDeg to 0.248 2019-10-09 14:04:44 -07:00
milad
77d17e0ff7 removed extra disconnect function 2019-10-09 13:26:53 -07:00
Zach Fox
601f7ac5e9 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-09 13:26:21 -07:00
milad
e2fee5361d updated startup/shutdown 2019-10-09 13:09:38 -07:00
milad
06244338d6 updated nametags to work in selfie mode 2019-10-09 12:36:44 -07:00
Sam Gateau
ff36b7a390 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-10-09 10:00:56 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals
Added flag to ensure mouse event signals are not connected twice
2019-10-08 15:58:24 -07:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
753a61ed2c More iteration with Joshua 2019-10-08 17:31:10 -04:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
Sam Gateau
d714cc6da6 FIxing some stuff ? 2019-10-04 17:55:37 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes
Fix for Mat4.getForward, getRight and getUp
2019-10-04 17:00:43 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp
It should match the results from the same methods on the Quat class.
2019-10-04 13:59:38 -07:00
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -07:00
Sam Gateau
a5ccd07347 Adding the material fields ui yeah, todo: many errors for undefined fields 2019-10-03 22:43:44 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Sam Gateau
a5c10abcac Working on improving the material inspector 2019-10-03 17:04:40 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00