Brad Davis
|
1fb125f67f
|
Don't process empty images
|
2018-01-19 11:45:11 -08:00 |
|
Brad Davis
|
398b37ffe9
|
Infinite loop guard
|
2018-01-19 11:45:02 -08:00 |
|
Brad Davis
|
e2c4af05bd
|
Don't process empty images
|
2018-01-19 11:42:31 -08:00 |
|
Brad Davis
|
104dbabee9
|
Infinite loop guard
|
2018-01-19 11:42:13 -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 |
|
Sam Gateau
|
9a8246f2b9
|
Merge pull request #12215 from Zvork/brdf
Normalized diffuse & specular for directional, point and spot lights
|
2018-01-19 11:08:29 -08:00 |
|
Seth Alves
|
63cd472fca
|
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags
fix race condition whereby physics may incorrectly overwrite script/network property change
|
2018-01-19 11:06:22 -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 |
|
Ryan Downe Karpf
|
08b4c6eb40
|
Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow
reduce calls to isPointOnDesktopWindow in controllerModules
|
2018-01-19 10:44:57 -08:00 |
|
Brad Davis
|
d6f7b23b2d
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-19 10:37:41 -08:00 |
|
Brad Davis
|
9529488dd3
|
Merge remote-tracking branch 'upstream/master' into android_new
|
2018-01-19 10:37:29 -08:00 |
|
Brad Davis
|
3dba928b72
|
Merge remote-tracking branch 'upstream/android' into android_new
|
2018-01-19 10:36:46 -08:00 |
|
luiscuenca
|
27ea74f5bf
|
Fix sortOrder param on tablet buttons
|
2018-01-19 11:22:37 -07:00 |
|
Sam Gateau
|
ce550b4fa6
|
Merge pull request #12209 from SamGondelman/textures
Watch for attachment texture loading
|
2018-01-19 10:08:04 -08:00 |
|
MiladNazeri
|
b08f1ea850
|
Merge pull request #12212 from Atlante45/fix/linux-cheats-formatting
Fix BUILD_LINUX_CHEATSHEET.md formatting
|
2018-01-19 09:49:38 -08:00 |
|
Zach Fox
|
8c52f92de8
|
Merge pull request #12208 from zfox23/fixBubbleButtonFlash
Fix the Space Bubble button flash behavior; Rate limit sound
|
2018-01-19 09:29:17 -08:00 |
|
Olivier Prat
|
12c48a38f7
|
Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.
|
2018-01-19 13:58:35 +01:00 |
|
Bruce Brown
|
bb09c71bda
|
Fix crash caused by no midi device present
|
2018-01-18 21:35:01 -08:00 |
|
Bruce Brown
|
3004ee08e1
|
Fix lockup when no midi devices present.
|
2018-01-18 21:18:36 -08:00 |
|
David Rowe
|
fb684909ce
|
Merge branch 'master' into 21703
|
2018-01-19 17:25:12 +13:00 |
|
David Rowe
|
45bc6b8dab
|
Dominant hand gets the highlight if both start pointing simultaneously
|
2018-01-19 16:41:23 +13:00 |
|
David Rowe
|
e0e6fc711b
|
Replace Pointers API function setNonHoverItems() with setDoesHover()
|
2018-01-19 16:05:09 +13:00 |
|
Alexander Ivash
|
67e816756c
|
make gcc happy
|
2018-01-19 01:51:41 +00:00 |
|
Zach Fox
|
495c4f56e2
|
Only small tweaks remaining?
|
2018-01-18 17:51:08 -08:00 |
|
Andrew Meadows
|
75b5635d2f
|
less word salad
|
2018-01-18 17:43:22 -08:00 |
|
Andrew Meadows
|
3d3bfcf7a3
|
check dirty flags when harvesting physics results
|
2018-01-18 17:43:22 -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 |
|
Atlante45
|
497e8c1d69
|
Fix BUILD_LINUX_CHEATSHEET.md formatting
|
2018-01-18 17:09:51 -08:00 |
|
Zach Fox
|
c6429f4f33
|
Path towards pixel perfection
|
2018-01-18 17:05:36 -08:00 |
|
Stephen Birarda
|
a97b4b010d
|
suppress Interface notification for DS decryption error
|
2018-01-18 16:54:04 -08:00 |
|
Brad Davis
|
0a0e5ab84b
|
Don't try to set invalid slots in the fade effect
|
2018-01-18 16:49:19 -08:00 |
|
Brad Davis
|
6fa0ef88ff
|
Fix compile issues in forward global light
|
2018-01-18 16:48:48 -08:00 |
|
Brad Davis
|
a4572f3f8f
|
Log when the file selector chooses a different file than asked for
|
2018-01-18 16:48:09 -08:00 |
|
Brad Davis
|
d26084f0ca
|
Allow us to catch invalid slots at batch setup time
|
2018-01-18 16:47:43 -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 |
|
Brad Davis
|
a9b2cc3408
|
Fixing lighting shader and removing being of light
|
2018-01-18 15:25:22 -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
|
4485ed8613
|
Merge pull request #12073 from NissimHadar/QtImageCompare
Improved functionality
|
2018-01-18 15:00:35 -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 |
|
Elisa Lupin-Jimenez
|
42b8c293d6
|
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name
Fixed typo in macro name
|
2018-01-18 14:44:43 -08:00 |
|
Brad Hefta-Gaub
|
61a5750b09
|
Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding
Fix dynamic entities not colliding with avatar when a grab action is removed
|
2018-01-18 14:39:21 -08:00 |
|
David Kelly
|
21cc6ee8dd
|
fix marketplace txn display (memo only)
|
2018-01-18 14:28:25 -08:00 |
|
Clément Brisset
|
956f45b5af
|
Merge pull request #11932 from birarda/bug/baking-folder-number
fix sparse rectification for small textures, export for same model at diff URL
|
2018-01-18 14:25:33 -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 |
|