Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 05:50:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63611 commits 25 branches 0 tags 1.1 GiB
Commit graph

63611 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
9b0fb19cfa Remove unused "anchor" Overlays property 2018-01-12 12:16:58 +13: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
Nissim Hadar
311e95e0d0 Corrected default values - for reading legacy content. 2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
Nissim Hadar
d1cd2d9c96 Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix 2018-01-11 14:52:19 -08:00
Zach Fox
1e608b13b2 Show username when admin (this probably isn't the way to get username 2018-01-11 14:45:43 -08:00
Seth Alves
57368fb786 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-11 14:23:51 -08:00
Seth Alves
1a1caa64d5
Merge pull request #12148 from vladest/disable_magnification 
Temporarily disable magnification until further notice
 2018-01-11 14:20:54 -08:00
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture 
Keep requesting render update until textures load
 2018-01-11 14:09:21 -08:00
John Conklin II
3c36b8ffee
Merge pull request #12146 from SamGondelman/RC62 
Fix particle uniform buffer issue (RC62)
 2018-01-11 14:06:15 -08:00
Sam Gateau
09f5f0746b
Merge pull request #12141 from SamGondelman/uniformBuffer 
Fix particle uniform buffer issue
 2018-01-11 14:05:36 -08: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
Seth Alves
1e92615459 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-11 13:21:45 -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
Zach Fox
df58065e75 Silly bug 2018-01-11 13:02:00 -08:00
Zach Fox
81ab5ac81c hfc_key -> public_key 2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
Nissim Hadar
86566fc9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix 2018-01-11 12:30:30 -08:00
Nissim Hadar
d225f803d0 Corrected default values. 2018-01-11 12:28:44 -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
Zach Fox
d577b2e9e8 Actually add the API calls 2018-01-11 11:45:43 -08:00
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