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

24806 commits

Author SHA1 Message Date
John Conklin II
3982472cf2
Merge pull request #12851 from druiz17/rc66-spwan-fix 
serverless-domain named landing-points(RC66)
 2018-04-13 14:58:36 -07:00
SamGondelman
8005547d03 rollback some qml changes on android 2018-04-13 14:28:00 -07:00
samcake
b88b668a06 Exposing more texture memory budget options 2018-04-13 12:19:53 -07:00
samcake
e6085a90d6 Exposing more texture memory budget options 2018-04-13 12:17:50 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows 
hide desktop windows when switching into HMD mode
 2018-04-13 12:17:15 -07:00
Melissa Brown
fd7b3b75f9
Merge pull request #12884 from Atlante45/fix/build-instructions 
Update docs with correct qt version
 2018-04-13 11:12:06 -07:00
Seth Alves
a56f3f4a10 code review 2018-04-12 19:06:12 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829 
Model overlay fixes
 2018-04-12 17:04:55 -07:00
Simon Walton
76468f7f26 Use existing DISABLE_WATCHDOG global to turn off thread entirely 2018-04-12 16:58:13 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1 
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
 2018-04-12 11:48:09 -07:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2 
Move to qqc2
 2018-04-12 11:26:55 -07:00
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
67b1313fb6
Merge pull request #12669 from ElderOrb/FB13143 
Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser
 2018-04-12 10:34:58 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage 
Bugfix for #12759 Overlays.editOverlay not applying subImage property
 2018-04-12 10:34:17 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix 
Typo corrected: getAnimatationRoles to getAnimationRoles
 2018-04-12 10:32:09 -07:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option 
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
 2018-04-12 09:28:28 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue 
Hack: Adding more budget options for memory texture
 2018-04-11 15:46:08 -07:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
David Rowe
c836014d21 Fix JSDoc typo noticed in passing 2018-04-12 09:24:10 +12:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822 
Fix text sizing per text3d overlay lineHeight property
 2018-04-11 12:16:51 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814 
Settings API JSDoc
 2018-04-11 11:48:15 -07:00
Zach Fox
539fd42324 Reduce logging from some Commerce/Discovery features 2018-04-11 09:41:47 -07:00
Zach Fox
a411760f0c Finally fix the grey security pic bug! 2018-04-11 09:41:47 -07:00
Zach Fox
feec52b4bb Cleanup 'Private' HMD Preview State Machine Logic 2018-04-11 09:41:47 -07:00
Zach Fox
dc3e1751cb Commerce: Gifts 2018-04-11 09:41:47 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError 
Commerce: Fix Certificate Info error
 2018-04-11 09:38:43 -07:00
Zach Fox
095b4ba5f2 Reduce logging from some Commerce/Discovery features 2018-04-10 16:02:58 -07:00
Zach Fox
b9d0360ea2 Finally fix the grey security pic bug! 2018-04-10 16:00:53 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
ffab27d442 Commerce: Fix Certificate Info error 2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830 support specification of named landing-points in serverless-domain json files 2018-04-10 14:25:59 -07:00
Simon Walton
ca5720c015 Take out superfluous DependencyManager::set<tracing::Tracer>() 2018-04-10 13:52:46 -07:00
Simon Walton
cf3648409d Allow duration for tracing, other fixes 2018-04-10 13:14:52 -07:00
Simon Walton
513a4875f0 Move --traceFile option to start of main() 2018-04-10 13:13:47 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
John Conklin II
890a63afb4
Merge pull request #12833 from ElderOrb/FB14015_RC66 
Close 'goto' app on pressing 'forward' / 'backward' buttons
 2018-04-09 11:42:17 -07:00
John Conklin II
be3d5d03cc
Merge pull request #12808 from ElderOrb/FB13962_RC66 
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
 2018-04-09 09:42:00 -07:00
NissimHadar
7f70511d1a Added a script command to clear caches. 2018-04-08 10:32:35 -07:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
David Rowe
f3a745b6cb Fix initialization order 2018-04-07 18:53:27 +12:00
David Rowe
8093e3e5ae Fix some miscellaneous JSDoc typos 2018-04-07 16:48:05 +12:00
David Rowe
96178404c7 Document that jointTranslations and jointRotations are not cloned 2018-04-07 16:47:38 +12:00
David Rowe
ba020854b6 Add missing "animationSettings.currentFrame" property JSDoc 2018-04-07 16:46:44 +12:00
David Rowe
38d7b81a4f Add missing "get" and JSDoc for "loadPriority" property 2018-04-07 16:46:02 +12:00
David Rowe
6d9b69cd2e Fix cloning a model overlay not cloning animation settings 2018-04-07 16:44:58 +12:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
Cristian Luis Duarte
bd6f0fd59e Make view/rotation control independent of touchUpdate events rate 2018-04-06 16:17:28 -03:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
Alexander Ivash
25a44edfce fix conditional bindings 
note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors
 2018-04-06 13:22:27 +03:00
