Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 22:06:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68554 commits 6 branches 1 tag 1.1 GiB
Commit graph

25428 commits

Author SHA1 Message Date
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
Alexander Ivash
d659696b60 FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-05-21 13:29:41 -07:00
howard-stearns
fc6bfe9e44 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-21 10:41:45 -07:00
samcake
b4807becb6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 10:41:25 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gondelman
6eb6a5b767
Merge pull request #13197 from gcalero/your_last_location 
Add "Your Last Location" to Android Home
 2018-05-21 09:28:56 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
druiz17
bd3a9865bf moving control speech to developer menu 2018-05-19 18:27:28 -07:00
druiz17
f2807e38f9 fix goto shortcut 2018-05-19 17:36:46 -07:00
samcake
3aaa01788c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-18 17:42:30 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Dante Ruiz
8a2b54c2b7 fixing mistakes 2018-05-18 17:09:41 -07:00
howard-stearns
d385a255c4 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-18 16:53:08 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
Dante Ruiz
6eb5a78611 fixing code that breaks andriod build 2018-05-18 10:33:03 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Dante Ruiz
ea771c2325 make final changes 2018-05-18 09:21:41 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
Gabriel Calero
7a6b7b8ba3 Add Your Last Location in Android Home 2018-05-18 12:26:41 -03:00
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
SamGondelman
c57c15f22c fix resolution option 2018-05-17 16:58:35 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
samcake
0cf87748cd Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-17 14:20:44 -07:00
Dante Ruiz
0f122e3dbc Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 13:33:34 -07:00
Dante Ruiz
e760912fd2 fix warning 2018-05-17 13:33:19 -07:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
vladest
eb25601856 Return back LOD tools 2018-05-17 20:41:50 +02:00
Dante Ruiz
ccea493498 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 11:36:03 -07:00
Dante Ruiz
201b8a5140 fixing the graphics preference 2018-05-17 11:35:34 -07:00
Gabriel Calero
5a73da6fdf Bugfix: stop audio when app starts 2018-05-17 14:05:49 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
vladest
95cd9476c3 Fixed modality in Desktop 2018-05-17 16:11:28 +02:00
David Rowe
d20cd6ad44 Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot() 2018-05-17 20:25:25 +12:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
samcake
ade1d6c056 use the correct call to toggle the debugFXAA on the AaConfig 2018-05-16 15:37:13 -07:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Zach Fox
bc590f556a Get first page 2018-05-16 14:43:43 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Zach Fox
486f33b4bd Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash 2018-05-16 14:14:35 -07:00
Dante Ruiz
237b0d7483 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 13:49:02 -07:00
Dante Ruiz
fbc3d97af3 adding back overlay menu and avatar size 2018-05-16 13:48:29 -07:00
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements 
Spectator Camera V2
 2018-05-16 13:38:07 -07:00
Zach Fox
97bb014734 Almost working for Purchases! 2018-05-16 13:20:23 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
John Conklin II
8d437892cb
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing 
Fix hips position when flying
 2018-05-16 12:37:07 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00
vladest
8c146521cf remove double crash options 2018-05-16 21:10:51 +02:00
vladest
7501b8818e removed shadows quality 2018-05-16 21:01:50 +02:00
Zach Fox
79f8232c14 Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel 2018-05-16 11:11:24 -07:00
Zach Fox
f8215b5999 Fix final? crash 2018-05-16 11:05:21 -07:00
Zach Fox
c3ea176b58 Give me my reticle back! 2018-05-16 10:54:58 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
luiscuenca
7b48dc2370 normalize vector 2018-05-16 10:17:38 -07:00
Zach Fox
c34605f686 GIF snapshots using the Snap app are still weird, but the bug is fixed 2018-05-16 10:15:51 -07:00
Zach Fox
012ae741a5 Fix MS15103: Interface crashes on snap if snap dir is deleted 2018-05-16 09:52:19 -07:00
Simon Walton
b43cb5b86f Take out VS's auto reformatting 2018-05-16 09:36:55 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions 
avatars collide again
 2018-05-16 09:25:05 -07:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
