Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:53:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58630 commits 71 branches 56 tags 1.2 GiB
Commit graph

58630 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
a83094d7c7 Still need to test this on mac 2017-09-06 19:08:31 +02:00
Olivier Prat
fe357671e1 Removed qmlc files 2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Olivier Prat
10643feb78 Working with specific zpass rendering for outline. Debug script needs relinking to correct config 2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3 Created outline task but still need to create specific render job with z-pass shaders 2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f Simplified version that works directly with metas 2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43 First working version of outline working with selection interface. 2017-09-06 15:47:10 +02:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Seth Alves
91ee22e5a7 Merge pull request #11297 from sethalves/fix-protocol-for-pr-11290 
PR-11290 didn't actually bump protocol version
 2017-09-01 17:27:28 -07:00
Seth Alves
0855dfc1c6 PR-11290 didn't actually bump protocol version 2017-09-01 17:26:32 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
David Kelly
47cd47f819 log when no passphrase was set before trying to decrypt 2017-09-01 14:50:45 -07:00
David Kelly
feaa8d3120 Someday, a real rain will come and wash Wallet.cpp 
Till then, this little change will have to do.
 2017-09-01 14:06:43 -07:00
David Kelly
90316e275a Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal 2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337 working change passphrase. some cleanup to come 2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a Minor changes to fonts and colors 2017-09-01 11:44:46 -07:00
David Kelly
d8bb3c7915 Merge pull request #11289 from davidkelly/dk/penniesAndStuff 
Display hfc in "pennies"
 2017-09-01 11:39:30 -07:00
MandatoryMania
8c6bbb4968 Merge pull request #11295 from MandatoryMania/walletImgSwitch 
Wallet img switch
 2017-09-01 10:27:04 -07:00
David Kelly
655dc61ff2 doh 2017-09-01 10:16:45 -07:00
Menithal
5506520226 Fixed missing semi colon 2017-09-01 08:20:54 +03:00
Hisham Qayum
ff6217069b reverting some unneeded code changes 2017-08-31 17:30:24 -08:00
David Kelly
451936214d initial stab at changing passphrase 2017-08-31 17:05:55 -07:00
Zach Fox
8fcdfa171d Add debug button to clear passphrase 2017-08-31 16:51:39 -07:00
David Kelly
1eb503f526 we are qt5.6 on mac 2017-08-31 16:49:12 -07:00
Zach Fox
1bfc767daf Quick fixes 2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Zach Fox
0a9e3e8967 Remove unnecessary code 2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f Fixes and improvements 2017-08-31 15:39:58 -07:00
Hisham Qayum
6f1bb6abe2 wallet icon now has white background, diff design 2017-08-31 14:29:03 -08:00
Hisham Qayum
d47b29f0aa Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-31 14:16:36 -08:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63 Fixed Inverse logic and Cleanup 2017-09-01 00:35:56 +03:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
Menithal
663e8514de Found the culprit. Was overriding the value 2017-09-01 00:00:24 +03:00
David Kelly
cdadaa8c9c missed one 2017-08-31 13:41:53 -07:00
David Kelly
f8341ce1da warning 2017-08-31 13:24:07 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39 Changes in what I think are the right direction 2017-08-31 13:16:10 -07:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
David Kelly
396f108182 forgot this the first time 2017-08-31 12:18:46 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8 display hfc in "pennies" 2017-08-31 12:10:12 -07:00
Zach Fox
4643a6bf5f Merge pull request #11286 from zfox23/commerce_fixAdminMarketplaceButtons 
Fix the duplicated buy buttons for admins on Marketplace
 2017-08-31 10:53:48 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
Chris Collins
f41ca5ab6f Merge pull request #11277 from Atlante45/new-master 
Update master from stable
 2017-08-31 09:48:20 -07:00
Zach Fox
9bbcf3e1ae Merge pull request #11232 from zfox23/SelectionScriptingInterface 
Selection Scripting Interface
 2017-08-31 08:57:24 -07:00
Hisham Qayum
a446851e90 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-30 20:03:56 -08:00