Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:02:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8438 commits 76 branches 59 tags 1.2 GiB
Commit graph

193 commits

Author SHA1 Message Date
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
0df826bbd8 fix cmake warning 2014-01-15 10:23:51 -08:00
Brad Hefta-Gaub
35016c7d69 make faceshift compile sources on windows to address linker error 2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
73aae6ef02 adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:11 -08:00
Brad Hefta-Gaub
54fa3ba17c link to faceshift for windows 2014-01-13 16:14:02 -08:00
Brad Hefta-Gaub
e60446a632 more windows build work 2014-01-13 15:57:31 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Brad Hefta-Gaub
8e8e6fcb30 added latest version of freeglut for windows 2014-01-13 14:46:03 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Leonardo Murillo
0e25c85eef Trivial change - testing deploy changes 2014-01-13 11:46:27 -06:00
Brad Hefta-Gaub
d92d043e8f more windows build fixes 2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub
2017f850c4 more windows float warning and error fixes 2014-01-12 22:07:37 -08:00
Brad Hefta-Gaub
680f611968 add define to make sure constants like M_PI are included on windows 2014-01-11 22:47:45 -08:00
Brad Hefta-Gaub
6e363e4aae err fix mac build 2014-01-11 21:55:08 -08:00
Brad Hefta-Gaub
a34d4acb71 more windows build, first cut at getting opengl working, more disabling VPX 2014-01-11 21:39:45 -08:00
Brad Hefta-Gaub
cded9a1558 attempt to make LIBVPX optional since we don't yet have it on windows 2014-01-11 11:47:17 -08:00
Brad Hefta-Gaub
91da3264eb remove more -isystem from windows build 2014-01-11 11:26:04 -08:00
Stephen Birarda
133ba3a230 remove Leap integration from CMakeLists 2014-01-06 11:13:19 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Andrzej Kapolka
6385a73379 Working on scripty bits. 2013-12-16 17:53:53 -08:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
Leonardo Murillo
7b9147fb6c Tidy up 2013-12-16 11:05:08 -06:00
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Andrzej Kapolka
652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
 2013-12-12 15:36:37 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Andrzej Kapolka
e97099a9b2 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-05 17:53:21 -08:00
Stephen Birarda
146d5294a0 more PortAudio cleanup in cmake 2013-12-05 16:51:04 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Andrzej Kapolka
91aa9918ee Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-02 12:54:01 -08:00
Andrzej Kapolka
4033baa5ca Starting work on "metavoxels." 2013-12-02 12:15:43 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
Stephen Birarda
1ddc52252a fix missing link to starfield implementation files 2013-10-18 09:01:44 -07:00
Stephen Birarda
1367396344 fix broken InfoView after removing fervor 2013-09-30 10:39:33 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
Stephen Birarda
b5b43f86d1 begin to remove fervor + quazip 2013-09-26 17:39:33 -07:00
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
Andrzej Kapolka
70a21fc9ad Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-05 10:20:56 -07:00
Stephen Birarda
9ede6b75c6 force the OS X bundle name to be capitalized 2013-09-04 17:09:43 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
6f08df9e83 Link in Faceshift. 2013-09-03 10:03:15 -07:00
Andrzej Kapolka
28431b4c57 Testing transformation with video from FreeTrack project. 2013-08-28 15:02:33 -07:00
Stephen Birarda
ed48f8d982 add a DISABLE_OPENNI option for release builds without OpenNI 2013-08-16 14:28:22 -07:00