Stephen Birarda
|
05b45f2e7e
|
adjust example and add clarifying comments to PrioritySortUtil
|
2017-12-21 15:40:08 -08:00 |
|
Stephen Birarda
|
7bf0cc2f63
|
cleanup other ref returns of shared pointers from sortables
|
2017-12-21 15:39:14 -08:00 |
|
Stephen Birarda
|
18993a8f72
|
fix for AvatarData retrieval from SortableAvatar in PriorityQueue
|
2017-12-21 15:11:34 -08:00 |
|
Stephen Birarda
|
31e9f26772
|
fix use after free of pending message
|
2017-12-21 11:35:11 -08:00 |
|
Ryan Downe Karpf
|
b6d8434b55
|
Merge pull request #11969 from highfidelity/RC-61
Beta Release 61 - Includes up to Developer Release 7548
|
2017-12-20 11:10:57 -08:00 |
|
John Conklin II
|
09e9707404
|
Merge pull request #12018 from sethalves/pr-12015-for-rc-61
fix logic that resets own-avatar collisions after a parenting grab is released
|
2017-12-19 10:53:01 -08:00 |
|
Seth Alves
|
63ac426bf2
|
fix logic that resets own-avatar collisions after a parenting grab is released
|
2017-12-19 08:13:44 -08:00 |
|
John Conklin II
|
9fc47c8e52
|
Merge pull request #12010 from SamGondelman/burp61
Fix equirectangular skybox loading (RC-61)
|
2017-12-18 14:47:27 -08:00 |
|
SamGondelman
|
b0ecaa10d4
|
fix equirectangular skybox loading
|
2017-12-18 12:38:25 -08:00 |
|
Ryan Downe Karpf
|
f0499c8b64
|
Merge pull request #12006 from SamGondelman/burp61
Fix caching of ktx texture files (RC-61)
|
2017-12-18 11:13:18 -08:00 |
|
Sam Gondelman
|
c39da5094b
|
weak_ptr _cacheFile
|
2017-12-17 22:31:09 -08:00 |
|
Sam Gondelman
|
a39eea5a34
|
cr and cleanup
|
2017-12-17 22:30:57 -08:00 |
|
SamGondelman
|
9bdcf34c91
|
clear all _cacheFiles on recycle
|
2017-12-17 22:30:47 -08:00 |
|
SamGondelman
|
90b97aba59
|
remove extra recycle
|
2017-12-17 22:30:31 -08:00 |
|
SamGondelman
|
355ceddcc6
|
keep _cacheFile alive
|
2017-12-17 22:30:05 -08:00 |
|
Ryan Downe Karpf
|
11eaf435c9
|
Merge pull request #11996 from sethalves/pr-11946-for-rc-61
8992 Login window is small in tablet
|
2017-12-15 09:08:49 -08:00 |
|
Alexander Ivash
|
a4696cc2b3
|
8992 Login window is small in tablet
|
2017-12-14 16:57:17 -08:00 |
|
Stephen Birarda
|
6be7a3662c
|
Merge pull request #11992 from birarda/bug/fix-connection-reset
Make udt::Connection live as long as node connection
|
2017-12-14 16:34:51 -08:00 |
|
Ryan Downe Karpf
|
d25dfbb957
|
Merge pull request #11994 from NissimHadar/crashFix10537OnRC61
Fix for Haze crash (bug 10537)
|
2017-12-14 16:08:17 -08:00 |
|
Stephen Birarda
|
da56d47307
|
make the _lastMessageNumber in Connection default to 0
|
2017-12-14 15:30:51 -08:00 |
|
Stephen Birarda
|
8b5e8f8d08
|
only de-activate the SendQueue when it has nothing to send
|
2017-12-14 15:30:25 -08:00 |
|
Nissim Hadar
|
1d4801adf5
|
Fix for Haze crash (bug 10537)
|
2017-12-14 13:48:31 -08:00 |
|
Ryan Downe Karpf
|
cccd080727
|
Merge pull request #11990 from sethalves/pr-11971-for-rc-61-x
possible fix for tablet freezing (#11971 for rc-61)
|
2017-12-14 12:14:44 -08:00 |
|
Stephen Birarda
|
7f948586dd
|
fix message erase in conn, SendQueue ctor order
|
2017-12-14 12:07:32 -08:00 |
|
Seth Alves
|
9863458fef
|
oops
|
2017-12-14 11:07:11 -08:00 |
|
Seth Alves
|
77b102669e
|
try harder to keep setTimeout loop going in controller-dispatcher
|
2017-12-14 11:07:04 -08:00 |
|
Ryan Downe Karpf
|
68177c7e71
|
Merge pull request #11981 from sethalves/pr-11960-for-rc-61
Pr 11960 for rc 61
|
2017-12-14 09:11:34 -08:00 |
|
Atlante45
|
ad547f483d
|
Keep track of message numbers
|
2017-12-13 19:25:24 -08:00 |
|
Stephen Birarda
|
1c83d7a1ef
|
Merge pull request #11983 from birarda/bug/macdeployqt-for-oven
fix rpath for oven so it can load things placed by macdeployqt
|
2017-12-13 18:36:16 -08:00 |
|
Stephen Birarda
|
1f57ac6081
|
don't trigger unix step on apple for oven
|
2017-12-13 18:08:39 -08:00 |
|
Stephen Birarda
|
553e4e2449
|
fix RPATH for oven so it loads things from macdeployqt
|
2017-12-13 17:26:23 -08:00 |
|
Atlante45
|
44190f16c0
|
Reset ACK in ctor
|
2017-12-13 16:55:08 -08:00 |
|
Seth Alves
|
aa0d581236
|
Merge branch 'FB10334' of https://github.com/elderorb/hifi into pr-11960-for-rc-61
|
2017-12-13 15:29:27 -08:00 |
|
Atlante45
|
3a45907df0
|
Keep connection alive as long as the node is connected
|
2017-12-13 14:42:20 -08:00 |
|
Ryan Downe Karpf
|
d0f088164b
|
Merge pull request #11975 from luiscuenca/webPrivacyFixRC61
Fix web entities accessing the webcam RC-61
|
2017-12-13 08:44:50 -08:00 |
|
luiscuenca
|
a1f1e7b587
|
Fix web entities accessing the webcam RC61
|
2017-12-12 18:20:29 -07:00 |
|
Seth Alves
|
b2c4cdc613
|
Merge pull request #11962 from AndrewMeadows/fix-avatar-mixer-crash-on-sort
fix avatar-mixer crash during sort
|
2017-12-11 15:36:33 -08:00 |
|
Andrew Meadows
|
db6505493f
|
fix avatar-mixer crash: don't use global callback
|
2017-12-11 14:04:39 -08:00 |
|
Howard Stearns
|
8e36228c12
|
Merge pull request #11948 from MandatoryMania/noFundsSymbol
Provides a nice alert in case of insufficient funds to make a purchase
|
2017-12-11 11:45:27 -08:00 |
|
Sam Gateau
|
0ff91e5926
|
Merge pull request #11952 from samcake/light
Exposing multi highlight and selection feature to js api
|
2017-12-12 01:09:15 +07:00 |
|
Zach Fox
|
006ea3342c
|
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint
Remove useless Wallet.buy() scripting endpoint
|
2017-12-11 09:33:18 -08:00 |
|
samcake
|
63fb9b5503
|
fix float literal syntax
|
2017-12-11 09:30:31 -08:00 |
|
Clément Brisset
|
833f98b98b
|
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage
Reduce Image library memory usage
|
2017-12-11 09:29:22 -08:00 |
|
samcake
|
1008175a92
|
Removing commented code
|
2017-12-11 09:28:33 -08:00 |
|
samcake
|
b4f7433042
|
removing .f for a float in shader
|
2017-12-11 09:26:43 -08:00 |
|
Sam Gateau
|
d1cd9f5c6b
|
adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays
|
2017-12-11 02:21:09 -08:00 |
|
Sam Gateau
|
cc4b266647
|
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
|
2017-12-11 00:31:54 -08:00 |
|
Sam Gateau
|
bb888f2d4c
|
Replace the name opacity for alpha
|
2017-12-10 23:07:06 -08:00 |
|
Sam Gateau
|
eec4e966a7
|
Fix the linux build and correct the name of the property Intensity to Opacity
|
2017-12-10 10:13:49 -08:00 |
|
Sam Gateau
|
429d54d65d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-10 09:53:22 -08:00 |
|