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

58580 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
1eb503f526 we are qt5.6 on mac 2017-08-31 16:49:12 -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
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
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
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
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
Zach Fox
913618ded5 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 16:13:50 -07:00
David Kelly
84e13c84ae Merge pull request #11273 from howard-stearns/reset-wallet 
reset wallet
 2017-08-30 16:10:26 -07:00
David Kelly
962d1fc81d Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet 2017-08-30 15:30:29 -07:00
Zach Fox
dbb7023fc1 Fix warnings 2017-08-30 15:26:25 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Zach Fox
3f0d44990a Hook up bounding box rendering to Selection Scripting Interface 2017-08-30 14:54:23 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Zach Fox
500427010d Merge pull request #11276 from zfox23/commerce_polishTxnHistory 
Polish transaction history and prepare for whatever new design
 2017-08-30 13:25:55 -07:00
Zach Fox
17d999e721 Fixes 2017-08-30 13:25:34 -07:00
Atlante45
9de4c3d0af Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-08-30 13:10:48 -07:00
Zach Fox
580865fa5a Add skeleton for infinite scroll 2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7 Polish transaction history and prepare for whatever new design 2017-08-30 12:45:13 -07:00
Zach Fox
6f6edf460e Merge pull request #11274 from zfox23/commerce_zachsPunchlist3 
Remove most dependencies on 'onVisibleChanged'
 2017-08-30 12:30:09 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00
howard-stearns
b8da08ca42 reset wallet 2017-08-30 11:29:43 -07:00
Zach Fox
a73d548ffc Merge pull request #11272 from zfox23/commerce_zachsPunchlist2 
Commerce: Login; punctuationMode; new images
 2017-08-30 11:12:38 -07:00
Zach Fox
e0878e7a3f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2 2017-08-30 11:07:24 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
271fcbf8b4 Merge pull request #11271 from davidkelly/dk/securityImageIssue 
security image shows up in every qml engine now
 2017-08-30 10:52:48 -07:00
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
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