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

63579 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
6200d31c93 Fixing OSX resources URL 2018-01-17 14:46:27 -08:00
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
Sam Gateau
0e72197a37
Merge pull request #12179 from Zvork/specular 
Fixed error in Specular shader which gave low key specular highlights
 2018-01-17 10:51:25 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS 
Merge Account & GlobalServices follow-up
 2018-01-17 10:50:54 -08:00
Bradley Austin Davis
503fed19a7 Trying to fix mac resource loading 2018-01-17 10:36:34 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Brad Davis
795a3b8407 Fix merge errors 2018-01-16 19:27:35 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics 
Rename libraries/model -> libraries/graphics
 2018-01-16 18:12:25 -08:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
NissimHadar
9a382ebb86
Merge pull request #12177 from NissimHadar/defaultAmbientFix 
Set ambient mode to inherit if no URLs have been entered.
 2018-01-16 14:40:08 -08:00
Brad Davis
ceb60f6eba Fix built-in resource loading from scripts 2018-01-16 12:33:09 -08:00
MiladNazeri
d356f4faf9
Merge pull request #12143 from ctrlaltdavid/21679 
location API JSDoc
 2018-01-16 12:32:25 -08:00
Clément Brisset
858221d4db
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash 
Fix concurrent access crash in avatar mixer
 2018-01-16 11:07:59 -08:00
David Rowe
f836a5f2b6 Fix typo 2018-01-17 08:06:04 +13:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable 
Merge stable (RC62) to master
 2018-01-16 11:01:07 -08:00
Sam Gondelman
3879626205
Merge pull request #12176 from SamGondelman/rendering 
Fix animation crash, make last frame inclusive
 2018-01-16 10:05:48 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
John Conklin II
f3b200214c
Merge pull request #12110 from highfidelity/RC62 
Beta Release 62 - includes up to Developer Release 7646
 2018-01-16 09:34:13 -08:00
Brad Davis
ca83999546 Trying to fix Android pre-build 2018-01-16 09:22:39 -08:00
Brad Davis
673a396fdc Extend timeout for capturing executable output 2018-01-16 09:11:50 -08:00
Seth Alves
b17913366a
Merge pull request #12178 from ctrlaltdavid/21694 
Support FBX files that have nodes with non-XYZ rotation order
 2018-01-16 07:50:11 -08:00
Olivier Prat
6686b328c7 Fixed error in Specular shader which gave low key specular highlights 2018-01-16 10:47:46 +01:00
David Rowe
02179e3efd Doc review 2018-01-16 17:14:30 +13:00
David Rowe
f319fa70cb Merge branch 'master' into 21679 2018-01-16 16:22:34 +13:00
Nissim Hadar
f2d272b6fe Merge branch 'master' of https://github.com/highfidelity/hifi into defaultAmbientFix 2018-01-15 17:56:19 -08:00
Nissim Hadar
daa6409936 Improved comments. 2018-01-15 17:33:48 -08:00
David Rowe
67218a697b Support FBX files that have nodes with non-XYZ rotation order 2018-01-16 14:01:20 +13:00
John Conklin II
b26b99fec5
Merge pull request #12175 from SamGondelman/RC62 
RC62: Fix animation crash, make last frame inclusive
 2018-01-15 15:49:54 -08:00
Brad Davis
30bd8977b7 Remove android specific start address 2018-01-15 15:16:37 -08:00
Nissim Hadar
a1415e28ff If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit. 2018-01-15 15:11:10 -08:00
SamGondelman
9d721ba605 fix crash on last frame = first frame, make last frame inclusive 
(cherry picked from commit f1253e3c6c)
 2018-01-15 15:03:03 -08:00
SamGondelman
f1253e3c6c fix crash on last frame = first frame, make last frame inclusive 2018-01-15 15:01:17 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684 
Update Window JSDoc per recent API changes
 2018-01-15 14:50:40 -08:00
Brad Davis
aeb7ca17a5 Don't sync textures with unsupported formats to the GPU 2018-01-15 13:43:49 -08:00
Brad Davis
17e9c3d00c Don't try to set invalid uniforms 2018-01-15 13:43:19 -08:00
Brad Davis
d10d7026c5 Force Qt to use ANGLE when in GLES mode on Windows 2018-01-15 13:42:41 -08:00
Ryan Huffman
9b7520ddba
Merge pull request #12173 from sethalves/atp-get-mapping 
expose GetMappingRequest to js
 2018-01-15 13:42:19 -08:00
Seth Alves
ed91ece871
Merge pull request #12169 from druiz17/asset-browser 
fix asset browser for tablet
 2018-01-15 12:04:26 -08:00
Brad Davis
1da29862e7 Fix for OSX build 2018-01-15 11:57:06 -08:00
Brad Davis
60bb3f49c9 Fix crash on 0 size assets 2018-01-15 11:57:06 -08:00
Sam Gateau
2f5d2bef49
Merge pull request #12028 from Zvork/roughness_metal 
Lighting model update for better specular
 2018-01-15 10:51:18 -08:00
Bradley Austin Davis
cb3456195e Fix OSX Oculus plugin 2018-01-15 10:48:39 -08:00
Seth Alves
76048f3c30 error handling 2018-01-15 10:48:12 -08:00
Melissa Brown
991dad18ba
Merge pull request #12160 from ElderOrb/FB11241 
FB11241 Changing options in menu causes the title “Menu” to change to…
 2018-01-15 10:46:37 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62 
fix Asset browser for tablet (RC62)
 2018-01-15 10:16:56 -08:00