Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
63455 commits 29 branches 0 tags 1.1 GiB
Commit graph

63455 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
58d4d193f7 Add command line disabling of QML and KTX cache 2018-01-13 12:22:00 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -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
3d69ceea71 Re-enable HUD compositing 2018-01-13 11:34:56 -08:00
Brad Davis
8c528be481 Allow compile time disabling of QML surface rendering 2018-01-13 11:34:00 -08:00
Brad Davis
6d45238bbd Allow disabling of KTX cache 2018-01-13 11:32:47 -08:00
Brad Davis
17899d5e07 Don't create share context for web while running nsight 2018-01-13 11:32:23 -08:00
Brad Davis
6313e3ea69 Allow building on Android with GLAD disabled 2018-01-13 11:31:50 -08:00
Sam Gateau
d6e771f01d Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid 2018-01-13 10:02:53 -08:00
Sam Gateau
57f1ba2412 Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default 2018-01-13 02:00:34 -08:00
Brad Davis
c685cc0e6f Fix stencil buffer background issue 2018-01-13 01:31:42 -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
Sam Gateau
9fc50628e1 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:43:57 -08:00
Brad Davis
51a0131414 Fix linkage 2018-01-12 19:37:28 -08:00
Sam Gateau
628731ed19 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:37:07 -08:00
Sam Gateau
44920dd828 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-12 19:33:47 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Anthony Thibault
0a54241fe3
Merge pull request #12092 from hyperlogic/feature/dual-quat 
Fix tootsie roll wrists and shoulders with dual quaternion skinning
 2018-01-12 16:30:03 -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
ea2b0c4f6f
Merge pull request #12165 from zfox23/fixBrowseAvatars 
Fix 'Browse Avatars' button from Avatar Settings
 2018-01-12 15:14:18 -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
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
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix 
Dealing with legacy domains.
 2018-01-12 12:42:11 -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
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
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00