David Back
|
c1757d6b45
|
merge
|
2018-01-03 10:10:12 -08:00 |
|
Zach Fox
|
681b5173cd
|
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
|
2018-01-03 09:34:14 -08:00 |
|
Zach Fox
|
33ae0948bb
|
Merge pull request #12080 from zfox23/commerce_myPurchasesLink
Add a link to My Purchases from Wallet Home
|
2018-01-02 17:33:02 -08:00 |
|
milad
|
63801ce802
|
add .jsc, remove duplicate qmlc, and remote Utils.jsc
|
2018-01-02 17:15:23 -08:00 |
|
David Back
|
88b034aa78
|
bump multiplier
|
2018-01-02 16:35:43 -08:00 |
|
David Back
|
a44e00142d
|
texture line parse wip
|
2018-01-02 15:41:14 -08:00 |
|
Zach Fox
|
917db14879
|
Add a link to My Purchases from Wallet Home
|
2018-01-02 15:26:11 -08:00 |
|
Zach Fox
|
d0a3c299c9
|
Merge pull request #12076 from zfox23/commerce_fixMarketplacesInjectForLocal
Fix marketplacesInject.js for local Metaverse
|
2018-01-02 15:03:36 -08:00 |
|
Clément Brisset
|
d6bc41db60
|
Merge pull request #12075 from highfidelity/stable
Stable merge back into master
|
2018-01-02 13:24:03 -08:00 |
|
Zach Fox
|
47a209dc4c
|
Make things slightly better?
|
2018-01-02 13:11:00 -08:00 |
|
Zach Fox
|
25e76c668b
|
Fix marketplacesInject.js for local Metaverse
|
2018-01-02 12:22:40 -08:00 |
|
Elisa Lupin-Jimenez
|
a63538c4e9
|
Merge pull request #12021 from elisa-lj11/poly_api
Google Poly API
|
2018-01-02 10:28:17 -08:00 |
|
David Back
|
64cd3d5cb5
|
Merge branch 'polymaterials' of https://github.com/dback2/hifi into polymaterials
|
2018-01-02 10:07:43 -08:00 |
|
David Back
|
198c0501ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
|
2018-01-02 10:07:23 -08:00 |
|
unknown
|
7531a2ef3b
|
map_bump wip
|
2017-12-29 18:00:07 -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 |
|
David Back
|
cee6bd2700
|
ignore Ni
|
2017-12-28 17:20:16 -08:00 |
|
David Back
|
a855916eb8
|
fix relative paths
|
2017-12-28 16:39:02 -08:00 |
|
David Back
|
dee06e72f6
|
ke is the new ka
|
2017-12-28 16:08:53 -08:00 |
|
David Back
|
188e476f2f
|
temp obj import fixes
|
2017-12-28 13:57:12 -08:00 |
|
David Back
|
38d2266d28
|
Tr
|
2017-12-27 17:14:45 -08:00 |
|
David Back
|
5e45ee456c
|
more ka
|
2017-12-27 16:55:45 -08:00 |
|
Elisa Lupin-Jimenez
|
84933131c4
|
changed api key variable name
|
2017-12-27 12:49:16 -08:00 |
|
Elisa Lupin-Jimenez
|
a428eb5b75
|
added const to several parameters
|
2017-12-27 12:47:04 -08:00 |
|
David Back
|
c3801fee7e
|
ka
|
2017-12-27 11:58:00 -08:00 |
|
Elisa Lupin-Jimenez
|
01c1032540
|
fixed constant names, added another URL check
|
2017-12-27 10:51:58 -08:00 |
|
Elisa Lupin-Jimenez
|
03f06aadf4
|
keyword filters case insensitive now
|
2017-12-26 11:08:10 -08:00 |
|
Elisa Lupin-Jimenez
|
e1b344e36d
|
handles empty json object return
|
2017-12-26 10:50:10 -08:00 |
|
Elisa Lupin-Jimenez
|
3e10d3b436
|
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
|
2017-12-26 10:18:51 -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
|
e935844681
|
Merge pull request #12066 from highfidelity/RC61.1
Beta Release 61.2 - includes up to Reveloper Release 7599
|
2017-12-22 17:34:37 -08:00 |
|
John Conklin II
|
ed28b67fab
|
Merge pull request #12062 from druiz17/rc-grab-fix
Fix deleted action not being sent over the network correctly - RC61.1
|
2017-12-22 16:43:52 -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 |
|
Dante Ruiz
|
86be684d7a
|
delete code
|
2017-12-22 14:58:32 -08:00 |
|
Dante Ruiz
|
e316f71b31
|
fix grabbing
|
2017-12-22 14:53:48 -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
|
fd545c3928
|
Merge pull request #12048 from zfox23/commerce_CheckoutLayoutRevisions
Commerce: Checkout Layout Revisions
|
2017-12-22 09:59:49 -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
|
50600f87a6
|
Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3
|
2017-12-22 09:07:35 -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 |
|
John Conklin II
|
79ccdaca42
|
Merge pull request #12050 from highfidelity/RC61.1
Beta Release 61.1 - Includes up to Developer Release 7593
|
2017-12-21 21:44:34 -08:00 |
|
Stephen Birarda
|
072e818c99
|
Merge pull request #12053 from birarda/bug/61-1-protocol-version
RC61.1: Manually push OwnershipChallengeFix to 3 (to avoid StaticCertJsonVersionOne conflict)
|
2017-12-21 19:45:55 -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 |
|