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 |
|
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 |
|
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 |
|
Atlante45
|
497e8c1d69
|
Fix BUILD_LINUX_CHEATSHEET.md formatting
|
2018-01-18 17:09:51 -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 |
|
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 |
|
David Rowe
|
8c2427dd58
|
Rename Window.protocolVersion() to Window.protocolSignature()
|
2018-01-19 09:06:16 +13:00 |
|
Zach Fox
|
13d8d643f7
|
Also rate limit the bubble sound
|
2018-01-18 12:05:16 -08:00 |
|
Zach Fox
|
1bda3faaf2
|
Fix the Space Bubble button flash behavior
|
2018-01-18 11:23:49 -08:00 |
|
David Kelly
|
2cdbc1159e
|
nearby hfc transfers should send the location too
|
2018-01-18 11:15:32 -08:00 |
|
Dante Ruiz
|
d88ff701b5
|
reduce calls to isPointOnDesktopWindow
|
2018-01-18 10:48:35 -08:00 |
|
Stephen Birarda
|
95d0e8aa56
|
Merge pull request #12003 from birarda/bug/double-free-in-agent
remove unecessary parenting of Agent script engine
|
2018-01-18 11:33:17 -07:00 |
|
Atlante45
|
482ca3f038
|
Make type name hash static const
|
2018-01-18 10:28:43 -08:00 |
|
David Kelly
|
f05d650e0b
|
Merge pull request #12199 from davidkelly/dk/txnHistorySpecialCase
Don't make links in txn history for highfidelity and marketplace
|
2018-01-18 10:15:58 -08:00 |
|
Dante Ruiz
|
92f8f9d2c0
|
Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock
avoid a deadlock when clearing avatar entities
|
2018-01-18 10:07:07 -08:00 |
|
Sam Gateau
|
dd436229c1
|
Merge pull request #12193 from SamGondelman/transparent
Fix black flashing on transparent objects
|
2018-01-18 09:11:46 -08:00 |
|
Dante Ruiz
|
3e3b3a0a9e
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding
|
2018-01-18 08:56:01 -08:00 |
|
Dante Ruiz
|
93594fb0bb
|
make dynamic entities collide with avatar when removing grab action
|
2018-01-18 08:55:51 -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 |
|
Elisa Lupin-Jimenez
|
49e72346a4
|
fixed typo in macro name
|
2018-01-17 18:08:05 -08:00 |
|
Seth Alves
|
45406177e5
|
avoid a deadlock when clearing avatar entities
|
2018-01-17 17:56:25 -08:00 |
|
David Kelly
|
c661bec8fd
|
whitespace
|
2018-01-17 17:15:14 -08: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
|
c63453175e
|
Merge pull request #12196 from zfox23/commerce_robustReceiveAt
Make the call to receiveAt more robust
|
2018-01-17 16:41:07 -08:00 |
|
SamGondelman
|
a44c965f56
|
fix black flashing on transparent objects
|
2018-01-17 15:59:07 -08:00 |
|
Seth Alves
|
fda4cf10b9
|
Merge pull request #12159 from Zvork/compactvb
Fix potential assert exception in FBXMesh_Reader.cpp
|
2018-01-17 15:16:22 -08:00 |
|
Zach Fox
|
16d51986a9
|
Make the call to receiveAt more robust
|
2018-01-17 15:11:58 -08:00 |
|