Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 13:13:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
63389 commits 71 branches 56 tags 1.2 GiB
Commit graph

63389 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Sam Gateau
8294322993 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-11 19:12:06 -08:00
samcake
f22429d098 Working on the shaders 2018-01-11 18:03:11 -08:00
Bradley Austin Davis
800b7963f2
Merge pull request #12152 from gcalero/android_touchevents 
Android touchevents
 2018-01-11 20:39:55 -05:00
Gabriel Calero
c469e8ce53 Propagate touch events to qml offscreen surface 2018-01-11 20:45:26 -03: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
Sam Gateau
09f5f0746b
Merge pull request #12141 from SamGondelman/uniformBuffer 
Fix particle uniform buffer issue
 2018-01-11 14:05:36 -08:00
vladest
cff80e86b6 Temporarily disable magnification until further notice 2018-01-11 22:18:22 +01: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
Brad Davis
001edcd71b Allow creation of empty files with storage API 2018-01-11 08:06:52 -08:00
Brad Davis
6e3ce95c3c Force overwrites of existing assets 2018-01-11 08:06:06 -08:00
Gabriel Calero
9fa06e0019 Fixes to load cubemap 2018-01-11 11:12:58 -03:00
Brad Davis
65794cf142 Better skybox for android testing 2018-01-10 20:20:57 -08:00
Brad Davis
238f1b9449 Support normal vertex format 2018-01-10 19:43:28 -08:00
Bradley Austin Davis
dd71035bf0
Merge pull request #12144 from samcake/android-fixes 
Fixing forward render task to draw entities and avatars shapes
 2018-01-10 21:11:24 -05: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
samcake
4dd925f025 Fixing forward render task to draw entities and avatars shapes 2018-01-10 17:51:03 -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
560fd38547 Merge remote-tracking branch 'upstream/master' into android 2018-01-10 17:31:50 -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
Brad Davis
4dfe0073bc Do asset merging post-build 2018-01-10 17:18:30 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -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
SamGondelman
e9d751fd23 try to avoid reusing uniform buffer locations 2018-01-10 17:01:01 -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
NissimHadar
19106fcff9
Merge pull request #12128 from NissimHadar/stageRemoval 
Stage removal
 2018-01-10 15:06:51 -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
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
Brad Davis
10a67fd9f8 Fix unpack resources on android 2018-01-10 13:33:43 -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