Commit graph

29823 commits

Author SHA1 Message Date
milad
5083e449b0 cr round 2 2019-07-25 15:42:25 -07:00
milad
2f4566b63c merged master and fixed height 2019-07-25 15:42:03 -07:00
milad
4c0d8b6fda improved layout to match the figment more 2019-07-25 15:42:02 -07:00
milad
993e5db2da changed rectangle to have anchor.fill 2019-07-25 15:42:02 -07:00
milad
2498bf2fd8 Cr changes r1 2019-07-25 15:42:02 -07:00
milad
9f0fc8bd06 removed logs and prototype code 2019-07-25 15:42:02 -07:00
milad
189809dc2c Fixed undefined error when displaying from the dictionary 2019-07-25 15:42:02 -07:00
milad
2b4dd327ec removed log statements 2019-07-25 15:42:01 -07:00
milad
cd5df63f51 working version for all qml web files 2019-07-25 15:41:53 -07:00
milad
fb7a66b110 working version with just flickable 2019-07-25 15:38:23 -07:00
milad
43268c0f65 Working QML window 2019-07-25 15:38:23 -07:00
milad
dec176b921 checking to see if I did something blocking the build 2019-07-25 15:38:22 -07:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial
DEV-266: Add serverless tutorial
2019-07-25 13:39:03 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
2019-07-25 12:50:07 -07:00
Zach Fox
12a9837a4b
Merge pull request #15984 from zfox23/removeSomeEventBridgeCode
BUGZ-969: Remove some audio-related code that hasn't worked in a while
2019-07-25 12:41:43 -07:00
Zach Fox
6e33f3f23a BUGZ-969: Remove some audio-related code that hasn't worked in a while 2019-07-25 11:49:28 -07:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Anthony Thibault
abeba03a7e
Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash
BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash
2019-07-24 15:39:25 -07:00
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
Ryan Huffman
c4b63ed5e4 Fix qmlToScript getting called on script thread and causing crash 2019-07-24 13:44:20 -07:00
Zach Fox
e1c198903d
Merge pull request #15973 from zfox23/fixGatedLog
BUGZ-972: Fix errant log involving 'gated' property
2019-07-24 11:19:02 -07:00
Zach Fox
03b5f9f7f8 BUGZ-972: Fix errant log involving 'gated' property 2019-07-24 10:18:03 -07:00
Zach Fox
b918979fab DEV-301: Adjust size of VR-mode header icon 2019-07-24 10:02:26 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
Shannon Romano
0031b238c6
Merge pull request #15957 from AndrewMeadows/mac-readable-stats
BUGZ-937: more readable debug stats on MacOS
2019-07-23 12:05:01 -07:00
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122
DOC-122: LocationBookmarks JSDoc
2019-07-23 12:00:03 -07:00
Anthony J. Thibault
687588cde7 Hooked up first-pass reaction animations. 2019-07-23 09:47:37 -07:00
dante ruiz
ce2849b570 Revert "Merge pull request #15944 from danteruiz/add-signing"
This reverts commit 47b7e9a5dc, reversing
changes made to 6d0ba98bfc.
2019-07-23 09:38:32 -07:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121
DOC-121: AvatarBookmarks JSDoc
2019-07-22 15:43:57 -07:00
Shannon Romano
47b7e9a5dc
Merge pull request #15944 from danteruiz/add-signing
DEV-117: the signing of MAC HQ launcher AND the interface exe
2019-07-22 15:30:26 -07:00
David Rowe
1e8a205275 Fix typo 2019-07-23 10:30:10 +12:00
Shannon Romano
6d0ba98bfc
Merge pull request #15953 from ctrlaltdavid/DOC-123
DOC-123: AvatarInputs JSDoc
2019-07-22 15:21:50 -07:00
Shannon Romano
d719952022
Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor
BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input
2019-07-22 15:06:35 -07:00
Andrew Meadows
95187f97c8 use bold monospace font for debug stats 2019-07-22 12:38:24 -07:00
David Rowe
a36bcbb2ed Doc review 2019-07-23 07:36:11 +12:00
David Rowe
ddffb8ab9a Doc review 2019-07-23 07:25:34 +12:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115
DOC-115: Comfort mode JSDoc
2019-07-22 10:46:11 -07:00
David Rowe
6d7b6f3e0a AvatarInputs JSDoc 2019-07-20 10:19:22 +12:00
David Rowe
3a3bfd1463 Doc review 2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
Zach Fox
d62dde1ab8
Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection
Fix BUGZ-1062: Set the correct Settings value for bubble tools
2019-07-19 11:51:59 -07:00
Zach Fox
510c922912 Fix BUGZ-1062: Set the correct Settings value for bubble tools 2019-07-19 11:34:14 -07:00
Shannon Romano
4f7b865cfe
Merge pull request #15945 from huffman/fix/create-window-not-reopening
BUGZ-998: Fix create window being destroyed when closed
2019-07-19 11:07:02 -07:00
Shannon Romano
c919980e8b
Merge pull request #15928 from AndrewMeadows/fix-safe-landing-003
BUGZ-942: fix SafeLanding to not accidentally "neglect to track" incoming entity packet when connecting to new domain
2019-07-19 09:53:15 -07:00
David Rowe
9165a04641 Typo and improvement 2019-07-19 11:41:12 +12:00
David Rowe
c2b67f28d0 LocationBookmarks JSDoc 2019-07-19 11:35:06 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
David Rowe
a04da70f16 AvatarBookmarks JSDoc 2019-07-19 08:36:45 +12:00
Andrew Meadows
dcf3df68f2 avoid NaN input for MyAvatar's scripted motor 2019-07-18 10:58:41 -07:00