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
Brad Davis
d10d7026c5
Force Qt to use ANGLE when in GLES mode on Windows
2018-01-15 13:42:41 -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
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
e627925bd3
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 15:14:42 -08:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -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
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c
Switching to binary resources
2018-01-10 13:39:56 -08:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665
...
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 12:06:58 -08:00
Anthony J. Thibault
220b7f5e55
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-10 10:14:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats
...
more context for update performance stats
2018-01-10 09:10:26 -08:00
Cain Kilgore
330b266ca8
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 11:31:46 +00:00
Brad Davis
b1e95681a9
Cleanup android
2018-01-09 23:30:31 -08:00
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08:00
Andrew Meadows
8c6edc749a
provide more context for update perf stats
2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -08:00
luiscuenca
9a81410762
refactor
2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af
Fix toolbar appears on HMD mode
2018-01-08 20:37:07 -07:00
Brad Davis
a2c2e7d9ff
Fixes to load cubemap
2018-01-08 14:43:54 -08:00
Gabriel Calero
7fbd23f36b
Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr
2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c
Resolving comments in PR
2018-01-08 17:36:08 -03:00
Anthony J. Thibault
61edd83987
Improve stability for HMD third person avatars
...
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.
To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
2018-01-08 11:26:29 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr
2018-01-08 12:49:52 -05:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
...
defang accidental disable of MyAvatar's default motor
2018-01-04 17:44:22 -08:00
David Back
81f3590954
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-04 13:17:07 -08:00
Gabriel Calero
8cac98545a
Fixes for Android
2018-01-04 17:36:10 -03:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
...
Remove legacy jurisdiction code
2018-01-04 11:52:38 -08:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
David Back
6c8987d75f
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-03 14:44:52 -08:00