vladest
a9930d53a9 Reorder VR menu 2018-05-16 14:25:58 +02:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
Simon Walton
f4d24a3d0e Quiet MacOS warning 2018-05-15 16:40:21 -07:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
f629022b8c AvatarList API JSDoc stubs 2018-05-16 10:16:13 +12:00
John Conklin II
1313d28b9d
Merge pull request #13112 from sethalves/fix-overlay-asan-warning 
Fix overlay asan warning
 2018-05-15 14:51:05 -07:00
Simon Walton
2b30c1389e Try reducing concurrent downloads for Android 2018-05-15 14:30:08 -07:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
luiscuenca
4b09f1dc30 Fix vector transformation when calculating flying hip position 2018-05-15 14:19:17 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
Andrew Meadows
c5773cbe84 restore 'virtual' keyword for overrides 2018-05-15 13:59:22 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
vladest
dd05afa974 Remove double setting 2018-05-15 21:43:43 +02:00
Gabriel Calero
b80597a436 Restore display plugin activation/deactivation 2018-05-15 15:51:11 -03:00
Zach Fox
bccaa2dbe5 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-15 11:50:38 -07:00
Zach Fox
ccab2dd641 Starting the work 2018-05-15 11:48:33 -07:00
Dante Ruiz
c6ff301aac Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-15 11:32:23 -07:00
Dante Ruiz
71633105de adding back some menus 2018-05-15 11:31:58 -07:00
Gabriel Calero
306b8cc68a Set HomeActivity transparent to avoid texture corruption (black and white) 2018-05-15 15:14:17 -03:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866 
Don't unnecessarily scroll HTML content when keyboard is raised
 2018-05-15 11:00:38 -07:00
Seth Alves
78a8e8e500 quiet asan warning 2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan 
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
 2018-05-15 10:58:00 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1 
Added method to test namespace to save JSON object to a file.
 2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item 
OpenVR: Remove reference to HMD Standing Mode menu item
 2018-05-15 10:30:00 -07:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
David Rowe
b7a0ff523a LaserPointers API JSDoc stubs 2018-05-15 17:36:23 +12:00
David Rowe
8e9799b80f Pointers API JSDoc fix up 2018-05-15 16:36:42 +12:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
Zach Fox
e607c68bea Thanks Mukul! 2018-05-14 16:48:40 -07:00
David Rowe
9040e45be7 RayPick API JSDoc stubs 2018-05-15 11:43:49 +12:00
NissimHadar
d4d2f3c957 Moved ownership of test location into the Test Scripting class. 2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 16:23:36 -07:00
David Rowe
3fb6fd1afb Picks API JSDoc stubs 2018-05-15 11:22:47 +12:00
Zach Fox
43254e2981 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-14 15:12:44 -07:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item 
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
 2018-05-14 13:51:13 -07:00
Anthony J. Thibault
ec638d9d91 Avatar can now look straight down without spinning 180. 
Also, come code clean up and removal of unnecessary Y_180 flips.
 2018-05-14 13:48:04 -07:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
NissimHadar
5f219e27f7 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:35:48 -07:00
Andrew Meadows
a30e06d594 don't blend avatar position when far from target 2018-05-14 09:58:16 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
Anthony J. Thibault
1cc7eb635f Fix ubuntu warning by removing cancelOutRollAndPitch2() 2018-05-14 09:13:26 -07:00
Anthony J. Thibault
274ac98bd6 Merge branch 'master' into nativeCGCode 2018-05-14 09:12:08 -07:00
David Rowe
77021f3236 Fix up Stats JSDoc 2018-05-14 17:32:18 +12:00
David Rowe
d0596f8205 Fix Wallet JSDoc stubs 2018-05-14 10:43:55 +12:00
David Rowe
5378d64913 Remove erroneously added function declarations 2018-05-13 18:06:30 +12:00
David Rowe
176dbb5557 Wallet API JSDoc stubs 2018-05-13 11:02:09 +12:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
David Rowe
81a621890a Stats API JSDoc stubs 2018-05-12 18:01:55 +12:00
David Rowe
74617822fa Snapshot API JSDoc stubs 2018-05-12 16:32:33 +12:00
David Rowe
bf7863ad10 LocationBookmarks API JSDoc stubs 2018-05-12 14:23:03 +12:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00
Gabriel Calero
db460e9856 Put back the worker thread for account manager in android 2018-05-11 16:09:40 -03:00
Seth Alves
c624528f72
Merge pull request #13157 from druiz17/fix-qml-crash 
fix qml crash on start up
 2018-05-11 11:38:12 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2 
