Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 11:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67477 commits 22 branches 28 tags 1.2 GiB
Commit graph

24966 commits

Author SHA1 Message Date
Ken Cooke
764aa00069 Coding standard fixes 2018-04-19 07:33:14 -07:00
milad
364d193499 audio added 2018-04-18 21:04:57 -07:00
milad
3f129bda13 More done on audio 2018-04-18 20:04:41 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Zach Fox
e01e7cc7bc Be a bit more efficient 2018-04-18 16:34:02 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath 
Fix paths to various Snapshot resource files
 2018-04-18 13:44:53 -07:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Gabriel Calero
472cc1b29a Fix code spacing 2018-04-18 16:44:49 -03:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 
more correct stats names
 2018-04-18 10:50:38 -07:00
John Conklin II
d19bb557ad
Merge pull request #12897 from ctrlaltdavid/21848 
Include JSDoc Web pages in the install
 2018-04-18 10:49:31 -07:00
John Conklin II
005b6a6b1f
Merge pull request #12893 from ctrlaltdavid/21843 
Fix overlay toggling
 2018-04-18 10:49:05 -07:00
Atlante45
7e6d45ead7 CR 2018-04-17 16:25:07 -07:00
Stephen Birarda
95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66 2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018 
Discovery: April 2018 (Huge PR; see description)
 2018-04-17 15:11:50 -07:00
Atlante45
a626e9f6f3 Add special handler for heap corruption 2018-04-17 15:09:10 -07:00
Brad Davis
d478204722 Working on splash rendering 2018-04-17 14:17:41 -07:00
Zach Fox
95ee3c82f5 Fix paths to various Snapshot resource files 2018-04-17 14:13:14 -07:00
David Rowe
e3edc45081 Document NavigationFocused 2018-04-18 07:04:55 +12:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Anthony J. Thibault
0a162e62b0 transmit sendAll packet in nodeActivated signal callback 
(cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)
 2018-04-16 16:16:56 -07:00
Zach Fox
93cf399fd6 Only dismiss letterbox when clicking on grey areas 2018-04-16 15:09:19 -07:00
Anthony J. Thibault
c29bf51226 Fix for avatar glitches, head and legs folding into chest. 
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.

This particular issue is caused by an interaction between the default value flag and the joint changed culling.

When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.

When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.

Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.

I've done three things to help mitigate this issue.

1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it.  No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
   translations from the default pose.  This will help the case where a client receives a non default value, but has no previous history.

(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
 2018-04-16 14:58:33 -07:00
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
Zach Fox
02aa8ac566 Bugfixes per QA 2018-04-16 11:53:37 -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
ee9519bf1b Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018 2018-04-16 10:12:34 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
David Rowe
06bb873e8d Include JSDoc Web pages in the install 2018-04-16 16:08:26 +12:00
David Rowe
df31d20430 Fix overlay toggling 2018-04-14 17:06:34 +12:00
Sam Gondelman
7c65c9c444
Merge pull request #12888 from SamGondelman/statsAssert 
Rollback some recent QML changes on Android
 2018-04-13 16:35:28 -07: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
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
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -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
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
Cristian Luis Duarte
b031c1c070 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 14:32:07 -03: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
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
Gabriel Calero
8010fd2420 New view selector behaviour. Update icons 2018-04-11 18:43:39 -03: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
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03: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
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
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
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
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
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
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
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
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
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
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
Gabriel Calero
176038aa53 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-02 12:23:04 -03:00
Gabriel Calero
2ff13270ed Go back to GoTo screen 2018-04-02 12:22:21 -03: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
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
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
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
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord 
changing keyboard mapping
 2018-03-27 19:00:05 -07: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
1bcb9738f0 Miscellaneous fixes noticed in passing 2018-03-28 12:26:08 +13:00
David Rowe
f27e8868eb Add HMD JSDoc 2018-03-28 12:25:12 +13:00
Dante Ruiz
ad9ca0da20 fix tablet version 2018-03-27 16:03:06 -07:00
John Conklin II
a258a330d3
Merge pull request #12676 from druiz17/fix-keyboard 
fixing AddressManager keyboard when switching domains
 2018-03-27 15:34:23 -07: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
John Conklin II
0862f345fe
Merge pull request #12717 from sethalves/workaround-dialog-crash 
fix -- work around asset-upload dialog crash
 2018-03-27 13:35:50 -07:00
John Conklin II
7c505a0b85
Merge pull request #12711 from sethalves/serverless-tutorial-rc66 
Serverless tutorial rc66
 2018-03-27 11:17:07 -07:00
Seth Alves
4f7d856a1c don't free dialogs to avoid crash in setKeyboardRaised 2018-03-27 09:28:55 -07:00
vladest
096b56395e Fix crash on startup 2018-03-27 18:22:56 +02:00
David Rowe
d1d58eceab Add Window.raise() as replacement for Window.raiseMainWindow() 2018-03-27 13:04:50 +13:00
Zach Fox
db2f3451bd Support .content.zip content sets 2018-03-26 16:20:29 -07: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
Ryan Huffman
d01a58517f Fix serverless content not using correct directories 2018-03-26 14:32:52 -07:00
Stephen Birarda
787947b6a8 add a default tutorial json for dev interface 2018-03-26 14:32:26 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -07:00
Zach Fox
a588776b47 Fix infinite loading when authing wallet during Checkout 2018-03-26 13:19:40 -07:00
Dante Ruiz
1f23e7ab8b fixing more edge cases 2018-03-26 10:15:15 -07:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03: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
vladest
56150f8962 Merge branch 'master' into move_to_qqc2 2018-03-24 15:34:49 +01:00
vladest
e0593b7799 Use Flickable instead of ScrollView 2018-03-24 15:32:46 +01:00
vladest
aefda9ef71 Merge branch 'master' into move_to_qqc2 2018-03-24 15:32:04 +01:00
Dante Ruiz
96707a2568 fix mappoing conflicts 2018-03-23 16:43:36 -07:00
Cristian Luis Duarte
686af4ff77 Clean code that manually checked for windows coordinates to disable radar touch 2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -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
28e61bcbb1 fix typo 2018-03-23 11:57:01 -07:00
Dante Ruiz
a14d5c6546 make alternate keys work 2018-03-23 11:55:16 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -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