Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 18:35:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
74646 commits 71 branches 56 tags 1.2 GiB
Commit graph

74646 commits

Author SHA1 Message Date
SamGondelman
7231116e43 fix zone with invalid script not loading 2018-12-18 13:04:56 -08:00
Jeff Clinton
2ff4905ed3
Merge pull request from wayne-chen/keepMeLoggedInDefault-78 
MS20352: Keep me logged in checkbox as on by default
 2018-12-18 11:57:17 -08:00
Wayne Chen
b5c3d7c3ed
Merge pull request from wayne-chen/loginForSmallAvatars-master 
MS20332: HMD Login Prompt-- small avatars cannot reach easily
 2018-12-18 10:49:26 -08:00
Wayne Chen
50902080ce fixing typos 2018-12-17 16:48:02 -08:00
Wayne Chen
816733b55f reverting to master 2018-12-17 16:47:11 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
Adam Smith
14ab53571f
Merge pull request from sabrina-shanman/hfm_prep 
(case 20274) Create the HFM Preparation Step
 2018-12-17 15:17:19 -08:00
Wayne Chen
09ff67eab3 Merge branch 'master' of https://github.com/highfidelity/hifi into loginForSmallAvatars-master 2018-12-17 14:03:16 -08:00
Wayne Chen
5d89ed2a81 matching master 2018-12-17 13:46:55 -08:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Howard Stearns
719919d3fd
Merge pull request from SimonWalton-HiFi/dissectors-unobfuscate 
Deobfuscate packets in dissector
 2018-12-17 12:08:56 -08:00
Antonina Savinova
40a3f76784
Merge pull request from davidkelly/dk/20032 
Agent needs to be sure audio is ready before trying to use it
 2018-12-17 10:32:42 -08:00
Jeff Clinton
a5ae4081a5
Merge pull request from wayne-chen/loginInitiative2 
MS20328: New login breaks nitpick
 2018-12-17 10:14:09 -08:00
Wayne Chen
711457b2d7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-17 09:12:29 -08:00
Simon Walton
d7acb7cfc5 Deobfuscate packets in wireshark lua plugin 2018-12-14 17:14:34 -08:00
Wayne Chen
899918006f fixing for autotester 2018-12-14 17:12:27 -08:00
Shannon Romano
78c9fb2b91
Merge pull request from wayne-chen/loginInitiative2 
MS20319: fixing keyboard position offset
 2018-12-15 00:51:03 +00:00
Shannon Romano
a89c53cc52
Merge pull request from zfox23/MS20308_unknownItems 
Fix MS20308: Allow users to checkout uncertifiable items
 2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b Fix MS20308: Allow users to checkout uncertifiable items 2018-12-14 11:17:56 -08:00
Wayne Chen
befca68917 fixing keyboard position offset 2018-12-14 10:57:42 -08:00
sabrina-shanman
a36e75672e Remove dependency on VaryingSet1 2018-12-14 10:40:28 -08:00
sabrina-shanman
c7022988ea Revert "Add VaryingSet1 to Task aliases" 
This reverts commit 25e3d49941.
 2018-12-14 09:14:07 -08:00
Shannon Romano
131b53e4df
Merge pull request from wayne-chen/loginInitiative2 
2nd initiative for encouraging login
 2018-12-14 01:59:35 +00:00
David Kelly
2b21ceb17a Agent needs to be sure audio is ready before trying to use it 2018-12-13 17:41:12 -08:00
Wayne Chen
e744f40d54 fixing url to login overlay 2018-12-13 16:43:12 -08:00
Wayne Chen
1d86f3816d fixing build error 2018-12-13 15:43:42 -08:00
Wayne Chen
502de63d3f fixing bug 2018-12-13 14:59:40 -08:00
Shannon Romano
3e10bea1ce
Merge pull request from davidkelly/dk/18639 
Return more connections in pal
 2018-12-13 22:48:00 +00:00
Wayne Chen
3806914e76 fixing variable names to match coding standard 2018-12-13 14:34:25 -08:00
Wayne Chen
0daa909192 more dev feedback 2018-12-13 14:25:52 -08:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Zach Fox
3a1f834576
Merge pull request from zfox23/MS17811_fixFrozeNAgain 
Fix a bug introduced in PR14566, actually fixing MS17811
 2018-12-13 13:34:04 -08:00
sabrina-shanman
c41174a823 Re-name baker::ImportContext to baker::BakeContext 2018-12-13 10:33:03 -08:00
Zach Fox
4e7b7346dc Fix a bug introduced in PR14566, actually fixing MS17811 2018-12-13 10:06:46 -08:00
Wayne Chen
34130778ec
fixing merge bug 2018-12-12 18:41:28 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Wayne Chen
a2ebb67cd5 dev feedback/fixing keyboard in profile creation 2018-12-12 17:33:22 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Wayne Chen
67fe05da97 fixing spacing 2018-12-12 15:31:33 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Wayne Chen
b4e2b74f3d adding text wrapping/fixing keep me logged in setting 2018-12-12 15:27:42 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Wayne Chen
941050d42c fixing tablet apps/referenceerror 2018-12-12 12:43:01 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Clément Brisset
a9057e09e0
Merge pull request from zfox23/MS17811_ignoreFreeze 
Fix MS17811: Prevent frozen avatars in certain ignore cases
 2018-12-12 10:37:03 -08:00
Wayne Chen
941df8bc35 attempting fix on losing logged in setting 2018-12-12 10:08:50 -08:00
Zach Fox
735be62271
Merge pull request from zfox23/portalPrototype 
Add a "Portal" mode to the Secondary Camera
 2018-12-12 09:27:55 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Wayne Chen
dbebf1a67f having stats mirror master 2018-12-11 19:29:17 -08:00