Alexander Ivash
3ce00acd16 rebased to the master 2018-04-06 13:22:27 +03:00
Alexander Ivash
c34a6fd000 Fix styling issues - make TabletQueryDialog more consistent with TabletCustomQueryDialog 2018-04-06 13:22:27 +03:00
Alexander Ivash
91488bbbeb align combobox to accept/cancel buttons, otherwise stretch to buttons area 2018-04-06 13:22:22 +03:00
Alexander Ivash
557b7ded66 fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear) 
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
 2018-04-06 03:00:44 +03:00
Alexander Ivash
9ec10bbb7e Make keyboard's 'raisedHeight' to include 'mirror text' height 
note: this is necessary becasue all the dialogs rely on 'raisedHeight', so without 'mirror text' they will use wrong keyboard geometry during calculations
 2018-04-06 00:18:19 +03:00
Howard Stearns
ad191defb8
Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError 
Prevent Interface from crashing when a Snapshot upload fails
 2018-04-05 13:51:33 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Zach Fox
ac2721fe6a Logging improvements 2018-04-05 13:04:09 -07:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003 
cleanup around simulation-ownership
 2018-04-05 10:58:45 -07:00
Seth Alves
4b0d338e57 on first run, send user to serverless tutorial rather than checking for a local sandbox 2018-04-04 18:00:11 -07:00
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
Dante Ruiz
31783726a8 fix toolbar disappearing 2018-04-04 16:30:06 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
WolfGang
787127b149 move subImage recalculation to it's own method 2018-04-04 22:10:54 +01:00
Dante Ruiz
475a3a29ac remvoe debug statement 2018-04-04 11:14:53 -07:00
Dante Ruiz
09ced24710 hide desktop windows when switching into HMD mode 2018-04-04 11:05:25 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one 
Remove notifications and print outs when degrading LOD
 2018-04-04 10:35:05 -07:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 
Fix 'Private' HMD preview texture enable/disable...again
 2018-04-04 10:03:18 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking 
Inspection: Tweak mouse-right-click-to-inspect behavior
 2018-04-04 09:32:29 -07:00
WolfGang
f9bcd23463 make subimage update the image anchors 2018-04-04 17:28:55 +01:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870 
Fix for not updating checkbox state on 'baking' / 'unbaking'.
 2018-04-04 09:03:03 -07:00
samcake
1629756d53 Adding more budget options for memory texture 2018-04-03 18:08:43 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Cristian Luis Duarte
88c83f3bfe Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 19:59:21 -03:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
David Rowe
095c1b837c Update JSDoc 2018-04-04 09:48:33 +12:00
David Rowe
6868ca971f Make Window.x and Window.y report top left of drawable area of window 2018-04-04 09:43:39 +12:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
howard-stearns
01d90ea1a5 Introduce safeLoading. 2018-04-03 13:49:09 -07:00
Zach Fox
f20eddefc8 Fix 'Private' HMD preview texture enable/disable...again 2018-04-03 13:46:02 -07:00
samcake
2dc4630e68 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-04-03 12:55:21 -07:00
Seth Alves
a1ce9481bb
Merge pull request #12739 from druiz17/fix-mapping-mistake 
map flying down back to C key
 2018-04-03 12:39:46 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Cristian Luis Duarte
cbf13c9f8c Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9 Android - Initial Jump button implementation 2018-04-03 16:07:40 -03:00
Alexander Ivash
ccea3efe1e FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-04-03 21:43:40 +03:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation 
Fix cert location for content sets; handle .content.zip content sets
 2018-04-03 09:10:11 -07:00
David Rowe
ab55f20976 Fix text sizing per text3d overlay lineHeight property 
Makes text size correct for multiple lines of text.
 2018-04-03 16:54:07 +12:00
David Rowe
63603ff97c Fix window height reported by Window.geometryChanged() signal 2018-04-03 14:21:15 +12:00
samcake
5a1eac563b Code review fixes 2018-04-02 15:50:18 -07:00
John Conklin II
9dcef996c5
Merge pull request #12684 from vladest/assetserver_wrong_dialog 
Fix invalid message if cancel adding asset to AssetServer
 2018-04-02 15:28:46 -07:00
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour 
Trigger Avatar Recenter Behaviour
 2018-04-02 14:42:21 -07:00
Zach Fox
1f3063193a Tweak right-click to inspect 2018-04-02 14:24:51 -07:00
samcake
d4bc61fb3d Remove notifications and print outs for LOD changes because it was too much noise 2018-04-02 13:53:30 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller 
Updating char controller
 2018-04-02 13:24:15 -07:00
