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 |
|
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 |
|
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
|
eaad95c949
|
Merge pull request #3985 from Adrianl3d/20221
changes as per list
|
2014-12-19 11:36: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 |
|
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 |
|
Adrianl3d
|
51121554e5
|
clean up code
intentations lines 263 264
|
2014-12-20 04:28:39 +10: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 |
|
Stephen Birarda
|
365cd27c06
|
Merge pull request #3983 from ZappoMan/librarization
Remove glut from the code base.
|
2014-12-19 09:12:53 -08:00 |
|
Stephen Birarda
|
114e3bb2ff
|
rename cmake macro to represent actual purpose
|
2014-12-18 16:51:20 -08:00 |
|
Stephen Birarda
|
2df9512dde
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-18 16:49:01 -08:00 |
|
Stephen Birarda
|
fa84100698
|
Merge pull request #3984 from Atlante45/master
Replace Game Of Life with intructions
|
2014-12-18 16:48:29 -08:00 |
|
Stephen Birarda
|
0b1445f8b5
|
show the address dialog with current address selected
|
2014-12-18 16:41:37 -08:00 |
|
Stephen Birarda
|
3a4f75ff62
|
fix AddressManager domain lookup to handle port
|
2014-12-18 16:40:02 -08:00 |
|
Atlante45
|
e6123ec4a7
|
Typo
|
2014-12-18 16:31:19 -08:00 |
|
Atlante45
|
47d8b0b062
|
Replace Game Of Life with intructions
|
2014-12-18 16:24:26 -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 |
|
Stephen Birarda
|
087ac1db90
|
send port along with domain hostname lookup
|
2014-12-18 16:03:13 -08:00 |
|
ZappoMan
|
26bcca95c9
|
remove glutWireCube()
|
2014-12-18 15:42:02 -08:00 |
|
Brad Hefta-Gaub
|
2a13d8662f
|
Merge pull request #3980 from AndrewMeadows/thermonuclear
more correct creation and edit times for entities
|
2014-12-18 15:27:15 -08:00 |
|
Stephen Birarda
|
4443470992
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-18 15:07:32 -08:00 |
|
Stephen Birarda
|
f474cfc9d0
|
link to render-utils from entities renderer
|
2014-12-18 15:06:44 -08:00 |
|
Andrew Meadows
|
6df91b92a8
|
merge upstream/master into andrew/thermonuclear
|
2014-12-18 15:00:15 -08:00 |
|
Stephen Birarda
|
d87e06a9d3
|
add missing metavoxels link to script-engine
|
2014-12-18 14:54:10 -08:00 |
|
Stephen Birarda
|
4bd3a94794
|
add missing avatars link to entities
|
2014-12-18 14:53:52 -08:00 |
|
Stephen Birarda
|
e8adc19ac6
|
fix more missing dependencies in render-utils
|
2014-12-18 14:52:36 -08:00 |
|
Stephen Birarda
|
4f4ffc42d3
|
add missing link to fbx from avatars
|
2014-12-18 14:52:16 -08:00 |
|
ZappoMan
|
6f6cf3b08d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
|
2014-12-18 14:52:00 -08:00 |
|
Clément Brisset
|
45881da555
|
Merge pull request #3967 from birarda/cuckoo
C++11 support, replace NodeList hash with tbb concurrent_unordered_map
|
2014-12-18 14:42:15 -08:00 |
|
Stephen Birarda
|
1b5552de1a
|
fix GLUT library link in render-utils
|
2014-12-18 14:42:08 -08:00 |
|
Stephen Birarda
|
ecb17a61d6
|
fix missing render-utils dependencies
|
2014-12-18 14:39:35 -08:00 |
|
Stephen Birarda
|
6a604ca340
|
fix missing script dependency from shared
|
2014-12-18 14:36:31 -08:00 |
|