Additional work on splash screen
 2018-05-11 11:26:37 -07:00
Dante Ruiz
4eba727849 fix qml crash on start up 2018-05-11 10:47:41 -07:00
Zach Fox
a6dd95e31b
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose 
don't enable so much logging when 'verbose logging' is turned on
 2018-05-11 10:44:48 -07:00
Dante Ruiz
9e9852d67b
Merge pull request #12989 from Triplelexx/21774_file_browser 
Worklist #21774: Fix Windows.browseAssets() bugs
 2018-05-11 08:50:17 -07:00
David Rowe
fb175d7110 AudioEffectOptions API JSDoc stubs 2018-05-11 20:36:10 +12:00
NissimHadar
1364f4391d Can store JSON object. 2018-05-10 18:02:44 -07:00
Anthony J. Thibault
0ac12fa317 Bug fix for Vive Tracker Calibration Settings 
This issue was inadvertently introduced by the name change of the Vive display plugin.
 2018-05-10 17:56:54 -07:00
Seth Alves
826c427e2a trying to sort-out audio-stream logging 2018-05-10 15:42:59 -07:00
Seth Alves
32d10641dc don't enable so much logging when 'verbose logging' is turned on 2018-05-10 14:41:54 -07:00
Gabriel Calero
a1a48d9b9e Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-10 18:24:26 -03:00
Triplelexx
a061e84ad7 remove unused commented code 2018-05-10 19:40:02 +01:00
Zach Fox
0236bc0c44 Cleanup after merge conflict 2018-05-10 09:51:45 -07:00
Zach Fox
ce575d367a Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-10 09:31:02 -07:00
vladest
a3f8148165 Added enable disable shadows menu 2018-05-10 12:40:13 +02:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
vladest
399e18dfc1 Disable non implemented sound notifications until further notice 2018-05-10 10:28:48 +02:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
Zach Fox
44cfa95830 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-09 15:01:24 -07:00
amantley
20c960c0da removed white space in MyAvatar.cpp 2018-05-09 15:00:20 -07:00
amantley
eff84de99f added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT 2018-05-09 14:55:10 -07:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix 
MS14937: Fix Replace button for content sets during Checkout
 2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08 use setFilterRules rather than specifying each logging category to suppress 2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
amantley
50f225777a removed debug code from cg code in MyAvatar.cpp 2018-05-09 11:31:19 -07:00
amantley
a7955b642a removed the follow hips code from pre physics update 2018-05-09 11:27:04 -07:00
amantley
77aedc1512 changed lerp to saferLerp in cg code 2018-05-09 11:14:13 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound 
MS14951: Fix Snapshot hotkey sound playback
 2018-05-09 11:07:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester 
Command line parameters for autotester
 2018-05-09 10:51:31 -07:00
Gabriel Calero
843282739e Remove unused includes and white spaces 2018-05-09 14:16:51 -03:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue 
Do not open help on first run
 2018-05-09 18:48:05 +02:00
Zach Fox
542e707de8 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:40:51 -07:00
Zach Fox
06c6f55069 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:35:42 -07:00
Gabriel Calero
b0fee3fd8b Improve code based on changes requested in the PR 2018-05-09 11:06:32 -03:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
NissimHadar
175fa9108e Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 15:52:15 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
Gabriel Calero
5e337e90a3 Deactivates display plugin when qt app goes to background 2018-05-08 16:55:04 -03:00
Gabriel Calero
da69c9d077 Make qt application not stop in background and remove separete thread 2018-05-08 15:45:33 -03:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -07:00
amantley
6051f4b8ff Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode 
synching the branch with the remote repo
 2018-05-08 10:55:14 -07:00
amantley
544967ef3b added test function to cancel out roll and pitch 2018-05-08 10:55:10 -07:00
amantley
bbf8c73572 code review changes to declare functions static 2018-05-08 10:52:28 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
NissimHadar
8ad13826bd Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441 Use 'standard' format for command line parameter with multiple options. 2018-05-07 13:01:18 -07:00
Gabriel Calero
9b63b76b68 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-07 16:06:02 -03:00
Gabriel Calero
66b975192d Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login 2018-05-07 15:56:43 -03:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818 
Fix for 'Login page for steam is blank'
 2018-05-07 11:26:39 -07:00