Zach Fox
5441767442 Better cert display 2018-04-02 12:22:41 -07:00
Zach Fox
7f3e9547cc Handle the case when metaverse returns error for certificateInfo 2018-04-02 11:55:10 -07:00
Dante Ruiz
a9a53c7d64 make resquested changes 2018-04-02 10:51:39 -07:00
Seth Alves
e8a62d2943
Merge pull request #12740 from druiz17/fix-scope 
Fix name conflict with c++ class and qml file(master)
 2018-03-30 15:41:42 -07:00
Dante Ruiz
4b7e2cb331 made requested changes 2018-03-30 15:15:17 -07:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
Andrew Meadows
73fa6d3d2f slightly simpler EntityMotionState delete logic 2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad move entityCollisionWithEntity to PhysicalEntitySimulation 2018-03-30 13:18:32 -07:00
Olivier Prat
5c26b4030b Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-30 14:38:42 -04:00
Ken Cooke
ff6c9f3127
Merge pull request #12704 from ElderOrb/FB13057 
Improve audio devices selection logic
 2018-03-30 11:18:05 -07:00
Zach Fox
32e5e9986f Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation 2018-03-30 10:10:43 -07:00
Ken Cooke
a2be291363
Merge pull request #12715 from ctrlaltdavid/21677 
Add Window.raise() as replacement for Window.raiseMainWindow()
 2018-03-30 09:41:54 -07:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes 
Fix/rc66 crashes
 2018-03-29 18:04:52 -07:00
Alexander Ivash
814cfa4587 fix TabletAssetServer 2018-03-30 00:09:28 +03:00
John Conklin II
90dec1d3ef
Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66 
RC66: fix cmake changes for script copy for dev builds
 2018-03-29 13:57:45 -07:00
Alexander Ivash
e5da59a62f FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version" 2018-03-29 23:01:59 +03:00
Olivier Prat
5f8693aae2 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 15:52:38 -04:00
John Conklin II
c7f7e2487c
Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66 
fix -- make drag-and-drop of json mean import again
 2018-03-29 12:46:09 -07:00
John Conklin II
d6b652bdf3
Merge pull request #12735 from druiz17/RC66 
Fix name conflict with c++ class and qml file(RC66)
 2018-03-29 12:06:15 -07:00
John Conklin II
379df87d0c
Merge pull request #12697 from misslivirose/feat/disable-add-without-url 
Disable Add Button in Model Modal until user has entered text in the model URL
 2018-03-29 11:39:48 -07:00
Dante Ruiz
f7a081c9ec minimize diff 2018-03-29 11:24:31 -07:00
Dante Ruiz
420672a769 fix-qml-confict 2018-03-29 11:24:08 -07:00
Dante Ruiz
e738274e90 map flying down back to C key 2018-03-29 11:10:39 -07:00
Seth Alves
dcfebde54a put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain 2018-03-29 10:50:43 -07:00
amantley
3f44b88d2d added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class 2018-03-29 10:09:51 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes 
Attempt to resolve potential overlay crashes at shutdown
 2018-03-29 09:37:23 -07:00
Dante Ruiz
0bdf26faaf minimize diff 2018-03-29 09:29:01 -07:00
Dante Ruiz
8cdb59413d fix-qml-confict 2018-03-29 09:26:05 -07:00
Olivier Prat
3c8cd48dfb Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 07:21:01 -04:00
Liv Erickson
387ff680d5 support deleted scenario 2018-03-28 18:12:30 -07:00
Liv Erickson
b78f00342e Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url 2018-03-28 17:53:42 -07:00
Sam Gondelman
d2a74e5713
Merge pull request #12686 from gcalero/android_ui_not_move_camera 
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
 2018-03-28 17:14:42 -07:00
Stephen Birarda
35ee1bec09 fix cmake changes for script copy for dev builds 2018-03-28 14:56:53 -07:00
Stephen Birarda
0172c24cf2 fix cmake changes for script copy for dev builds 2018-03-28 14:47:09 -07:00
amantley
90d87c5b5d changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety 2018-03-28 14:00:36 -07:00
John Conklin II
790162c88b
Merge pull request #12689 from ctrlaltdavid/21808 
Reinstate Overlays.getOverlayObject API function
 2018-03-28 14:00:28 -07:00
vladest
70ce1b2bf7 Fix invalid scrolling detection 2018-03-28 21:48:44 +02:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
amantley
4b1f974561 fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h 2018-03-28 11:57:48 -07:00
Zach Fox
0175028a88 Ensure location is correctly updated when replacing set from Checkout page 2018-03-28 11:31:51 -07:00
vladest
001b6d23ff Merge branch 'master' into move_to_qqc2 2018-03-28 20:16:26 +02:00
amantley
95f1d0e4fa added get and set functions for the activate recenter variables 2018-03-28 10:33:00 -07:00
Zach Fox
ca2fba675d Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation 2018-03-28 10:28:32 -07:00
Brad Hefta-Gaub
16df773de4
Merge pull request #12721 from highfidelity/RC66 
RC66 - Mergeback
 2018-03-28 09:55:46 -07:00