Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67263 commits 76 branches 59 tags 1.2 GiB
Commit graph

20567 commits

Author SHA1 Message Date
Andrew Meadows
a80cf49eb3 split 'ETRupdate' out of 'postPhysics' stat context 2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4 more correct stat names 2018-04-16 13:31:36 -07:00
Zach Fox
0504220171 Abide by new backend code 2018-04-16 13:01:31 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801 
HMD API JSDoc
 2018-04-16 11:12:26 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace 
Enable Interface tracing from earliest execution point
 2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
David Rowe
df31d20430 Fix overlay toggling 2018-04-14 17:06:34 +12:00
Clement
bd59ff1573 Fix threaded force crashes 2018-04-13 15:11:49 -07:00
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
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
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
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03: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
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -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
Cristian Luis Duarte
d993e4938e Merge remote-tracking branch 'hifi/master' into android_goto_splash 2018-04-11 18:03:16 -03: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
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
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
Gabriel Calero
b30cb25a3f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-09 12:20:35 -03:00
Gabriel Calero
e85f5c97dc Remove bottom bar. Apply new design for android 2018-04-09 11:41:00 -03:00
NissimHadar
7f70511d1a Added a script command to clear caches. 2018-04-08 10:32:35 -07: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
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07: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
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
Gabriel Calero
0da2c972e3 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-05 16:22:56 -03: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
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00
Gabriel Calero
99d8f822b2 Fix crash selecting domain for second time. Stop rendering while Goto activity is started 2018-04-04 19:24:26 -03: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
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
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
Gabriel Calero
ddbf4417ff Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 12:24:25 -03: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
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
samcake
2dc4630e68 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-04-03 12:55:21 -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
Gabriel Calero
78c50410b3 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-04-03 14:37:19 -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
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
Gabriel Calero
2ff13270ed Go back to GoTo screen 2018-04-02 12:22:21 -03: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
Gabriel Calero
b123b67134 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-03-30 15:38:36 -03: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
Olivier Prat
5f8693aae2 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 15:52:38 -04: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
Olivier Prat
3c8cd48dfb Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 07:21:01 -04: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
amantley
4b1f974561 fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h 2018-03-28 11:57:48 -07: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
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml 
Fix asset server qml sorting
 2018-03-28 09:35:53 -07:00
Brad Davis
aacfe92751 Don't trigger crashes from timers while waiting for some operation on exit 2018-03-28 09:09:56 -07:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
David Rowe
c3df741c62 Settings API JSDoc 2018-03-28 17:14:06 +13:00
Seth Alves
bb101956a6 fix entity importing 2018-03-27 18:25:43 -07:00
amantley
9f3b82a417 added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly 2018-03-27 18:21:14 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
David Rowe
f27e8868eb Add HMD JSDoc 2018-03-28 12:25:12 +13:00
Dante Ruiz
197662fd5e fix contextOverlay highlighing all entities 2018-03-27 15:22:22 -07:00
Brad Davis
29106fbbbe Prevent potential double delete of QML overlays 2018-03-27 14:18:19 -07:00
Brad Davis
eb20181b60 Shut down the overlay interface on exit 2018-03-27 14:18:01 -07:00
David Rowe
d1d58eceab Add Window.raise() as replacement for Window.raiseMainWindow() 2018-03-27 13:04:50 +13:00
Zach Fox
bf48ecda6d Fix cert location for content sets 2018-03-26 14:48:05 -07:00
Alexander Ivash
06410ec342 temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged 2018-03-27 00:44:17 +03:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Alexander Ivash
8e551f4dc0 re-select re-plugged device 2018-03-25 13:49:59 +03:00
Alexander Ivash
3c45f17d70 remove unused code 2018-03-25 13:44:16 +03:00
Alexander Ivash
f6bbdec902 remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged 
note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop
 2018-03-25 13:43:51 +03:00
Gabriel Calero
8558759d41 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-23 16:56:53 -03:00
Dante Ruiz
a14d5c6546 make alternate keys work 2018-03-23 11:55:16 -07:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics 
Wrap text in query dialogs. Add right margins for input field and but…
 2018-03-22 17:56:47 -07:00
Dante Ruiz
f36a916fb6 revert comment change 2018-03-22 17:44:17 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Dante Ruiz
1d17658c80 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-22 16:29:16 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1 
Commerce: Item Updates!
 2018-03-22 15:40:22 -07:00
Seth Alves
6c1d713968 review 2018-03-21 19:21:57 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Seth Alves
196f621a60 remove unneeded setSessionUUID 2018-03-21 15:21:49 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Gabriel Calero
35935ed41a Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-21 17:41:02 -03:00
Gabriel Calero
11bfc1ca74 Add Goto as splash screen in android 2018-03-21 17:40:14 -03:00
Dante Ruiz
9d8770b134 changing speed 2018-03-21 13:25:50 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Dante Ruiz
cce77e3e68 made requested changes 2018-03-21 10:15:42 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Dante Ruiz
86cd5ffa30 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-21 08:49:25 -07:00
David Rowe
8df6cd58c6 Document Overlays.getOverlayObject's use for web3d event bridge 2018-03-21 15:50:22 +13:00
David Rowe
05efc5a231 Revert "Remove Overlays.getOverlayObject() from JavaScript API" 
This reverts commit 8e2a3e8c99.
 2018-03-21 15:36:39 +13:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash 
Fix invalid QML surface cache interaction
 2018-03-20 14:26:39 -07:00
Seth Alves
585a523823 unmangle merge 2018-03-20 11:17:56 -07:00