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

10219 commits

Author SHA1 Message Date
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
Philip Rosedale
0ef26b1446 Merge pull request #4004 from Atlante45/modeluploader_scripting_interface 
Entity upload
 2014-12-23 16:58:52 -08:00
Atlante45
2a54ef01ef Set texture limit back to 1024 2014-12-23 15:06:22 -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
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
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -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
Ryan Huffman
25a78534aa Fix quad vertices for ImageOverlay and TextOverlay 2014-12-19 15:52:31 -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
7e37aaabde windows build hack 2014-12-19 14:24:04 -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
ZappoMan
1db1914a2e replace gluProject() with just the math 2014-12-19 13:46:33 -08:00
Stephen Birarda
08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 12:50:32 -08:00
Clément Brisset
dbfbe35a49 Merge pull request #3986 from birarda/domain-connect 
fix domain connection with port, show current address in address bar
 2014-12-19 12:49:51 -08:00
ZappoMan
046564ec47 oops double 2014-12-19 12:35:47 -08:00
ZappoMan
d585f8c707 replace gluOrtho2D() with glOrtho() 2014-12-19 12:10:40 -08:00
Ryan Huffman
e4ce7d11dc Fix default scripts url to use s3.amazonaws.com 2014-12-19 11:32:52 -08:00
Stephen Birarda
115dc28c9c add glu includes on OS X to stopgap GLUT removal 2014-12-19 10:54:00 -08:00
Stephen Birarda
715b3a245e remove GLUT from Cmake files 2014-12-19 10:53:36 -08:00
Stephen Birarda
bc363dbf3b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 10:32:41 -08:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
Stephen Birarda
504cd86fef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 09:13:06 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Stephen Birarda
0b1445f8b5 show the address dialog with current address selected 2014-12-18 16:41:37 -08:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
ZappoMan
6f6cf3b08d Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 2014-12-18 14:52:00 -08:00
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Stephen Birarda
adf51bfeb8 temp disable visage to get to C++11 support 2014-12-17 16:41:28 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
a465aa20ff more Application and Menu dependency removal 2014-12-17 11:41:42 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -08:00
ZappoMan
74a8f0059d some Application dependecy cleanup 2014-12-16 15:43:24 -08:00