Commit graph

28637 commits

Author SHA1 Message Date
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
2019-03-06 13:06:45 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
Case 21340: avatar doctor project page status
2019-03-06 12:36:18 -08:00
Thijs Wenker
a84a43320c added spacing between lines 2019-03-06 19:15:01 +01:00
Thijs Wenker
59200103af Not for sale explanation 2019-03-06 07:06:48 +01:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
2019-03-05 15:42:51 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create
Case 21541: Fix mouse on create in HMD
2019-03-05 13:07:49 -08:00
Shannon Romano
3eff5d269f
Merge pull request #15008 from ctrlaltdavid/M21128-a
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
2019-03-05 11:58:37 -08:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
SamGondelman
12f5a735d9 simplifying mouse events and fix mouse on create 2019-03-04 14:50:09 -08:00
Shannon Romano
45099a5db6
Merge pull request #15076 from SamGondelman/laserWidth
Case 21514: Lasers scale with avatar
2019-03-04 11:26:08 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
2019-03-04 10:49:16 -08:00
Shannon Romano
d56b460d11
Merge pull request #15030 from wayne-chen/clockOnTablet
Case 21456, Case 21463: Clock On Tablet (81.0/master)
2019-03-04 10:45:34 -08:00
SamGondelman
da1ffc15e3 lasers scale with avatar 2019-03-01 15:42:45 -08:00
danteruiz
8e600adf1e making requested changes 2019-03-01 15:30:11 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
SamGondelman
3e6061e435 try to not clear my avatar entities on domain switch 2019-03-01 13:45:00 -08:00
Shannon Romano
20d65ab183
Merge pull request #15064 from danteruiz/another-login-fix
Case 21451: HMD Login Encouragement Screen is not Usable
2019-03-01 12:57:17 -08:00
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d
Case 19188: Potential 2D overlay + Tablet threading fixes
2019-03-01 12:56:23 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
2019-03-01 09:35:01 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
Case 21494: Avoid mem leaked entities
2019-03-01 09:34:20 -08:00
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload
Case 21490: Fix lasers and keyboard on reload
2019-03-01 09:31:56 -08:00
danteruiz
7bcf727a83 review changes 2019-02-28 18:11:51 -08:00
danteruiz
9fe0309ae6 another login fix 2019-02-28 17:11:48 -08:00
SamGondelman
b26b02fed6 potential 2d overlay threading fixes 2019-02-28 17:02:08 -08:00
Andrew Meadows
7d9efe4c09 avoid mem-leak for serverless domains 2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097 fix lasers and keyboard on reload 2019-02-28 14:04:22 -08:00
SamGondelman
a8e6d01279 fix context overlay 2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
amer cerkic
a425becc8a clean up of debugging 2019-02-27 15:35:33 -08:00
Shannon Romano
1a83ab2dab
Merge pull request #15038 from danteruiz/fix-login-screen
Case 21451: HMD Login Encouragement Screen is not Usable
2019-02-27 14:41:41 -08:00
amer cerkic
92cfa49bfb adding and testing command line parameter passing to application 2019-02-27 11:42:22 -08:00
SamGondelman
bf9e5b9550 comment out another log 2019-02-27 10:25:34 -08:00
danteruiz
2fd94c6bbc fixing login dialog 2019-02-27 10:08:38 -08:00
Wayne Chen
028cce5394 change short username to 14 characters, displaying as normal text 2019-02-26 12:26:50 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake
case 21411: don't allow others' grabs to move locked or ungrabbable things
2019-02-26 09:03:44 -08:00
nimisha20
ba3895efdd
Update AccountServicesScriptingInterface.h
Minor copy-edit
2019-02-25 22:56:36 -08:00
nimisha20
736a050e68
Update AccountServicesScriptingInterface.h 2019-02-25 22:55:56 -08:00
nimisha20
4825ecdbf3
Update AccountServicesScriptingInterface.h 2019-02-25 22:44:16 -08:00
Wayne Chen
650b34c463 adding clock 2019-02-25 18:00:56 -08:00
Shannon Romano
7fe3bb387e
Merge pull request #15012 from SamGondelman/nametag
Case 21397: Trying to fix overlay rotation
2019-02-25 16:52:01 -08:00
Andrew Meadows
6e13203fec avoid nullptr deref 2019-02-25 13:52:46 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Seth Alves
db821487d9 don't allow others' grabs to move locked or ungrabbable things 2019-02-25 11:27:10 -08:00
Thijs Wenker
79d0a0a0a8 avatar doctor project status 2019-02-25 19:28:38 +01:00