Brad Davis
|
6a06bf405a
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-16 18:24:44 -08:00 |
|
Sam Gateau
|
d4571bd86a
|
Merge pull request #12181 from humbletim/rename-model-graphics
Rename libraries/model -> libraries/graphics
|
2018-01-16 18:12:25 -08:00 |
|
Bradley Austin Davis
|
b4223215ef
|
Use old style resources on OSX for now
|
2018-01-16 14:44:05 -08:00 |
|
Clément Brisset
|
1949471dad
|
Merge pull request #12182 from highfidelity/stable
Merge stable (RC62) to master
|
2018-01-16 11:01:07 -08:00 |
|
humbletim
|
b91d536dd0
|
rename model:: -> graphics::
|
2018-01-16 12:46:16 -05:00 |
|
humbletim
|
08ccda9cfc
|
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
|
2018-01-16 12:44:44 -05:00 |
|
MiladNazeri
|
c7cdf6b8f6
|
Merge pull request #12145 from ctrlaltdavid/21684
Update Window JSDoc per recent API changes
|
2018-01-15 14:50:40 -08:00 |
|
Brad Davis
|
d10d7026c5
|
Force Qt to use ANGLE when in GLES mode on Windows
|
2018-01-15 13:42:41 -08:00 |
|
Seth Alves
|
ed91ece871
|
Merge pull request #12169 from druiz17/asset-browser
fix asset browser for tablet
|
2018-01-15 12:04:26 -08:00 |
|
Melissa Brown
|
991dad18ba
|
Merge pull request #12160 from ElderOrb/FB11241
FB11241 Changing options in menu causes the title “Menu” to change to…
|
2018-01-15 10:46:37 -08:00 |
|
John Conklin II
|
c3648fb04c
|
Merge pull request #12168 from druiz17/RC62
fix Asset browser for tablet (RC62)
|
2018-01-15 10:16:56 -08:00 |
|
Brad Davis
|
58530c595a
|
Pre-merge cleanup
|
2018-01-14 19:48:12 -08:00 |
|
Brad Davis
|
c126e4fa1c
|
Fix automatic binary resources rebuilding
|
2018-01-14 10:51:16 -08:00 |
|
Brad Davis
|
55bfdc105b
|
Switch android to GLAD
|
2018-01-14 10:22:18 -08:00 |
|
Brad Davis
|
acb95d1355
|
GLAD polish
|
2018-01-14 00:10:05 -08:00 |
|
Brad Davis
|
24b83aa0f1
|
Merge remote-tracking branch 'sam/android-gles' into windows_gles
|
2018-01-13 11:36:31 -08:00 |
|
Brad Davis
|
17899d5e07
|
Don't create share context for web while running nsight
|
2018-01-13 11:32:23 -08:00 |
|
Sam Gateau
|
df0660f823
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
|
2018-01-13 01:00:41 -08:00 |
|
Sam Gateau
|
331a8f3094
|
fixing the stencil not clearing correctly and shaders not compiled correctly in main thread
|
2018-01-13 01:00:10 -08:00 |
|
Brad Davis
|
ab7aa52a10
|
GLES emulaton on windows
|
2018-01-12 19:17:35 -08:00 |
|
Dante Ruiz
|
8e4bd2d662
|
fix asset browser for tablet
|
2018-01-12 17:11:02 -08:00 |
|
Dante Ruiz
|
a48304b104
|
fix Asset browser for tablet
|
2018-01-12 17:06:07 -08:00 |
|
Zach Fox
|
bd3474de68
|
Merge pull request #12166 from zfox23/fixSnapshotSocialSharing
Fix social media sharing buttons on Snapshot app
|
2018-01-12 15:52:56 -08:00 |
|
Zach Fox
|
e627925bd3
|
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 15:14:42 -08:00 |
|
Zach Fox
|
522007af9d
|
Fix social media sharing buttons on Snapshot app
|
2018-01-12 14:58:14 -08:00 |
|
Zach Fox
|
6920e57613
|
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 13:31:58 -08:00 |
|
Zach Fox
|
b7f4fe2ba3
|
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
Do not delete wallet file
|
2018-01-12 09:44:40 -08:00 |
|
Brad Davis
|
7579451c24
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-11 23:31:45 -08:00 |
|
Brad Davis
|
22d133c71f
|
Allow GLES client on desktop builds
|
2018-01-11 23:31:34 -08:00 |
|
Alexander Ivash
|
11e918681a
|
FB11241 Changing options in menu causes the title “Menu” to change to “root”
note: fix is based on removing duplicated top-level menu entry from stack view
|
2018-01-12 02:08:10 +03:00 |
|
John Conklin II
|
96babdf2e2
|
Merge pull request #12135 from luiscuenca/palVolumeSlider
RC62 Pal volume slider fix
|
2018-01-11 13:36:03 -08:00 |
|
vladest
|
cff80e86b6
|
Temporarily disable magnification until further notice
|
2018-01-11 22:18:22 +01:00 |
|
howard-stearns
|
2987d21f66
|
remove some more
|
2018-01-11 13:15:34 -08:00 |
|
howard-stearns
|
c39771d995
|
do not delete wallet file when things go wrong, and remove obsolete
reset machinery
|
2018-01-11 11:50:23 -08:00 |
|
luiscuenca
|
54a1da8d73
|
Only mod my card
|
2018-01-11 11:55:28 -07:00 |
|
Anthony Thibault
|
8d5e7dbeff
|
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:58:10 -08:00 |
|
John Conklin II
|
da2c56dbc9
|
Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings
RC62: Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:48:03 -08:00 |
|
Brad Davis
|
65794cf142
|
Better skybox for android testing
|
2018-01-10 20:20:57 -08:00 |
|
David Rowe
|
a543d90090
|
Miscellaneous fixes
|
2018-01-11 15:53:45 +13:00 |
|
David Rowe
|
7ba42f0e76
|
Update JSDoc per recent changes in Window API
|
2018-01-11 15:52:56 +13:00 |
|
Seth Alves
|
363b9bfe11
|
Merge pull request #12127 from SamGondelman/freeze
Comment out TabletAddressDialog logging of long messages
|
2018-01-10 18:07:18 -08:00 |
|
Seth Alves
|
457fcd6f40
|
Merge pull request #12129 from SamGondelman/doubleClick
Move key logic from onClicked to onReleased
|
2018-01-10 18:03:23 -08:00 |
|
Seth Alves
|
568c27d6e0
|
Merge pull request #12039 from luiscuenca/currentAPI
Fix and improve currentAPI.js
|
2018-01-10 17:55:08 -08:00 |
|
Seth Alves
|
aefd294bf2
|
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
Improve stability for HMD third person avatars
|
2018-01-10 17:46:47 -08:00 |
|
Brad Davis
|
560fd38547
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-10 17:31:50 -08:00 |
|
Andrew Meadows
|
b3fcca8446
|
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
Bug fix to prevent wrists entering the avatar's torso.
|
2018-01-10 17:22:50 -08:00 |
|
Brad Davis
|
97593bc4d8
|
Fixing compiled resource access
|
2018-01-10 17:18:12 -08:00 |
|
John Conklin II
|
7f1a01fb3a
|
Merge pull request #12134 from hyperlogic/bug-fix/rc62-prevent-wrists-from-entering-body
RC62: Bug fix to prevent wrists entering the avatar's torso.
|
2018-01-10 17:15:56 -08:00 |
|
MiladNazeri
|
c77d2f4e58
|
Merge pull request #12121 from cain-kilgore/21667
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
|
2018-01-10 17:11:54 -08:00 |
|
MiladNazeri
|
301731554f
|
Merge pull request #12102 from cain-kilgore/21664
WL 21664 - Window.innerHeight should not include the menu bar
|
2018-01-10 17:10:14 -08:00 |
|