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

20026 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Brad Hefta-Gaub
483155f246 Merge pull request #3989 from birarda/master 
fix luckily linked dependencies in prep for shared hifi libraries
 2014-12-21 11:34:43 -08:00
Brad Hefta-Gaub
6bcc4ec896 Merge pull request #3996 from huffman/fix-overlay-vertices 
Fix quad vertices for ImageOverlay and TextOverlay
 2014-12-20 05:40:54 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Brad Hefta-Gaub
07102c6a29 Merge pull request #3991 from huffman/fix-defaults-url 
Fix default scripts url to use s3.amazonaws.com
 2014-12-19 16:06:59 -08:00
Andrew Meadows
3e087bd75e Merge pull request #3990 from ZappoMan/entityScriptsAndEvents 
Entity Scripts bug fixes/improvements
 2014-12-19 16:02:00 -08:00
Ryan Huffman
25a78534aa Fix quad vertices for ImageOverlay and TextOverlay 2014-12-19 15:52:31 -08:00
Stephen Birarda
2780415b1d put glew link back into gpu 2014-12-19 15:07:31 -08:00
Stephen Birarda
d7d11955f3 Revert "add a test to confirm link fail" 
This reverts commit 691be3bf7c.
 2014-12-19 15:05:13 -08:00
Stephen Birarda
691be3bf7c add a test to confirm link fail 2014-12-19 14:59:55 -08:00
Stephen Birarda
9bd0bc671b resolve conflicts on merge with upstream master 2014-12-19 14:48:18 -08:00
Stephen Birarda
bd69a3aae3 Merge pull request #3993 from ZappoMan/gluRemoval 
more glu/glut removal
 2014-12-19 14:44:29 -08:00
ZappoMan
b7165abd5b possible glew warning fix for windows 2014-12-19 14:33:45 -08:00
Stephen Birarda
309ab6e2fd Merge pull request #3994 from huffman/add-notification-to-defaults 
Add notifications.js to defaultScripts
 2014-12-19 14:29:59 -08:00
ZappoMan
7e37aaabde windows build hack 2014-12-19 14:24:04 -08:00
Ryan Huffman
30e2a9c13f Add notifications.js to defaultScripts 2014-12-19 14:18:44 -08:00
Stephen Birarda
4f478e158f remove includes for glu for APPLE 2014-12-19 13:59:43 -08:00
ZappoMan
2e3a522e73 remove glut.h from CmakeLists.txt and fix a compiler issue with Hair.cpp 2014-12-19 13:53:44 -08:00