Olivier Prat
|
43f7bb5f56
|
Fixed compilation error due to really long shader
|
2018-01-22 16:50:03 +01:00 |
|
Olivier Prat
|
a807e41ff4
|
Merge branch 'master' of http://github.com/highfidelity/hifi into locallights
|
2018-01-22 16:05:54 +01:00 |
|
Seth Alves
|
45a00bebc0
|
Merge pull request #12217 from luiscuenca/sortOrderFix
Fix sortOrder param on tablet buttons
|
2018-01-21 10:40:25 -08:00 |
|
luiscuenca
|
b0f21c6931
|
sorter variable names
|
2018-01-20 07:09:16 -07:00 |
|
Brad Hefta-Gaub
|
d7fe3bcd15
|
Merge pull request #12224 from ZappoMan/emoteApp
new icon and button layout
|
2018-01-19 17:43:00 -08:00 |
|
ZappoMan
|
f6062ebfcc
|
new icon and button layout
|
2018-01-19 16:00:08 -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 |
|
luiscuenca
|
41f3b792b6
|
Fix warnings
|
2018-01-19 14:34:52 -07:00 |
|
David Rowe
|
7898aa2c4b
|
Code review
|
2018-01-20 10:32:42 +13:00 |
|
Stephen Birarda
|
018bcc623b
|
Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification
suppress Interface notification for DS decryption error
|
2018-01-19 14:10:10 -07:00 |
|
David Rowe
|
24dcc8788c
|
Code review
|
2018-01-20 10:07:23 +13:00 |
|
John Conklin II
|
c366ed42ab
|
Merge pull request #12202 from amantley/urlbug
added a property check in renderableModelEntity for the animation url…
|
2018-01-19 12:52:43 -08:00 |
|
David Rowe
|
94e6a68d41
|
Code review
|
2018-01-20 09:50:24 +13: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 |
|
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 |
|
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 |
|
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 |
|
Atlante45
|
497e8c1d69
|
Fix BUILD_LINUX_CHEATSHEET.md formatting
|
2018-01-18 17:09:51 -08:00 |
|
Stephen Birarda
|
a97b4b010d
|
suppress Interface notification for DS decryption error
|
2018-01-18 16:54:04 -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
|
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 |
|
amantley
|
961ed88fb0
|
fixed coding standards in RenderableModelEntityItem.cpp
|
2018-01-18 12:56:24 -08:00 |
|
Stephen Birarda
|
35f83ad3cd
|
Merge pull request #12150 from Atlante45/fix/exit-crash
Make type name hash static const
|
2018-01-18 13:45:58 -07:00 |
|
David Kelly
|
9a523ead31
|
fix link
|
2018-01-18 12:44:45 -08:00 |
|
SamGondelman
|
c8aded0688
|
watch for attachment texture loading
|
2018-01-18 12:40:02 -08:00 |
|
Alexander Ivash
|
50217726c0
|
remove extra qualification from DesktopPreviewProvider::getInstance() in .h
|
2018-01-18 23:26:43 +03:00 |
|