Gabriel Calero
|
8cac98545a
|
Fixes for Android
|
2018-01-04 17:36:10 -03:00 |
|
Gabriel Calero
|
32494a8e24
|
Set QMLEngine base path for android
|
2018-01-03 22:13:31 -03:00 |
|
Gabriel Calero
|
3d86c24b34
|
Fix uncompressed textures. Generate CPU mipmaps for android
|
2018-01-03 16:42:19 -03:00 |
|
Gabriel Calero
|
e418339876
|
Fix uncompressed textures for android
|
2018-01-03 16:42:19 -03:00 |
|
Cristian Luis Duarte
|
40a7634a53
|
Incorporate changes from gpu-gl into gpu-gles (changes in organization and architecture of classes).
|
2018-01-03 16:42:19 -03:00 |
|
Gabriel Calero
|
597114afea
|
Prepare forward pipeline for android
|
2018-01-03 16:42:19 -03:00 |
|
Cristian Luis Duarte
|
da28e0a8cb
|
Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup
|
2018-01-03 16:42:18 -03:00 |
|
Gabriel Calero
|
fc62b2d34a
|
Fix ktx_cache path for android. Load the least js scripts for android
|
2018-01-03 16:42:18 -03:00 |
|
Gabriel Calero
|
ef8ba1cad0
|
Include config.h in ResourceImageItem.cpp. Minor fixes
|
2018-01-03 16:40:14 -03:00 |
|
Gabriel Calero
|
78f2a8c566
|
Copy scripts from android assets at startup
|
2018-01-03 16:40:14 -03:00 |
|
Gabriel Calero
|
d31346c047
|
Use qml engine
|
2018-01-03 16:40:14 -03:00 |
|
Gabriel Calero
|
468fc89c3e
|
Use forward pipeline for android
|
2018-01-03 16:38:23 -03:00 |
|
Gabriel Calero
|
ad7cb24ea3
|
Restore interface icon and name for android
|
2018-01-03 16:36:11 -03:00 |
|
Gabriel Calero
|
dad526d22b
|
Make Fade.slh compatible with Open GLES SL
|
2018-01-03 16:36:11 -03:00 |
|
Gabriel Calero
|
76b38bebad
|
Make Interface run in Android
|
2018-01-03 16:36:11 -03:00 |
|
Brad Davis
|
641c4e537a
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2018-01-02 11:38:11 -08:00 |
|
Brad Davis
|
829e521320
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2018-01-02 11:37:33 -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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
John Conklin II
|
2791217e8d
|
Merge pull request #12045 from birarda/bug/jimjamz-issues
Fix for invisible or stuttering avatars, PendingReceivedMessage use after free
|
2017-12-21 17:03:14 -08:00 |
|
Zach Fox
|
ef71470d85
|
Small change
|
2017-12-21 17:03:04 -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
|
2acea75db3
|
Commerce: Checkout Layout Revisions
|
2017-12-21 16:09:46 -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 |
|