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

31986 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
f38bb77d0a less calls to QHash 2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Brad Hefta-Gaub
0072b6d7d0 Merge pull request #5681 from samcake/orange 
NetworkGeometry and FBXReader refactoring for splliting Material from Mesh
 2015-09-22 09:27:11 -07:00
samcake
80e5581639 fixing review comments 2015-09-21 22:51:14 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
samcake
91b9940fe9 Merging and a fix for the diffuse map floating around 2015-09-21 18:09:25 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Davis
7b5cbbf758 Merge pull request #5868 from ctrlaltdavid/20687 
Fix HMD fullscreen mirror view
 2015-09-21 17:07:31 -07:00
samcake
21f53f1bbd debugging the lighting issue on the craps table 2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
Brad Davis
483884196c Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles 
merge model part quads and triangles together to reduce the number of draw calls
 2015-09-21 16:48:29 -07:00
Brad Davis
8f3c2af55e Merge pull request #5863 from ZappoMan/fixParticleEffect 
fix a couple of properties
 2015-09-21 16:43:12 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
samcake
dfe17e5708 Fix issues from review 2015-09-21 16:12:17 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
Bradley Austin Davis
84cea1ffd4 More CR comments 2015-09-21 14:33:32 -07:00
Philip Rosedale
26e5f1ca48 Merge pull request #5842 from SeijiEmery/platform-js 
Platform.js
 2015-09-21 14:28:34 -07:00
samcake
fa9b0930d2 Bring back the procedural skybox 2015-09-21 14:25:32 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
Philip Rosedale
cd84848fd4 Merge pull request #5867 from sethalves/fix-grab 
keep object from rotating during local grab
 2015-09-21 14:11:59 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Seth Alves
cee296e70c keep object from rotating during local grab 2015-09-21 13:50:42 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
43d96afc89 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-21 13:23:54 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Brad Hefta-Gaub
25f506f3dc Merge pull request #5860 from ctrlaltdavid/20686 
QA for 20686 - Clear entity list when you change domains
 2015-09-21 12:01:43 -07:00
Brad Hefta-Gaub
b88c8e507b fix a couple of properties 2015-09-21 11:35:26 -07:00
Ryan Huffman
8f061bcf2e Merge pull request #5861 from birarda/master 
fix for asset upload on Windows
 2015-09-21 11:02:22 -07:00
Stephen Birarda
5ebc8d6036 fix for file upload to ATP on Windows 2015-09-21 10:24:11 -07:00
David Rowe
52f6fe1d04 Clear entity list when you change domains 2015-09-21 09:59:00 -07:00
samcake
2875cb99bb Fixing the compilation issue 2015-09-21 09:47:00 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
3614812681 MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce 2015-09-20 23:31:59 -07:00
samcake
6914caac9d Renaming TextureStorage.x to TextureMap.x 2015-09-20 18:14:03 -07:00
samcake
d6d95ff86b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-20 14:33:23 -07:00
samcake
a41c20a1b7 Fixing buggy hash map look up and cleaning of name 2015-09-20 14:17:55 -07:00
Brad Hefta-Gaub
ba5109c458 Merge pull request #5858 from howard-stearns/see-other-default-avatars 
Let other users see your default avatar.
 2015-09-20 13:57:29 -07:00
Howard Stearns
4fadf986e4 Merge pull request #5857 from hyperlogic/tony/look-whos-talking 
Talking idle animation support
 2015-09-20 13:46:40 -07:00
Howard Stearns
4d2048c6f6 Let other users see your default avatar. 
Fixes https://app.asana.com/0/26225263936266/51001490412567
 2015-09-20 13:12:13 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d Fix compilation issues on mac 2015-09-19 08:59:47 -07:00
samcake
8941741508 Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap 2015-09-18 18:47:18 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
Brad Hefta-Gaub
213cc25c75 Merge pull request #5856 from sethalves/hand-controller-adjustment 
fix releaseGrab in test script
 2015-09-18 17:52:12 -07:00