Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 17:36:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20322 commits 74 branches 59 tags 1.2 GiB
Commit graph

20322 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
bef14a46ac remove commented out cruft 2014-12-29 10:41:19 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Sam Gateau
acad86edf5 clean cmake file for autoScribeShader 2014-12-25 22:41:14 -08:00
Sam Gateau
29726b1b70 removing shaders from resource 2014-12-25 20:05:00 -08:00
Sam Gateau
0adb51cd31 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-25 20:01:19 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
ZappoMan
02a1721185 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-24 10:25:41 -08:00
Sam Gateau
7ea9f92492 polishing the scribe -c++ case 2014-12-23 18:25:35 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Philip Rosedale
0ef26b1446 Merge pull request #4004 from Atlante45/modeluploader_scripting_interface 
Entity upload
 2014-12-23 16:58:52 -08:00
Philip Rosedale
16e168fbd9 Merge pull request #4003 from birarda/master 
remove the current address from the address bar
 2014-12-23 16:32:09 -08:00
dev
641768773b Merge branch 'temp0' of https://github.com/samcake/hifi into temp0 2014-12-23 16:27:40 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
03d8922d59 fix typo 2014-12-23 15:47:39 -08:00
Sam Gateau
3cfe066bcb Add the autoScribeShader cmake 2014-12-23 15:42:14 -08:00
Atlante45
2a54ef01ef Set texture limit back to 1024 2014-12-23 15:06:22 -08:00
Stephen Birarda
e45a996789 Merge pull request #3999 from samcake/temp0 
Adding Scribe in tools
 2014-12-23 15:03:14 -08:00
Sam Gateau
249e6d02f8 Fixing typo and syntax 2014-12-23 14:49:06 -08:00
Sam Gateau
4004831377 Fixing typo and syntax 2014-12-23 14:46:58 -08:00
Sam Gateau
522ca55ed8 Fixing typo and syntax 2014-12-23 14:41:49 -08:00
Sam Gateau
0578a54ea0 Fixing typo and syntax 2014-12-23 14:41:05 -08:00
Sam Gateau
4bdc0d718d Fixing typo and syntax 2014-12-23 14:29:26 -08:00
Sam Gateau
59387be856 Fixing typo and syntax 2014-12-23 14:20:12 -08:00
Sam Gateau
6f66b097f8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-23 14:07:28 -08:00
Atlante45
da636ca918 ModelUploader only has static methods accessible 2014-12-23 14:00:23 -08:00
Atlante45
f317b54017 Broke down ModelUploader::zip() 2014-12-23 13:48:13 -08:00
Stephen Birarda
0a66b23efa remove current address from address bar dialog 2014-12-23 13:33:19 -08:00
Atlante45
879c3e2fd0 Add entity model upload 2014-12-23 12:30:00 -08:00
Philip Rosedale
91cd0666d1 Merge pull request #4002 from ZappoMan/fountainCrash 
guards for NULL collisions, possible fix to fountain crash
 2014-12-23 12:24:27 -08:00
ZappoMan
72cced12a6 guards for NULL collisions, possible fix to fountain crash 2014-12-23 11:30:32 -08:00
Philip Rosedale
ff784c27aa Merge pull request #4001 from cozza13/20244 
CR for Job #20244 - Fix model upload on Editentities
 2014-12-23 11:10:40 -08:00
Chris Collins
e105ba61e8 Fix for model uploading to work 
Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
 2014-12-23 11:01:25 -08:00
Leonardo Murillo
369b5d2f80 Merge pull request #4000 from ZappoMan/backupBugFix 
fix runaway backup bug
 2014-12-23 12:37:20 -06:00
ZappoMan
17ed92cf7e fix runaway backup bug 2014-12-23 10:11:08 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
Atlante45
55370477db Remove Application dependency 2014-12-22 16:40:24 -08:00
Sam Gateau
e16da55b1b cleaning scribe main and checking naming 2014-12-22 16:02:58 -08:00
Sam Gateau
6b88eaceb5 FIx typos 2014-12-22 15:44:46 -08:00
Sam Gateau
435cabf75f Merge branch 'temp1' of https://github.com/samcake/hifi into temp0 2014-12-22 15:39:57 -08:00
Brad Hefta-Gaub
4eaf1d21aa Merge pull request #3998 from samcake/temp1 
Adding the model library
 2014-12-22 15:30:27 -08:00
Sam Gateau
bc83641300 add comments to Transform.h 2014-12-22 14:05:09 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Sam Gateau
4ee005affa adding scribe tool 2014-12-22 11:51:54 -08:00
Sam Gateau
1ae682ff21 fix end line typo 2014-12-22 11:36:18 -08:00
Sam Gateau
979d50f7d8 fixed pointers which were using 0 instead of NULL and syntax in resource.h 2014-12-22 11:20:04 -08:00
Sam Gateau
9ab6a680e9 fix typo in cmakelists 2014-12-22 11:03:08 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Brad Hefta-Gaub
fb15b0f2a7 Merge pull request #3992 from samcake/temp0 
Add the BufferView class in gpu::Resource
 2014-12-22 10:12:48 -08:00