Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 21:10:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63853 commits 6 branches 1 tag 1.1 GiB
Commit graph

63853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
Brad Hefta-Gaub
68de7f864e
Merge pull request #12162 from kencooke/audio-stereo-mic 
Support for stereo audio input/mic
 2018-01-12 13:29:28 -08:00
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix 
Dealing with legacy domains.
 2018-01-12 12:42:11 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Andrew Meadows
a116768f4c
Merge pull request #12154 from hyperlogic/bug-fix/elbow-glitch-fix 
Fix for elbow glitches
 2018-01-12 10:18:11 -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
Anthony J. Thibault
bfd18e3696 unused variable warning fix 2018-01-12 09:07:50 -08:00
Brad Davis
ffbb5442c7 Last GL config fix 2018-01-12 08:58:13 -08:00
samcake
481675ee41 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-12 08:54:50 -08:00
Brad Davis
8b2e8706ff Fixing android GLES config 2018-01-12 00:42:46 -08:00
Nissim Hadar
50a030b68b Corrected copy of ambient URL. 2018-01-12 00:22:06 -08:00
Olivier Prat
c2427523ce Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2018-01-12 08:43:57 +01:00
Brad Davis
8241def9b9 Disable variable allocation textures on android 2018-01-11 23:36:24 -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
Sam Gateau
e3faec838c Adding colors to the world 2018-01-11 23:22:51 -08:00
Sam Gateau
6f6aedbf4f Merge branch 'master' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:56:52 -08:00
Sam Gateau
8142b207af Making the forward model normal lighted 2018-01-11 19:56:08 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop. 
Added copy of ambient URL.
 2018-01-11 19:35:13 -08:00
Sam Gateau
8294322993 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:12:06 -08:00
Ken Cooke
dfc8c86571 Fix bug when calling switchOutputToAudioDevice() with the active device. 
Pass QAudioDeviceInfo by value to avoid getting clobbered.
 2018-01-11 18:22:34 -08:00
Ken Cooke
db6e70cb24 Fix bug when calling switchInputToAudioDevice() with the active device. 
Pass QAudioDeviceInfo by value to avoid getting clobbered.
 2018-01-11 18:14:16 -08:00
samcake
f22429d098 Working on the shaders 2018-01-11 18:03:11 -08:00
Anthony J. Thibault
983e1fe075 warning fixes: removed unused variable. 2018-01-11 17:57:58 -08:00
Anthony J. Thibault
4e4ac6c54d Merge branch 'master' into bug-fix/elbow-glitch-fix 2018-01-11 17:57:41 -08:00
Bradley Austin Davis
800b7963f2
Merge pull request #12152 from gcalero/android_touchevents 
Android touchevents
 2018-01-11 20:39:55 -05:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00
Zach Fox
c216144015 Remove unnecessary comments 2018-01-11 16:21:59 -08:00
Ken Cooke
7c5085bd24 Handle stereo changes while active, by restarting the codec on both ends 2018-01-11 16:10:50 -08:00
David Rowe
5dca387055 Remove old, unused overlay panel code 2018-01-12 12:47:22 +13:00
Gabriel Calero
c469e8ce53 Propagate touch events to qml offscreen surface 2018-01-11 20:45:26 -03:00
Anthony J. Thibault
467a7eaf2d Fix for elbow glitches 
The pole vector constraint calculation within the IK system would sometimes compute the incorrect rotations.
This would be visible as an instantaneous snap of the elbow joint as the bicep was curled.

When applying pole vector constraints, there needs to be two methods of determining the current orientation of the elbow joint.
One for when the arm/elbow joint is bent, and one for when the arm/elbow is straight.
Previously, the way we would switch between these two solutions could cause a large rotation delta to accur between very small angles.
Now we use the more accurate method (1) more often, and we smoothly blend between the solutions as the joint gets straighter.
 2018-01-11 15:40:53 -08:00
Zach Fox
464bbe5d43 Bugfixes, refactoring, and improvements 2018-01-11 15:26:51 -08:00
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