Commit graph

22463 commits

Author SHA1 Message Date
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
Philip Rosedale
66d1eeb327 Add textured models as balls 2015-02-19 21:11:51 -08:00
Seth Alves
fd357c915c Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare 2015-02-19 17:49:48 -08:00
Seth Alves
4b3183d820 AssignmentClients accept an id on the command-line.
AssignmentClientMonitor now has a NodeList.  It stores its local port
in shared memory, like the DomainServer does.  As it spawns children,
it addes Nodes to the NodeList for each one.  The children send status
updates to the Monitor.  The Monitor will notice if there are no
spares and fork another child.
2015-02-19 17:44:06 -08:00
Stephen Birarda
12f03c5606 set install name dir for bullet on OS X 2015-02-19 17:39:30 -08:00
Stephen Birarda
b7c03c34a8 use path and filepath where appropriate for cache 2015-02-19 16:39:05 -08:00
Stephen Birarda
51156995b2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-19 15:40:11 -08:00
Stephen Birarda
dab524fb0f remove zlib modules and mentions in build guides 2015-02-19 15:35:40 -08:00
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Stephen Birarda
63d4538b76 fix ZLIB dll find, bullet check 2015-02-19 15:22:37 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Stephen Birarda
799cee32aa remove freeglut from build guides, no longer needed 2015-02-19 14:43:34 -08:00
Stephen Birarda
afae7297e7 adjustements to build guides to remove bullet 2015-02-19 14:41:23 -08:00
Stephen Birarda
a3d370f01f more path shortening for build of external projects 2015-02-19 14:33:31 -08:00
Stephen Birarda
a0a4882ed6 shorten externals binary dir path 2015-02-19 14:18:05 -08:00
Ryan Huffman
4dfe725721 Update preferences dialog to use layouts throughout 2015-02-19 14:02:15 -08:00
Stephen Birarda
d47a114f23 actually remove BUILD_SHARED_LIBS from combo command 2015-02-19 13:57:31 -08:00
Stephen Birarda
01c92ba94d don't attempt to build shared bullet libs on windows 2015-02-19 13:53:48 -08:00
Stephen Birarda
721be462f5 attempt to handle windows in bullet external project 2015-02-19 13:40:17 -08:00
Stephen Birarda
cbc6ae98d8 groundwork for windows support in bullet external project 2015-02-19 13:22:33 -08:00
Stephen Birarda
d185c775a4 fix install step for OS X bullet 2015-02-19 13:17:39 -08:00
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
2cdb8edbbf fix casing for libBulletSoftBody 2015-02-19 12:44:49 -08:00
Stephen Birarda
71b273ceec fix order for found result in bullet find module 2015-02-19 12:42:28 -08:00
Stephen Birarda
03809131a4 log install to be able to confirm installed files 2015-02-19 12:39:48 -08:00
Stephen Birarda
d563c80ca0 handle bullet external project on unix/android 2015-02-19 12:12:41 -08:00
Philip Rosedale
f3b37bba54 Merge branch 'master' of https://github.com/worklist/hifi 2015-02-19 12:04:43 -08:00
Stephen Birarda
70a89680f5 fix bullet include to match previous format 2015-02-19 12:04:41 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Ryan Huffman
4a8e3193a9 Add more comments to UIUtil::scaleWidgetFontSizes 2015-02-19 12:01:27 -08:00
Grayson Stebbins
fd3bbb6553 Merge pull request #4316 from nbq/removeat
Fix TP text in welcome page
2015-02-19 11:58:22 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05:00
Jason Hawks
e66e098cd2 Merge branch 'master' of github.com:nbq/hifi 2015-02-19 14:38:50 -05:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
2015-02-19 10:27:27 -08:00
Andrew Meadows
21405135f9 Merge pull request #4310 from talentraspel/20323
CR for Job #20323 - BUG: another crash on exit in interface
2015-02-19 09:52:23 -08:00
Stephen Birarda
27c6f80a61 use md5 hash to verify downloaded externals 2015-02-19 09:33:22 -08:00
Clément Brisset
ac3b172dee Merge pull request #4312 from ctrlaltdavid/update-svg-url
Update SVG URL to Amazon S3
2015-02-19 04:36:16 -08:00
Andrew Meadows
e207dad009 Merge pull request #4314 from AndrewMeadows/inertia
fix EntityServer crash for zero view aspectRatio
2015-02-18 18:09:05 -08:00
Stephen Birarda
6231a9d8da remove TBB from build guides 2015-02-18 17:29:32 -08:00