Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 22:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63707 commits 25 branches 0 tags 1.1 GiB
Commit graph

23517 commits

Author SHA1 Message Date
vladest
b947504849 Merge conflicts 2018-01-22 21:42:32 +01:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2 
Commerce: Pixel-perfect "Send Money" UI
 2018-01-22 09:39:23 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00
Zach Fox
89e403d438 Balance text in send money 2018-01-19 15:39:57 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00
vladest
e7a035f954 Fix indent 2018-01-19 23:01:41 +01:00
vladest
c235deb6f0 Merge branch 'master' into move_to_qqc2 2018-01-19 23:01:04 +01:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109 
FB11109 Preview disabled image swap (Commerce only)
 2018-01-19 11:40:05 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700 
Add Window browseChanged signal as replacement for openFileChanged
 2018-01-19 10:45:27 -08:00
David Rowe
fb684909ce Merge branch 'master' into 21703 2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
Zach Fox
495c4f56e2 Only small tweaks remaining? 2018-01-18 17:51:08 -08:00
Zach Fox
6b5389a167 go go go go go 2018-01-18 17:37:26 -08:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory 
nearby hfc transfers should send the location
 2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863 eliminate dash in history, replace with 0 HFC 2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702 
Add Window.protocolSignature() as a replacement for location.protocolVersion()
 2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689 
Remove unused "anchor" Overlays property
 2018-01-18 15:04:41 -08:00
Sam Gateau
aec99db4fc
Merge pull request #12157 from AndrewMeadows/lod-debug-ui 
add scripted/qml debug UI for render LOD
 2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub
c9cedcb2c0
Merge pull request #12183 from SamGondelman/pointerCrash 
Destroy PointerManager before PickManager
 2018-01-18 14:58:20 -08:00
Brad Hefta-Gaub
77837e2cf0
Merge pull request #12194 from misslivirose/feat/exp-gif 
change ImageOverlay to use AnimatedImage instead of Image
 2018-01-18 14:57:39 -08:00
David Kelly
21cc6ee8dd fix marketplace txn display (memo only) 2018-01-18 14:28:25 -08:00
David Rowe
13bbd1fcbf Update places feed to use new function 2018-01-19 10:10:33 +13:00
David Kelly
2b7576cef5 Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory 2018-01-18 13:00:07 -08:00
David Kelly
9a523ead31 fix link 2018-01-18 12:44:45 -08:00
Alexander Ivash
29625953f6 update privacy-specific disabled preview image 2018-01-18 23:26:43 +03:00
Alexander Ivash
a74b093b60 FB11109 Preview disabled image swap (Commerce only) 2018-01-18 23:26:43 +03:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
David Kelly
2cdbc1159e nearby hfc transfers should send the location too 2018-01-18 11:15:32 -08:00
Andrew Meadows
2c43138e14 slightly faster auto LOD adjust 2018-01-18 08:53:45 -08:00
Andrew Meadows
80c43bd0f7 fix typo in variable name 2018-01-18 08:53:45 -08:00
Andrew Meadows
9a1a10b4e1 remove cruft and use more correct names 2018-01-18 08:53:45 -08:00
Andrew Meadows
82cab5e4a1 add scripted/qml debug UI for render LOD 2018-01-18 08:53:45 -08:00
David Kelly
c661bec8fd whitespace 2018-01-17 17:15:14 -08:00
David Rowe
ee2936d133 Add Pointers API function that disables hover events for nominated items 2018-01-18 14:07:07 +13:00
David Kelly
1dde25e38f Don't make links in txn history for highfidelity and marketplace 2018-01-17 16:51:38 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1 
Commerce: P2P Transfer Iteration 1
 2018-01-17 16:41:56 -08:00
Zach Fox
16d51986a9 Make the call to receiveAt more robust 2018-01-17 15:11:58 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run 
allow avatar walk-speed to be set from javascript
 2018-01-17 13:53:13 -08:00
Liv Erickson
88ba5e5a00 change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects 2018-01-17 13:45:56 -08:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695 
Remove old ToolWindow code
 2018-01-17 13:43:59 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671 
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
 2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Zach Fox
1d747bc0e4 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-17 11:56:00 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS 
Merge Account & GlobalServices follow-up
 2018-01-17 10:50:54 -08:00
Seth Alves
1e847cf32e Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-17 08:08:13 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Seth Alves
d3084dc0df defang 2018-01-17 07:11:27 -08:00