John Conklin II
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors 
don't spam resetSensors function when holding down Qt::Key_Apostrophe
 2018-05-07 10:52:51 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
Alexander Ivash
b4cfea2fbc FB14818 Login page for steam is blank 2018-05-06 17:17:06 +03:00
vladest
afe04f3a4f cleanup 2018-05-06 14:24:54 +02:00
vladest
1794113f37 Check global switch as well 2018-05-06 12:51:59 +02:00
vladest
ac413c8854 Tablet opening notification sound settings added 2018-05-06 09:41:10 +02:00
Seth Alves
30c5fa6fa1 fix divide-by-zero asan warning in LODManager::autoAdjustLOD 2018-05-05 20:45:06 -07:00
vladest
c7ab1f3dbf Merge branch 'master' into menu-updates 2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02 Merge branch 'master' into menu-updates 2018-05-05 07:11:39 +02:00
Clement
5a3773ba72 Fix compile error on linux/windows 2018-05-04 18:18:46 -07:00
David Rowe
5021778dc0 Merge branch 'master' into 21866 2018-05-05 12:17:18 +12:00
David Rowe
5e6b83a634 Lint 2018-05-05 12:14:51 +12:00
David Rowe
1be948ee28 Scroll element into view if it's been moved off the screen 2018-05-05 12:03:18 +12:00
Bradley Austin Davis
38f43bdc68 Disable current splash frame implementaton 2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6 Alternate shader 2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Cristian Luis Duarte
03ca427234 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 20:18:15 -03:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode 
MS14699: Prevent Wallet passcode from being sticky in certain cases
 2018-05-04 15:22:41 -07:00
Gabriel Calero
087c6ff730 Patch for secondary camera assert error on Android 2018-05-04 18:45:39 -03:00
Cristian Luis Duarte
8c96d2be3c Patch for secondary camera assert error on Android 2018-05-04 18:44:07 -03:00
Clement
ad60a79180 Fix for android builds 2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Cristian Luis Duarte
9f5365a277 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 18:38:08 -03:00
Gabriel Calero
1330132a32 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-04 18:35:51 -03:00
Liv Erickson
ee0af079cf merge from upstream master and fix conflict 2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-04 14:13:43 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
vladest
9e5dbf9a99 Snapshot notification sound settings 2018-05-04 22:01:44 +02:00
NissimHadar
aef5ea0936 Correct usage of the test script URL. 2018-05-04 12:30:13 -07:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639 
Fix for crash deep in QML after useFullAvatarURL
 2018-05-04 11:33:28 -07:00
Zach Fox
1da840984b Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-04 10:24:28 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
David Rowe
03da2f0946 Only scroll keyboard if necessary 2018-05-04 20:32:53 +12:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e Update avatar query names 2018-05-03 18:19:30 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
NissimHadar
2c6c0a25fc Add testSnapshotLocation parameter to takeSnapshot. 2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7 Added quitWhenFinished parameter to the command line. 2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g 
JSDoc fixes
 2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-03 14:06:06 -07:00
Gabriel Calero
a767540b76 Fix connection issue syncing two AccountManagers 2018-05-03 17:53:18 -03:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
NissimHadar
46f461dcdb Don't display crash message if running from command line with a test script. 2018-05-03 11:20:37 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation 
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
 2018-05-03 10:02:20 -07:00
NissimHadar
8b3c451f91 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 08:25:19 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g 
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
 2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing 
fixing avatr attachments not being visible when coming out of first person
 2018-05-02 18:50:41 -07:00
Zach Fox
56ba59681a Fix MS14741, allowing uninstall of apps whose scripts are no longer running 2018-05-02 16:12:55 -07:00
Zach Fox
900486ed01 Don't use entity scripting interface 2018-05-02 16:03:50 -07:00
Gabriel Calero
ec838b1417 Trying to fix non-android builds 2018-05-02 18:51:44 -03:00
NissimHadar
5cbb8674ec Use default parameter for saveSnapshot(). 2018-05-02 14:45:28 -07:00
Gabriel Calero
88f0c2d700 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 18:42:10 -03:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 14:17:22 -07:00