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

58669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
Chris Collins
f0e699aecb Merge pull request #11263 from highfidelity/RC-53 
Beta Release 53 - Includes up to Developer Release 7053
 2017-08-30 09:48:00 -07:00
Liv
2f2b406047 Remove unneeded handcontrollertype code from handle first run checks 2017-08-30 09:23:33 -07:00
Chris Collins
47a2e57e26 Merge pull request #10625 from humbletim/21180-C++ 
CR 21180-C++ Camera app -- core changes
 2017-08-30 07:20:00 -07:00
David Kelly
72b15b4223 fix comment 2017-08-29 20:28:57 -07:00
Zach Fox
6ee634b90a Lock overlay on top of security image 2017-08-29 17:19:34 -07:00
druiz17
2a97257698 Merge pull request #11140 from ElderOrb/case6788 
6788: You can deselect your current view mode
 2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac security image shows up in every qml engine now 2017-08-29 17:06:57 -07:00
Zach Fox
c0d9c06067 Merge pull request #11268 from howard-stearns/fix-wallet-login 
fix wallet login (and share code with snapshot login)
 2017-08-29 16:26:51 -07:00
Zach Fox
5d1170c5d6 Only make message appear after inventory received 2017-08-29 16:17:59 -07:00
Liv
492d053016 Create home path for new content sets loaded in 2017-08-29 16:11:16 -07:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
c7ad875485 Virtual keyboard and logic 2017-08-29 15:27:53 -07:00
Liv
59deccaeb5 Remove unused skipTutorial code 2017-08-29 14:55:59 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
Menithal
ea79748ed3 Some adjustments 2017-08-29 23:59:36 +03:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
beholder
a0a43ebf26 show checkbox or radiobutton dependently on exclusiveGroup presence 2017-08-29 23:23:16 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
vladest
fe44abdb62 Merge branch 'master' into flickable_web_pages 2017-08-29 20:49:39 +02:00
Chris Collins
b9d8b325bc Merge pull request #11265 from sethalves/RC-53-x 
Rc 53 x
 2017-08-29 09:59:49 -07:00
Seth Alves
a6aa71f8fd unmangle merge 2017-08-29 09:51:08 -07:00
Seth Alves
b8795c3ea9 remove unneeded bind-by-ref thing from lambdas 2017-08-29 09:49:06 -07:00
Seth Alves
35459a7b93 cherry-pick 2017-08-29 09:49:04 -07:00
SamGondelman
10eaed71f9 crash on shutdown 2017-08-29 09:10:12 -07:00
Chris Collins
c309258c8d Merge pull request #11259 from sethalves/fix-bs-7240 
possible fix for fogbugz 7240
 2017-08-29 09:06:26 -07:00
David Kelly
1eb5b9e75d Merge pull request #11260 from davidkelly/dk/transactionHistoryDisplay 
display transaction history
 2017-08-29 08:46:58 -07:00
David Kelly
84126d8f95 cr feedback 2017-08-29 08:46:13 -07:00
David Kelly
67f25adac0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-29 08:02:53 -07:00
David Kelly
2564442817 Merge pull request #11252 from zfox23/commerce_checkoutAndInventory 
Commerce Checkout and Purchases
 2017-08-29 08:02:22 -07:00
Seth Alves
7220a6998a remove unneeded bind-by-ref thing from lambdas 2017-08-28 17:08:59 -07:00
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -07:00
Seth Alves
b9c68f9156 give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup 2017-08-28 17:01:01 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Zach Fox
37b6099f36 Hook up root_file_url 2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -07:00
Zach Fox
ceb38e261d HMD Keyboard for purchases filterBar 2017-08-28 10:45:08 -07:00
David Kelly
3955624e63 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725 Again to Another 2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027 Remove quantity 2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893 Correctly handle non-JSON items 2017-08-28 09:54:51 -07:00
Zach Fox
e293d122b1 Add security image to Checkout and Purchases 2017-08-28 09:33:30 -07:00
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety 
Additional locking in model entities
 2017-08-28 09:22:30 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
vladest
d8fb7300c3 Merge branch 'master' into tablet_login_button 2017-08-28 16:59:35 +02:00
vladest
e38075f7ba Disable web engine scrollbars 2017-08-28 16:27:33 +02:00
vladest
9baf518c6a Merge branch 'master' into flickable_web_pages 2017-08-27 12:00:05 +02:00
Liv
59fe5ffdc1 Initial attempt at changing first run behavior 2017-08-25 17:48:35 -07:00