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

5487 commits

Author SHA1 Message Date
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
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
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
David Rowe
1a129335dd Fix Goto app cards staying highlighted if move off dialog while dragging 2018-10-30 19:57:07 +13:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07: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
Howard Stearns
e3b1e14db6 nix "buy" where possible. 2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Howard Stearns
993cb0cfa0 restore separation of inventory vs proofs. 2018-10-24 12:00:17 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation 
Add animations to Avatar Transit
 2018-10-24 10:51:21 -07:00
Howard Stearns
c1cb41875a Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-24 09:56:37 -07:00
Gabriel Calero
28c062b842 Don't show stats in release builds 2018-10-24 11:57:59 -03:00
unknown
06aff231a3 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 20:19:06 -07:00
Howard Stearns
7707d92a95 connect wiring on purchases 2018-10-23 16:07:35 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Zach Fox
988bca201b Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 13:36:46 -07:00
Howard Stearns
97bc84ed87 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste 
Add copy/paste functionality to edit.js
 2018-10-23 13:18:12 -07:00
Zach Fox
897d21bea2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Zach Fox
22c3321400 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 09:52:37 -07:00
amantley
3e8663f8e9 removed the dropdown from the avatar app, because it is in settings controls now 2018-10-22 22:31:26 -07:00
amantley
472ab1c613 Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-22 17:50:56 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
Zach Fox
1d8994993c Whitelist TTS scripting interface to TTS app, which is now a default script 2018-10-22 17:05:31 -07:00
luiscuenca
afc76fec72 Added overrideNetworkAnimation and restoreNetworkAnimation methods 2018-10-22 15:20:32 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
Zach Fox
f9cc4f5a69 Count unique source and url pairs 2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b Only show unique resources 2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404 Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2 2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Ryan Huffman
9cc2add4a0 Add copy/paste functionality to edit.js 2018-10-22 13:56:07 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-10-22 11:50:09 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting 
Add a 'grabbable' option to the new-model dialog
 2018-10-22 11:42:40 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation 2018-10-20 15:30:23 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix 2018-10-20 13:39:55 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
amantley
a427ddb235 removed extraneous print statements 2018-10-20 09:16:05 -07:00
amantley
55daeb11cd moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure 2018-10-19 18:43:02 -07:00
amantley
070a517423 changed the recenterModel variables to userRecenterModel 2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
cd4e9a3e08
Merge pull request #13889 from alexiamandeville/controllerModelUpdates 
Updating highlight textures on Rift Controller
 2018-10-19 16:39:17 -07:00
amantley
a43985ef64 combo box for recenter model is added 2018-10-19 16:03:53 -07:00
Brad Hefta-Gaub
b281c090e3
Merge pull request #14012 from alexiamandeville/controlImageUpdate 
Adding handshake control to image in Controls Reference
 2018-10-19 11:15:11 -07:00
amantley
0837f790eb combo box changes 2018-10-19 07:46:16 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap 
Fix MS18154: Don't snap to cards in My Purchases
 2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit 
make room for keyboard and help in SendAsset
 2018-10-18 17:53:52 -07:00
luiscuenca
bb5c042f16 Blend network animation 2018-10-18 17:51:20 -07:00
John Conklin II
b2e84a8f3b
Merge pull request #14191 from howard-stearns/new-rez-images 
new images for My Purchases rez tutorial
 2018-10-18 17:50:30 -07:00
Anthony Thibault
51d767ac2b Reasonable defaults for position and rotation filtering for vive tracked joints. 2018-10-18 17:46:32 -07:00
Anthony Thibault
3e68a1d5a5 Merge branch 'master' into feature/acceleration-limit-filter 2018-10-18 16:51:57 -07:00
amantley
b9a2f19d30 made all the suggested corrections except the dropdown qml. 2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e Remove cruft 2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a Fix regression 2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945 UX/UI improvements 2018-10-18 15:27:16 -07:00
Alexander Ivash
64f67d5eb7 update imports for utilities / all other qml files found 2018-10-18 22:03:50 +03:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853 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-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0 Do not display incomplete metadata 2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
Alexander Ivash
0ab8a0ba5f FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: TypeError: Cannot read property of null 2018-10-18 01:23:10 +03:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox 
Rebake default skybox for all platforms
 2018-10-17 09:50:00 -07:00
amantley
02f499e9f7 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-16 16:56:10 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -07:00
Howard Stearns
6c6d29152f new images for My Purchases rez tutorial 2018-10-11 12:36:43 -07:00
Anthony Thibault
a3a87ef48b Debug rendering of tracked objects, remove filters from body. 2018-10-10 17:52:26 -07:00
Howard Stearns
30971cd766 make room for keyboard and help in SendAsset 2018-10-10 15:43:20 -07:00
Alexander Ivash
6e66f289fe take 'materialData?materialName' cases into account 2018-10-09 23:08:14 +03:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
Anthony Thibault
d15cc86735 Added deceleration limit to AccelerationLimiterFilter 2018-10-09 10:51:01 -07:00
Anthony Thibault
8642edd144 Added acceleration limit filter to controller system 2018-10-09 10:51:01 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
Alexander Ivash
7d470cf161 FB18859 - Avatar App Bug when material entity is added as avatar entity 2018-10-09 01:59:41 +03:00
Alexia Mandeville
911e5e6b52 Deleting GLES files because they are no longer necessary 2018-10-08 14:37:50 -07:00
Alexia Mandeville
3d70cec61b Updating UV seams on Qoody 2018-10-08 14:28:31 -07:00
Alexia Mandeville
f2a5b1f497 Updating Woody avatar for new UV seams 2018-10-08 11:52:07 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00