Wayne Chen
03c39eb92f
more wip
2018-10-31 07:45:55 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
SamGondelman
dd96881724
don't submit frames while oculus says it's not visible
2018-10-30 12:15:46 -07:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988
...
Fix Interface eating memory when minimized
2018-10-29 12:52:10 -07:00
Wayne Chen
ed847203ea
wip for getting hmd overlay
2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-29 08:48:02 -07:00
Wayne Chen
11dc82a5cf
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44
adding prototype functions
2018-10-29 08:47:09 -07:00
Wayne Chen
af04630642
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-26 17:53:13 -07:00
David Rowe
1cca975b37
Fix Interface eating memory when minimized
2018-10-27 11:40:02 +13:00
Bradley Austin Davis
28b45ce1d9
Resolve compositing glitches
2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
Wayne Chen
955b0a580e
adding hooks for application for pause/resume
2018-10-25 17:25:44 -07:00
Howard Stearns
c85dbb8233
limitedCommerce switch
2018-10-25 11:25:56 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Wayne Chen
331b09c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-24 09:16:24 -07:00
humbletim
d8217e9a79
synthesize key release events on Desktop focus change
2018-10-23 22:42:06 -04:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
Zach Fox
1d8994993c
Whitelist TTS scripting interface to TTS app, which is now a default script
2018-10-22 17:05:31 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
NissimHadar
c9f9679cf7
Merge branch 'master' of https://github.com/highfidelity/hifi into addNoLogin
2018-10-22 10:55:56 -07:00
NissimHadar
092f88e558
Change parameter name from --no-login to --no-login-suggestion
2018-10-22 10:55:50 -07:00
Wayne Chen
d7a4531d00
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 09:27:23 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
...
hide progress overlays if interstitial mode
2018-10-19 16:35:42 -07:00
Wayne Chen
3bd10716b2
wip
2018-10-19 16:06:28 -07:00
Wayne Chen
e32460ed96
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 09:25:57 -07:00
NissimHadar
12d092609b
Do not show login dialog if requested not to on the command line.
2018-10-18 17:20:26 -07:00
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -07:00
Zach Fox
41742aaf9e
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 16:22:41 -07:00
Wayne Chen
5a381fdc03
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-18 14:53:49 -07:00
Zach Fox
2a9e0041b2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
David Rowe
c41ce5d484
Make tablet have priority over drawInFront overlays rendered behind it
2018-10-18 17:10:48 +13:00
Wayne Chen
fd3c0d2f76
pushing with new fix
2018-10-17 15:03:09 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation
...
Fix various ResourceCache bugs
2018-10-17 11:13:35 -07:00
Zach Fox
26e388b139
Some experimentation yields promising results...
2018-10-16 17:34:48 -07:00
Wayne Chen
28a950fe9f
staging
2018-10-15 16:51:28 -07:00
Anthony Thibault
640ed6a32a
Added "Developer > Avatar > Show Tracked Objects" menu
2018-10-15 12:42:07 -07:00
Zach Fox
daeedc6ef1
Lots of progress today
2018-10-11 17:10:14 -07:00
Anthony Thibault
a3a87ef48b
Debug rendering of tracked objects, remove filters from body.
2018-10-10 17:52:26 -07:00
Zach Fox
7de784ce27
First steps (definitely not working)
2018-10-10 12:32:55 -07:00
Wayne Chen
60bbcc7fc3
adding initialization of qml when keyboard ready
2018-10-09 15:20:16 -07:00
Wayne Chen
ccebf3edef
omitting keyboard focus hack
2018-10-08 17:18:40 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
Dante Ruiz
36c2cceb57
fix for failing to enter domain
2018-10-05 15:39:51 -07:00
Andrew Meadows
c3478dc018
remove expired avatarEntities from their avatars
2018-10-05 13:48:35 -07:00
danteruiz
d285080197
remmoving some debug statements
2018-10-04 18:38:25 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
sabrina-shanman
2ef85dfdba
Merge branch 'master' into stt_parenting2
2018-10-03 11:39:00 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix
...
Disable Hand Touch when Leap Motion is running
2018-10-03 09:03:43 -07:00
Clement
3c4e543b3c
Better deadlock crash
2018-10-02 11:51:15 -07:00
sabrina-shanman
67dc526ee2
Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2
2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan
...
fix several uninitialized reads
2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465
...
Fix case 18465: redirect to domain after login
2018-10-01 16:48:27 -07:00
sabrina-shanman
b988382918
Remove smaller RayPick constructor
2018-10-01 11:07:02 -07:00
luiscuenca
5ccbc5c029
Disable Hand Touch when Leap Motion is running
2018-10-01 10:47:06 -07:00
Wayne Chen
eab57633a5
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-01 09:21:26 -07:00
Seth Alves
b69d0f3997
get interface building and working with clang-7 on ubuntu 18
2018-09-28 13:46:51 -07:00
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-27 12:05:21 -07:00
sabrina-shanman
bb38efa061
Set joint state for the mouse RayPick of the EntityTreeRenderer
2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969
Add simpler RayPick constructor with position/direction values set to default
2018-09-27 10:53:10 -07:00
Wayne Chen
747aab2097
persisting signed values
2018-09-27 10:16:11 -07:00
Wayne Chen
03d2fa2787
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-09-27 09:47:08 -07:00
Gabriel Calero
3163ae5997
Fix case 18465: redirect to domain after login
2018-09-26 19:41:43 -03:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester
...
Marketplace item tester interface
2018-09-26 11:25:53 -07:00
Dante Ruiz
7e138ebfff
update to new enabling method
2018-09-26 10:52:45 -07:00
sabrina-shanman
4011660435
Merge branch 'master' into stt_parenting2
2018-09-26 10:17:45 -07:00
Seth Alves
ff2a47e7e6
fix several uninitialized reads
2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
2018-09-26 09:18:12 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
Kerry Ivan Kurian
505e08b841
Resolve merge conflicts
2018-09-25 00:57:43 -07:00
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
Sam
bcf9c5a6b3
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-08-22 17:14:58 -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
Sam Gateau
054f30b0de
Merging with master
2018-08-22 13:30:44 -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
Sam Gateau
3aa47a6695
Merging with master after a bunch ofchanges
2018-08-22 08:46:40 -07:00
Stephen Birarda
3e2d4dc696
fixes and improvments addressing CR comments
2018-08-21 10:53:52 -07:00
Dante Ruiz
b2fb2c7f98
fix build error
2018-08-21 10:45:59 -07:00
Stephen Birarda
e33f349d53
fix flagging for avatar entity update/delete
2018-08-21 10:32:05 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Dante Ruiz
db3d3d3d93
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-21 09:56:59 -07:00
David Rowe
4b12e18c27
Merge branch 'master' into M17428-c
2018-08-21 16:52:30 +12:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
...
Safe landing client-side improvements
2018-08-20 20:36:17 -07:00
David Rowe
8a8bf6dc04
Reduce default size of tablet in HMD mode
2018-08-21 10:49:19 +12:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
...
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
Simon Walton
a891b74fac
Reset SafeLanding in all cases
...
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
2018-08-20 12:31:21 -07:00
Dante Ruiz
2261ad2bcb
clean up the interstitial page
2018-08-20 11:14:48 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
Ryan Huffman
5d44877f56
Fix functionality sometimes getting stuck if window loses focus
2018-08-15 13:32:58 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831
...
FB16831 qml-related warnings in log
2018-08-14 16:40:07 -07:00
sabrina-shanman
e5cb078133
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
2018-08-13 14:51:37 -07:00
