luiscuenca
|
54a1da8d73
|
Only mod my card
|
2018-01-11 11:55:28 -07:00 |
|
SamGondelman
|
a3ca8e3a72
|
try to avoid reusing uniform buffer locations
(cherry picked from commit e9d751fd23)
|
2018-01-11 10:03:56 -08: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 |
|
Seth Alves
|
c09f644612
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-11 09:09:11 -08:00 |
|
Olivier Prat
|
3f8865594b
|
Fixed typo error that could potentially launch an assert when loading objects with blend shapes with normals but without tangents
|
2018-01-11 08:37:56 +01: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 |
|
Nissim Hadar
|
8661d8a20d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QtImageCompare
|
2018-01-10 18:22:06 -08:00 |
|
Nissim Hadar
|
0f4206d330
|
Added option to delete old snapshots.
|
2018-01-10 18:21:34 -08: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 |
|
David Rowe
|
309e7f7333
|
Tidying
|
2018-01-11 14:48:45 +13: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 |
|
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 |
|
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 |
|
Zach Fox
|
939012a2d0
|
Hook up the endpoints!
|
2018-01-10 17:10:05 -08:00 |
|
SamGondelman
|
e9d751fd23
|
try to avoid reusing uniform buffer locations
|
2018-01-10 17:01:01 -08:00 |
|
Nissim Hadar
|
92a80c500e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QtImageCompare
|
2018-01-10 16:58:22 -08:00 |
|
David Rowe
|
951f52c4b2
|
Merge branch 'master' into 21679
|
2018-01-11 13:54:06 +13:00 |
|
Dante Ruiz
|
980807c657
|
make changes
|
2018-01-10 16:50:41 -08:00 |
|
David Rowe
|
753bd21e68
|
location API JSDoc
|
2018-01-11 13:44:16 +13:00 |
|
Zach Fox
|
0d137d62c8
|
HMD tweaks
|
2018-01-10 16:37:47 -08:00 |
|
Anthony J. Thibault
|
1deb75daf7
|
Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93)
|
2018-01-10 16:31:51 -08:00 |
|
Zach Fox
|
b3e3af4ee7
|
Add character count :)
|
2018-01-10 16:23:29 -08:00 |
|
Zach Fox
|
260aee42a8
|
Improvements
|
2018-01-10 16:18:34 -08:00 |
|
Anthony J. Thibault
|
d5e3b97c93
|
Fix for black screen when clicking Settings from Snap app
|
2018-01-10 16:03:53 -08:00 |
|
Zach Fox
|
c15b1669b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-10 15:53:23 -08:00 |
|
Zach Fox
|
93b15c0aa6
|
Payment Failure
|
2018-01-10 15:53:13 -08:00 |
|
Zach Fox
|
6812010660
|
The skeleton is there
|
2018-01-10 15:33:18 -08:00 |
|
Ken Cooke
|
6a2e3cc272
|
Enable stereo codecs for AvatarAudioStream
|
2018-01-10 15:14:18 -08:00 |
|
Zach Fox
|
22631065e4
|
Serious flow state
|
2018-01-10 15:09:15 -08:00 |
|
NissimHadar
|
19106fcff9
|
Merge pull request #12128 from NissimHadar/stageRemoval
Stage removal
|
2018-01-10 15:06:51 -08:00 |
|
John Conklin II
|
36a76dad2b
|
Merge pull request #12125 from druiz17/fix-tablet-model
Add adjustments to tablet model and screen offset
|
2018-01-10 14:55:08 -08:00 |
|
John Conklin II
|
428c8e6737
|
Merge pull request #12137 from SamGondelman/RC62
Keep requesting render update until textures load (RC62)
|
2018-01-10 14:54:15 -08:00 |
|
Seth Alves
|
ddc730f49f
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-10 13:49:07 -08:00 |
|
Nissim Hadar
|
dff47f38a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-10 13:36:09 -08:00 |
|
Nissim Hadar
|
8396997dec
|
Renamed enum element.
|
2018-01-10 13:35:57 -08:00 |
|
SamGondelman
|
6072780d24
|
keep requesting render update until textures load
(cherry picked from commit df574c6bc9)
|
2018-01-10 13:27:19 -08:00 |
|
SamGondelman
|
df574c6bc9
|
keep requesting render update until textures load
|
2018-01-10 13:19:53 -08:00 |
|
Cain Kilgore
|
104ac0ffae
|
Indents, man
|
2018-01-10 20:30:41 +00:00 |
|
MiladNazeri
|
b73106fa7e
|
Merge pull request #12120 from cain-kilgore/21666
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
|
2018-01-10 12:30:21 -08:00 |
|
Cain Kilgore
|
b26e31a362
|
Copy paste? Never!
|
2018-01-10 20:27:19 +00:00 |
|
Zach Fox
|
c5a5bddbc9
|
More progress
|
2018-01-10 12:21:12 -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
|
250e4032b0
|
Bug fix to prevent wrists entering the avatar's torso.
This was inadvertently disabled in PR #11978.
(cherry picked from commit ae997928c1)
|
2018-01-10 12:04:50 -08:00 |
|
MiladNazeri
|
bf61d8c7b3
|
Merge pull request #12115 from ctrlaltdavid/deprecations
Update JSDoc with some deprecations
|
2018-01-10 12:04:21 -08:00 |
|