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
|
692eb43dcb
|
including the lightmap in the deferred shadow map dfull screen quad pass, take1
|
2014-12-19 17:50:39 -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 |
|
Ryan Huffman
|
468c564566
|
Replace glutSolidCube with GeometryCache::renderSolidCube
|
2014-12-19 15:29:00 -08:00 |
|
Ryan Huffman
|
7249a7e299
|
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
|
2014-12-19 15:27:33 -08:00 |
|
Ryan Huffman
|
588d7e62f4
|
Update camera-controls.svg url
|
2014-12-19 15:18:26 -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 |
|
ZappoMan
|
22e2fcf746
|
add some vec2 debugging
|
2014-12-19 13:46:42 -08:00 |
|
ZappoMan
|
1db1914a2e
|
replace gluProject() with just the math
|
2014-12-19 13:46:33 -08:00 |
|
Sam Gateau
|
a7b039fbb9
|
Disabling glDebug
|
2014-12-19 13:28:19 -08:00 |
|
Sam Gateau
|
1ba8b89439
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-12-19 13:11:18 -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 |
|
Sam Gateau
|
096b09e8e1
|
Importing fixes from Model branch to the gpu library
|
2014-12-19 12:44:46 -08:00 |
|
ZappoMan
|
046564ec47
|
oops double
|
2014-12-19 12:35:47 -08:00 |
|
Stephen Birarda
|
66b1886b44
|
don't add the unused assignment type to DS queue
|
2014-12-19 12:33:26 -08:00 |
|
Stephen Birarda
|
979f5f8fc5
|
fix for coding standard compliance
|
2014-12-19 12:19:49 -08:00 |
|
ZappoMan
|
d585f8c707
|
replace gluOrtho2D() with glOrtho()
|
2014-12-19 12:10:40 -08:00 |
|
Ryan Huffman
|
f3a600da7e
|
Remove glut call
|
2014-12-19 12:01:18 -08:00 |
|
Ryan Huffman
|
eaad95c949
|
Merge pull request #3985 from Adrianl3d/20221
changes as per list
|
2014-12-19 11:36:52 -08:00 |
|
ZappoMan
|
32ea38b938
|
added leaveAllEntities support
|
2014-12-19 11:33:25 -08:00 |
|
Ryan Huffman
|
e4ce7d11dc
|
Fix default scripts url to use s3.amazonaws.com
|
2014-12-19 11:32:52 -08:00 |
|
Clément Brisset
|
a089420adf
|
Merge pull request #3988 from ZappoMan/addComments
added comments to explain hand state
|
2014-12-19 11:12:34 -08:00 |
|
ZappoMan
|
97d617bd17
|
revert some prototype script stuff for now
|
2014-12-19 11:01:35 -08:00 |
|
ZappoMan
|
d43ec2ee28
|
revert some prototype script stuff for now
|
2014-12-19 11:00:41 -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 |
|
Ryan Huffman
|
2e96bbe38b
|
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
|
2014-12-19 10:37:47 -08:00 |
|
Ryan Huffman
|
15389b5fce
|
Add camera UI to camera tool
|
2014-12-19 10:37:21 -08:00 |
|
ZappoMan
|
cfa5e5c61b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
|
2014-12-19 10:35:18 -08:00 |
|
Stephen Birarda
|
bc363dbf3b
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-19 10:32:41 -08:00 |
|
Adrianl3d
|
51121554e5
|
clean up code
intentations lines 263 264
|
2014-12-20 04:28:39 +10:00 |
|
Andrew Meadows
|
a141ce37e4
|
merge upstream/master into andrew/inertia
|
2014-12-19 10:25:03 -08:00 |
|
ZappoMan
|
dd06d1f4a9
|
added comments to explain hand state
|
2014-12-19 10:01:14 -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 |
|