Bruce Brown
|
b3ac4de1e6
|
Update Midi.h
|
2017-12-29 10:45:58 -08:00 |
|
Bruce Brown
|
fa10578293
|
Add files via upload
|
2017-12-29 10:40:59 -08:00 |
|
Seth Alves
|
4bbce011a4
|
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3
avatar-entities which are children of an avatar will scale with the avatar
|
2017-12-29 09:12:17 -08:00 |
|
Brad Hefta-Gaub
|
3d02955c5d
|
Merge pull request #12029 from SamGondelman/webOverlay
Fix >20 web entities crash
|
2017-12-24 17:10:39 -08:00 |
|
John Conklin II
|
0dd5bbc2d6
|
Merge pull request #12057 from birarda/61-1-merge-back
Merge stable back into master after RC61.1
|
2017-12-22 16:26:08 -08:00 |
|
Stephen Birarda
|
e3cbfd92a0
|
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
|
2017-12-22 15:48:04 -08:00 |
|
Seth Alves
|
96197e66bb
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 15:13:02 -08:00 |
|
Zach Fox
|
808b9cbc31
|
Merge pull request #12047 from zfox23/commerce_dataTracking3
Commerce Data Tracking: Iteration 3 (Purchases)
|
2017-12-22 14:31:03 -08:00 |
|
Sam Gateau
|
db4f9909c7
|
Merge pull request #12017 from Zvork/glcolor
Removed glColor reset hack in MeshPartPayload
|
2017-12-22 14:25:51 -08:00 |
|
Sam Gateau
|
a2c16ddf6a
|
Merge pull request #12026 from SamGondelman/burp3
Remove _model from ModelMeshPartPayload
|
2017-12-22 13:50:06 -08:00 |
|
Stephen Birarda
|
d299b9a56c
|
Merge pull request #12024 from birarda/bug/entity-sequence-skip
handle sequence number from reliably sent adds in OctreeEditPacketSender
|
2017-12-22 12:30:27 -08:00 |
|
Howard Stearns
|
5767f5937e
|
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
Commerce: Fix some rezzing errors; Fix ECDSA errors
|
2017-12-22 09:56:22 -08:00 |
|
Seth Alves
|
533aa3d918
|
code review
|
2017-12-22 09:07:16 -08:00 |
|
Seth Alves
|
897b96d092
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 07:36:26 -08:00 |
|
Stephen Birarda
|
95c7f876bf
|
manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne
|
2017-12-21 18:52:01 -08:00 |
|
John Conklin II
|
5a839ebd93
|
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
|
2017-12-21 17:46:32 -08:00 |
|
Zach Fox
|
07a1cf434a
|
IT'S WORKING!!!
|
2017-12-21 16:33:47 -08:00 |
|
Zach Fox
|
373ef6c6ce
|
Progress?
|
2017-12-21 16:32:20 -08:00 |
|
Zach Fox
|
a2f2c23337
|
Change three lines of code. Fix one thing. Break another.
|
2017-12-21 16:32:15 -08:00 |
|
Zach Fox
|
618e5c9032
|
Commerce Data Tracking: Iteration 3 (Purchases)
|
2017-12-21 15:46:01 -08:00 |
|
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 |
|
Zach Fox
|
73eb258e79
|
IT'S WORKING!!!
|
2017-12-21 15:17:52 -08:00 |
|
SamGondelman
|
69c1c65eb8
|
get rid of _model completely
|
2017-12-21 14:08:21 -08:00 |
|
Zach Fox
|
e963673409
|
Progress?
|
2017-12-21 14:08:18 -08:00 |
|
Stephen Birarda
|
31e9f26772
|
fix use after free of pending message
|
2017-12-21 11:35:11 -08:00 |
|
Andrew Meadows
|
5c84c5f845
|
measure average time of 'present'
|
2017-12-20 17:41:08 -08:00 |
|
Melissa Brown
|
fddb192af8
|
Merge pull request #11961 from humbletim/add-midi-control-change
forward MIDI_CONTROL_CHANGE events
|
2017-12-20 17:11:08 -08:00 |
|
Zach Fox
|
b30d3fcc12
|
Change three lines of code. Fix one thing. Break another.
|
2017-12-20 15:40:10 -08:00 |
|
SamGondelman
|
2ba3e337db
|
cleanup
|
2017-12-20 14:18:01 -08:00 |
|
SamGondelman
|
7a7b1f7089
|
fix web entity crash
|
2017-12-20 13:58:58 -08:00 |
|
SamGondelman
|
bd06dc6443
|
cleaning up modelmeshpartpayload
|
2017-12-20 11:00:14 -08:00 |
|
Zach Fox
|
297a3df63c
|
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
QML Whitelisting + Commerce Integration
|
2017-12-19 18:07:14 -08:00 |
|
Sam Gondelman
|
5f5bf94f2a
|
Merge pull request #12008 from AndrewMeadows/fix-animation-crash
fix interface crash for bad QVector index in animation loop
|
2017-12-19 17:59:47 -08:00 |
|
NissimHadar
|
88ade87c71
|
Merge pull request #11774 from NissimHadar/hazeOnTransparent
Haze on transparent
|
2017-12-19 17:20:14 -08:00 |
|
Stephen Birarda
|
1a6546999a
|
track reliably sent adds in sent packet history from OEPS
|
2017-12-19 16:00:55 -08:00 |
|
SamGondelman
|
9aed825328
|
Merge remote-tracking branch 'upstream/master' into burp2
|
2017-12-19 11:39:21 -08:00 |
|
Nissim Hadar
|
2c6868b03e
|
Pass keylight direction as parameter to the shader.
|
2017-12-19 11:12:27 -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 |
|
Nissim Hadar
|
de7edc68d4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
|
2017-12-19 10:47:16 -08:00 |
|
Andrew Meadows
|
bad2c1df76
|
proper modulus of animation frame
|
2017-12-19 10:40:17 -08:00 |
|
Andrew Meadows
|
559cb33563
|
remove incorrect comment
|
2017-12-19 10:40:17 -08:00 |
|
Andrew Meadows
|
661a63bd0c
|
fix crash for bad QVector index
|
2017-12-19 10:40:17 -08:00 |
|
Zach Fox
|
18d5be147c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-19 09:48:15 -08:00 |
|
Howard Stearns
|
f8cef6631b
|
Merge pull request #11995 from birarda/bug/fix-connection-reset
make udt::Connection live as long as node connection
|
2017-12-19 09:43:54 -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 |
|
Nissim Hadar
|
73f16b1b2a
|
Merge branch 'hazeOnTransparent' of https://github.com/NissimHadar/hifi
|
2017-12-19 07:59:12 -08:00 |
|
Brad Hefta-Gaub
|
04fa4d2999
|
Merge pull request #12016 from SamGondelman/versionFix
Bump protocol version
|
2017-12-19 07:30:55 -08:00 |
|
John Conklin II
|
d4e44fec56
|
Merge pull request #12015 from sethalves/fix-av-collision-after-grab
fix logic that resets own-avatar collisions after a parenting grab is released
|
2017-12-19 07:01:37 -08:00 |
|
Olivier Prat
|
bd666406f4
|
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
|
2017-12-19 14:17:17 +01:00 |
|