Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 23:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72971 commits 25 branches 0 tags 1.1 GiB
Commit graph

7604 commits

Author SHA1 Message Date
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Roxanne Skelly
c1d2f00c9b Fix url.toString() 2018-09-24 15:45:38 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1 Fix timer managmement during shutdown 2018-09-24 14:52:13 -07:00
Roxanne Skelly
16dba169c5 Tray Notifier code review fixes 2018-09-24 14:36:54 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first 
starting interface.

Also, menu names and order follow UX documentation.
 2018-09-24 13:43:55 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
2267085dbf
removing unused counter variable 2018-09-11 17:46:01 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch 
Pop up login dialog on launch
 2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars 
handle agent avatar clear on avatar mixer disconnect
 2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Dante Ruiz
735ff04fad fixing merge conflicts 2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again 2018-09-11 11:00:39 -07:00
Wayne Chen
6bcf6eaae7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 09:13:41 -07:00
Wayne Chen
69ae475787 adding user activity logging 2018-09-10 23:04:50 -07:00
Wayne Chen
5ece8d8707 using different paradigm for checking login dialog popup 2018-09-10 18:32:21 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
Wayne Chen
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -07:00
Wayne Chen
e721844b10 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-10 10:10:16 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod 
Enable LOD manager on android
 2018-09-08 13:43:36 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod 2018-09-07 10:01:26 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels. 
Added state machine tracking as well.
 2018-09-06 16:18:58 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Brad Davis
105a615745 Fix no-ui crashes 2018-09-06 08:59:05 -07:00
Wayne Chen
581aa0c02d Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch 2018-09-05 20:04:34 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black 
Improving the LOD manager behavior for better scaling
 2018-09-05 16:01:09 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset 
mark and cycle trait instances needing to be sent on mixer reconnect
 2018-09-05 12:43:27 -07:00
Seth Alves
1bea6c9ea3 if not already logged in, show login dialog at launch-time rather than connect-to-domain-time 2018-09-05 10:38:12 -07:00
Wayne Chen
2e17140c07 fixing loadServerlessDomain function to be from 404 redirect 2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Wayne Chen
b6d23843dd adding fix to domain redirection URL 2018-08-30 22:32:02 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Sam Gateau
e0f4c8239e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback 
Filter timings used in feedback logic for workload region sizes
 2018-08-30 19:11:49 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
sam gateau
8179de35b0 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 14:46:40 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables 
Fix Android StateController assert
 2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
David Back
8b1fcfcce9 fix double windows platform 2018-08-30 10:16:27 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Wayne Chen
eb29c9c4a2 updating with default landing location 2018-08-29 16:53:22 -07:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
Sam Gateau
3c0e284e98 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 08:48:04 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Sam Gateau
37b4cf6223 Picking pid values 2018-08-28 17:39:35 -07:00
Sam Gateau
0da22db837 Picking pid values 2018-08-28 16:05:57 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
SamGondelman
98d145dc24 fix crash on shutdown in domain with material 2018-08-24 15:19:48 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Andrew Meadows
87223946ad add/remove avatars according to workload region 2018-08-23 12:59:28 -07:00
Andrew Meadows
15665b25e8 give OtherAvatars a proxy in workload 2018-08-23 12:59:28 -07:00
Dante Ruiz
db8e1bdfa3 compile error fix 2018-08-22 16:47:18 -07:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de revert some changes and fix toolbar issue 2018-08-22 15:20:56 -07:00
John Conklin II
50684f00c8
Merge pull request #13856 from sethalves/dont-squash-delete-events 
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
 2018-08-22 12:44:35 -07:00
Seth Alves
579b2435c2 don't squash delete events during shutdown so that QWebEngine process gets destroyed 2018-08-22 11:04:26 -07:00