Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 17:00:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22552 commits 74 branches 59 tags 1.2 GiB
Commit graph

22552 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
8d9685ee39 Fix Face Tracking menu operation 2015-02-21 11:01:07 -08:00
Virendra Singh
5949d01bbd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-21 15:45:42 +05:30
Virendra Singh
ce04b1accb vhacd tool 
this tool is as per joblist #20305. Its provides an executable to test
VHACD computation on simple fbx models.
 2015-02-21 15:40:39 +05:30
Virendra Singh
ddd137ed60 cmake changes for vhacd 
cmake changes to create a new project vhacd as a seperate executable in
tools directory
 2015-02-21 15:39:16 +05:30
Virendra Singh
b9befc208b Cmake module to find VHACD library 
FindVHACD will look for VHACD_ROOT_DIR env variable or
HIFI_LIB_DIR/vhacd folder
 2015-02-21 15:38:16 +05:30
Virendra Singh
36b323c6f3 Added VHACD dependency 
Provide link to github source. The source tree has necessary cmke
changes to allow 32 bit build specific to hifi
 2015-02-21 15:37:09 +05:30
ZappoMan
2e7a43a7fb more hacking 2015-02-20 18:47:47 -08:00
ZappoMan
e3de994c4a more hacking 2015-02-20 18:42:02 -08:00
Ryan Huffman
e6d9a1b251 Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale 
Conflicts:
	interface/src/ui/LoginDialog.cpp
 2015-02-20 18:09:55 -08:00
Andrew Meadows
d650a092c2 Merge pull request #4321 from ctrlaltdavid/faceshift-readme 
Update Faceshift readme.txt with Windows instructions
 2015-02-20 18:02:35 -08:00
Andrew Meadows
d5733f3782 Merge pull request #4318 from PhilipRosedale/master 
Billiard balls are now textured models
 2015-02-20 17:59:33 -08:00
ZappoMan
8c4474b2d0 more hacking 2015-02-20 17:55:04 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
ZappoMan
b219937902 switch known scripts iterator 2015-02-20 15:46:11 -08:00
Stephen Birarda
fd8e9bad20 fix casing in find modules for gverb and soxr 2015-02-20 15:36:59 -08:00
Stephen Birarda
dc9c4ea43c add options with default for get of external projects 2015-02-20 15:34:41 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Seth Alves
bbb6e048f5 Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare 2015-02-20 14:30:35 -08:00
Brad Hefta-Gaub
70400f7f8c Merge pull request #4323 from huffman/notifciation-local-only-audio 
Update notifications.js audio to be local-only
 2015-02-20 14:29:20 -08:00
Seth Alves
270d509a12 cleanups 2015-02-20 14:29:12 -08:00
Seth Alves
8cee88acb4 network chatter between Monitor and AssignmentClients is expected to be localhost only 2015-02-20 14:25:43 -08:00
Seth Alves
70c96e496f don't print ^a to qDebug for unassigned node type 2015-02-20 14:25:13 -08:00
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -08:00
Stephen Birarda
d6105e2e8c fix link to external project dependencies section 2015-02-20 14:20:44 -08:00
Stephen Birarda
175966cce8 clarify build guide for external projects 2015-02-20 14:19:08 -08:00
Stephen Birarda
b23dd28b56 don't use static version of GLEW 2015-02-20 14:01:01 -08:00
Stephen Birarda
c242b4e834 set GLEW debug version to NOTFOUND 2015-02-20 13:55:40 -08:00
Stephen Birarda
ef729201d6 fix external name for GLEW 2015-02-20 13:51:12 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Seth Alves
4bba4fc387 cleanups 2015-02-20 13:44:37 -08:00
Seth Alves
907be67135 cleanups 2015-02-20 13:34:51 -08:00
Seth Alves
bd3d7124e2 cleanups 2015-02-20 13:31:58 -08:00
Seth Alves
56d237ae8b cleanups 2015-02-20 13:28:24 -08:00
Seth Alves
feb0e7ac31 AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit 2015-02-20 13:26:59 -08:00
Stephen Birarda
32fa2e8d31 add missing docstring to AddPathsToLibPaths 2015-02-20 12:24:17 -08:00
Stephen Birarda
b7cc163ca4 lib paths is actually a string 2015-02-20 12:21:10 -08:00
Stephen Birarda
a85cb2eeaa don't log glm install so it is shown in log 2015-02-20 12:18:14 -08:00
Stephen Birarda
0bad8db1a0 fix missing dependencies to external projects 2015-02-20 12:17:58 -08:00
Stephen Birarda
abfebf51f5 handle install name change on OS X for TBB 2015-02-20 12:17:42 -08:00
Andrew Meadows
94b3c4a3a8 simpler less draconian workaround 2015-02-20 11:57:37 -08:00
David Rowe
3a95614ca4 Update Faceshift readme.txt with Windows instructions 2015-02-20 11:29:51 -08:00
Brad Hefta-Gaub
5d6d9bb1d4 Merge pull request #4320 from huffman/fix-camera-move-on-mirror 
Fix entity camera tool from taking over in mirror mode
 2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551 Merge pull request #4317 from birarda/master 
dynamically grab animation URL as model URL from model
 2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00
Ryan Huffman
5c3cae471b Fix avatar billboards all rendering as the same billboard 2015-02-20 09:48:04 -08:00
Andrew Meadows
c3dbae1bd3 remove warning about signed-unsigned comparison 2015-02-20 09:00:28 -08:00
Andrew Meadows
aa667464c0 merge upstream/master into andrew/thermonuclear 2015-02-20 08:26:51 -08:00
Andrew Meadows
599ef68df8 fix for scratchy audio on windows 2015-02-20 08:26:11 -08:00