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

27590 commits

Author SHA1 Message Date
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Jamil Akram
6511b60aa4
Merge pull request #14264 from ctrlaltdavid/M19085 
Fix AvatarManager.getPalData() returning data for just a single avatar
 2018-11-12 12:27:58 -08:00
John Conklin II
cd3dc04dc5
Merge pull request #14159 from alexiamandeville/WoodyUpdate 
Updating Woody avatar for new UV seams
 2018-11-12 12:12:49 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo 
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
 2018-11-12 10:45:52 -08:00
John Conklin II
33da88f174
Merge pull request #14351 from luiscuenca/tweakTransitAnimations 
Tweak transit animations
 2018-11-12 10:39:56 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg 
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
 2018-11-12 09:52:02 -08:00
NissimHadar
ae28de119f Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-12 08:27:17 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry 
Actually fix MS19803: Replace missing imports
 2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859 
Make material entities to be presented in avatarapp
 2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9 Actually fix MS19803: Replace missing imports 2018-11-09 15:02:57 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Zach Fox
1ce6079c5a Remove extra as 2018-11-09 11:26:18 -08:00
NissimHadar
8d4d0beebd Cleanup 2018-11-08 17:52:07 -08:00
NissimHadar
dddb08b7fb Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-08 17:50:14 -08:00
David Rowe
de61f0f010 Add missing JSDoc noticed in passing 2018-11-09 14:00:47 +13:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-11-09 13:56:44 +13:00
r3tk0n
d2a1b35f96 Fix desktop case showing Vive controls. 2018-11-08 16:50:11 -08:00
David Rowe
5c97954e66 Merge branch 'master' into M19404 
# Conflicts:
#	scripts/system/interstitialPage.js
 2018-11-09 13:35:11 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard 
3D Keyboard.
 2018-11-08 13:35:13 -08:00
r3tk0n
84209c0e53 Finally fix all indentation. 2018-11-08 13:18:25 -08:00
Jason Najera
59bba5b6e6
More attempt to fix indentation. 
Still looked fine in github's editor and N++.
 2018-11-08 13:16:24 -08:00
Jason Najera
b4be7544b9
Attempt to fix spacing 
Weird thing is it still looked fine in GitHub's editor...
 2018-11-08 13:15:19 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes 
Interstitial bug fixes
 2018-11-08 11:43:38 -08:00
r3tk0n
a6494bf379 Fix edge case with Oculus. 2018-11-08 11:25:55 -08:00
r3tk0n
1bd978e4c3 Clean up code in tabletHelp.html 2018-11-08 11:22:43 -08:00
John Conklin II
ab9c494fef
Merge pull request #14367 from SamGondelman/tablet 
Case 17284: Fix tablet culling
 2018-11-08 11:14:12 -08:00
r3tk0n
05939f8a7c Fix settings to only show relevant HMD controls. 2018-11-08 11:09:19 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin 
case 18450: Do not show login dialog if requested not to on the command line.
 2018-11-08 10:43:21 -08:00
Zach Fox
811b01816b CR round 3 2018-11-08 10:41:31 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
David Rowe
e5fe2622ae Merge branch 'master' into M19768 2018-11-08 17:13:02 +13:00
NissimHadar
f0dd07294e Added the no-login option. 2018-11-07 15:10:01 -08:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce fix tablet culling 2018-11-07 15:02:32 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug 
Fix MS19743: Fix case where user couldn't update certain items
 2018-11-07 14:57:35 -08:00
NissimHadar
e00c9333c6 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-07 14:54:18 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396 
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
 2018-11-07 13:36:41 -08:00
NissimHadar
189a799a3a Added method to detect OS type. Needed for running automated tests. 2018-11-07 08:58:38 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
SamGondelman
887c4f108f high detail not low 2018-11-06 16:34:16 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
SamGondelman
e20aeb28eb force low detail on oculus first run 2018-11-06 15:58:35 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Zach Fox
378bf911d4 Fix another build error 2018-11-06 12:48:17 -08:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
sabrina-shanman
1a69afb3e8 Move HFM.h to hfm subfolder per convention 2018-11-06 11:43:19 -08:00
Zach Fox
c33f9b6ea3 Fix build error 2018-11-06 11:26:09 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
NissimHadar
91fb592d3f Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-06 10:19:52 -05:00
Alexander Ivash
a3dfc873b7 rsolve rebase conflict 2018-11-06 14:21:14 +05:30
Alexander Ivash
4c6700b497 remove deprecations warnings 2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416 change imports (how could I miss this place?) 2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4 return controls-uit & styles-uit folders to preserve backward-compatibility 2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d add FilterBar & ScrollBar to qmldir 2018-11-06 14:21:14 +05:30
Alexander Ivash
82313f9464 update imports for utilities / all other qml files found 2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244 cherry-picking 2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-11-06 14:21:14 +05:30
NissimHadar
e9a636d751 Revert... 2018-11-05 22:13:02 -05:00
NissimHadar
c0e7a4348b Reverted changes to Interface. 2018-11-05 22:10:20 -05:00
luiscuenca
6ed6e30df3 Tweak transit animation 2018-11-05 19:14:40 -07:00
luiscuenca
f9b6d3dc6f Merge addTransitAPI branch 2018-11-05 19:02:35 -07:00
Anthony Thibault
ac8281075b Code review feedback 
Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()
 2018-11-05 17:25:00 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode 
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
 2018-11-05 16:21:19 -08:00
