samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
samcake
38242072e5
Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch
2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
Brad Davis
288e753eea
Fix font loading from non-QRC html
2018-01-22 16:48:00 -08:00
Brad Davis
6a91d549ce
Fix stylus overlay
2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
...
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI
...
Updated UI to fit Toolkit Standards
2018-01-22 10:30:48 -08: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
Seth Alves
f6b4cf4c60
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-22 07:13:41 -08:00
Sam Gateau
d38d13cbb9
Trying to address the overlays to not be visisble in 2nd camera
2018-01-21 23:47:45 -08:00
Bruce Brown
f7caba5295
de-bounce Midi::USBchanged signal.
...
Debounced USBchanged signal to prevent pauses.
2018-01-20 11:17:47 -08:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -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
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces"
2018-01-19 15:15:52 -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
RebeccaStankus
5db5f24043
Updated UI to fit Toolkit Standards
2018-01-19 14:52:44 -08:00
Zach Fox
4d408a8df5
Nearby UI
2018-01-19 14:49:28 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f
Load built-in resources earlier
2018-01-19 14:35:04 -08:00
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08: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
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0
trying to now show overlays in mirrors
2018-01-19 09:53:41 -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
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -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
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -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