Howard Stearns
b54b5082ee Merge branch 'master' of github.com:highfidelity/hifi into tabless 2018-11-05 16:14:49 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce 
Oculus store commerce
 2018-11-05 16:13:04 -08:00
Howard Stearns
335947598f Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless 2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df My items to my submissions 2018-11-05 15:23:25 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model 
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
 2018-11-05 15:00:06 -08:00
Zach Fox
3631e304ba Acquisition 2018-11-05 14:58:12 -08:00
Gabriel Calero
344774dcec Merge remote-tracking branch 'upstream/master' into tester_flag 2018-11-05 19:13:04 -03:00
Gabriel Calero
611881e002 Mute when entering a domain 2018-11-05 18:35:57 -03:00
Zach Fox
f10b9ae30c Squashed commit of the following: 
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b3845
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dd
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4 Fix seven bugs 2018-11-05 13:03:34 -08:00
sabrina-shanman
a98a9b1c0c Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs 2018-11-05 12:47:34 -08:00
sabrina-shanman
e00024e8b0 Create HFM library 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Zach Fox
a4d36b3845 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-05 10:25:58 -08:00
howard-stearns
4f713b038e Merge branch 'oculus-store-commerce' into tabless 2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1 fix bad tab reference 2018-11-04 11:15:46 -08:00
Alexander Ivash
3bc274dd10 FB19348 - Interface doesn't save changes to avatar animation text field 2018-11-04 23:11:59 +05:30
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm 
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab Use AccountManager instead of settings 2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update 
Case 18794 - updates were being reported as gifts in the wallet
 2018-11-02 16:42:03 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Dante Ruiz
b33934ec46 fixing Image3DOverlay scaling 2018-11-02 14:24:14 -07:00
NissimHadar
562c9b1196 "works" on Mac 2018-11-02 13:35:38 -07:00
NissimHadar
51272d8fec Added setGeometry script command. 2018-11-02 13:09:07 -07:00
NissimHadar
70c0addc3f Removed setWindowSize - crashes on both Windows and Mac. 
Fixed typo.
 2018-11-02 10:47:17 -07:00
NissimHadar
c7353e6c59 Added setWindowSize - FOR TESTING ON MAC 2018-11-02 09:57:58 -07:00
Zach Fox
2b50c40224 Minor changes found by Chang 2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58 Update language 2018-11-02 09:23:31 -07:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
NissimHadar
470a490494 Typo. 2018-11-01 17:31:10 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
NissimHadar
d851720cb0 Added method to detect OS type. Needed for testing. 2018-11-01 16:57:28 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -07:00
Roxanne Skelly
1f8dde6756 Transaction string was assuming items given to the 
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
 2018-11-01 15:44:11 -07:00
Howard Stearns
8256bfbc55 icons 2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4 New colors 2018-11-01 13:27:31 -07:00
Zach Fox
d6477993a1 Make it work better with the tablet 2018-11-01 13:08:00 -07:00
Howard Stearns
3e2d6c341b placeholder svgs 2018-11-01 11:45:25 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468 Merge branch 'oculus-store-commerce' into tabless 2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb Fix four bugs; truncate some logs 2018-11-01 10:29:38 -07:00
Roxanne Skelly
a1eee351e9 Change "Proofs" to "My Submissions" in assets filter. 2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993 Restore certain images 2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
David Kelly
e6c3e7e67f initial purge of security tab from wallet 2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28 tabless wallet 2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536 Cleanup FIXME 2018-10-31 13:53:18 -07:00
Zach Fox
efcda129b7 Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f Notifications are working! 2018-10-31 13:23:58 -07:00
David Rowe
ae2715af31 Add option to start up at home location 2018-11-01 08:57:12 +13:00
Roxanne Skelly
b5a48d31b6 Fix code-review spacing issue 2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b Removed QmlCommerce.cpp, Ledger.cpp changes as requested 2018-10-31 10:09:01 -07:00
Roxanne Skelly
e5f06690b5 Strip out references to 'my purchases' vs 'my items' code 2018-10-30 17:31:31 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Roxanne Skelly
0e639f4e34 Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce 2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456 Checkpoint Proofs Filter in Inventory 2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
amantley
53650850da first change to check if the hips are going through the floor : todo --> in rig disable animation when we are in experimental mode 2018-10-30 14:31:33 -07:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
David Rowe
1a129335dd Fix Goto app cards staying highlighted if move off dialog while dragging 2018-10-30 19:57:07 +13:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix 
Fix avatars remain stuck in place for other users intermittently
 2018-10-29 15:03:43 -07:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
luiscuenca
e49e9cdc56 Set avatar client sooner 2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
David Rowe
1cca975b37 Fix Interface eating memory when minimized 2018-10-27 11:40:02 +13:00
Brad Davis
36edb939c3 Try to fix android crash 2018-10-26 11:23:30 -07:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
David Rowe
e2ae50362e Add missing JSDoc of Window.interstitialModeEnabled property 2018-10-26 19:21:58 +13:00
David Rowe
51d56ddf22 Make tablet page indicators clickable to scroll tablet 2018-10-26 12:17:04 +13:00
Howard Stearns
9095df4641 fix getting inventory back after showing my items 2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab don't show price for free items 2018-10-25 12:46:30 -07:00
Howard Stearns
3503d79b05 missed a buy/purchase 2018-10-25 12:39:33 -07:00