Kodey
|
a0a1564720
|
Merge branch '20305' of https://github.com/virneo/hifi into 20305
|
2015-02-25 08:45:29 +05:30 |
|
Kodey
|
a5aeb3b980
|
cmake changes for building on linux
|
2015-02-25 08:45:00 +05:30 |
|
Virendra Singh
|
9a153a6506
|
Time measurement
Used c++11 chrono class to measure elapsed time.
|
2015-02-25 08:36:58 +05:30 |
|
Virendra Singh
|
c15c549881
|
Code formatting
|
2015-02-25 07:47:00 +05:30 |
|
Kodey
|
7a182d0a98
|
update
Merge branch 'master' of git://github.com/highfidelity/hifi into 20305
|
2015-02-25 07:00:55 +05:30 |
|
Leonardo Murillo
|
3230857b0d
|
Merge pull request #4332 from birarda/master
revert the spare assignment-client work for now
|
2015-02-24 12:32:34 -08:00 |
|
Stephen Birarda
|
09ffcbb2e8
|
Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare"
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
|
2015-02-24 12:30:40 -08:00 |
|
Stephen Birarda
|
5750d4bad0
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-24 12:27:21 -08:00 |
|
Andrew Meadows
|
1b669af79d
|
Merge pull request #4307 from Atlante45/fix_warnings
Fix warnings
|
2015-02-24 12:19:32 -08:00 |
|
Andrew Meadows
|
efcac708b6
|
Merge pull request #4331 from PhilipRosedale/master
Toyball is a textured baseball, added ability to get controller angular velocity
|
2015-02-24 12:19:20 -08:00 |
|
Philip Rosedale
|
573390b429
|
fix dice for collision shapes, add angular velocity
|
2015-02-24 11:55:41 -08:00 |
|
Philip Rosedale
|
9d021a1a1e
|
remove unused line
|
2015-02-24 11:49:12 -08:00 |
|
Philip Rosedale
|
7489b468f3
|
give angular velocity to the thrown ball
|
2015-02-24 11:48:35 -08:00 |
|
Stephen Birarda
|
087e2babde
|
Merge pull request #4324 from sethalves/assignment-client-keep-a-spare
Assignment client keep a spare
|
2015-02-24 11:40:43 -08:00 |
|
samcake
|
5202d2136a
|
Merge pull request #4319 from huffman/avatar-billboards
Fix avatar billboards all rendering as the same billboard
|
2015-02-24 11:22:38 -08:00 |
|
Philip Rosedale
|
d74856e01b
|
add angularVelocity to controller
|
2015-02-24 11:21:04 -08:00 |
|
Seth Alves
|
88920ad3aa
|
Merge branch 'assignment-client-keep-a-spare' of github.com:sethalves/hifi into assignment-client-keep-a-spare
|
2015-02-24 10:42:22 -08:00 |
|
Seth Alves
|
5f9af610c2
|
coding convention
|
2015-02-24 10:41:58 -08:00 |
|
Seth Alves
|
f5a7a19bc3
|
coding convention
|
2015-02-24 10:41:20 -08:00 |
|
Brad Hefta-Gaub
|
af99a5d07b
|
Merge pull request #4325 from AndrewMeadows/bispinor
use strings for shapeType in JS Entity properties
|
2015-02-23 15:11:57 -08:00 |
|
Andrew Meadows
|
3cd0a70641
|
store shapeType whenever it is explicitly changed
|
2015-02-23 14:35:44 -08:00 |
|
Andrew Meadows
|
f2fc781523
|
change shapeType to use strings in billiards.js
|
2015-02-23 11:42:36 -08:00 |
|
Andrew Meadows
|
456acd8833
|
merge upstream/master into andrew/bispinor
|
2015-02-23 11:41:40 -08:00 |
|
Andrew Meadows
|
2e1c122915
|
moved ShapeType boilerplate stuff macos
|
2015-02-23 11:38:56 -08:00 |
|
Seth Alves
|
0b9b7f06cc
|
address various comments from code review
|
2015-02-23 11:12:19 -08:00 |
|
Andrew Meadows
|
0fc4c732f7
|
use macro for copying shapeType string to script
|
2015-02-23 10:13:47 -08:00 |
|
Andrew Meadows
|
0455ccf7be
|
Merge pull request #4313 from ctrlaltdavid/20355
CR for 20355 - Initial Integration with DDE
|
2015-02-23 09:47:19 -08:00 |
|
Andrew Meadows
|
2519f66037
|
Merge pull request #4311 from huffman/application-dpi-scale
Application dpi scale
|
2015-02-23 09:43:12 -08:00 |
|
Seth Alves
|
e0263d8843
|
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare
|
2015-02-23 09:06:43 -08:00 |
|
Clément Brisset
|
c6b1375863
|
Merge pull request #4322 from AndrewMeadows/thermonuclear
workaround for scratchy audio on Windows
|
2015-02-23 07:18:30 -08:00 |
|
Virendra Singh
|
8212f86bfb
|
Minor grammar corrections
Corrected line breaks.
|
2015-02-23 12:19:45 +05:30 |
|
David Rowe
|
f169ab1238
|
Tidy and document DDE face tracker UDP socket opening and closing
|
2015-02-21 11:26:48 -08:00 |
|
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 |
|
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 |
|
Andrew Meadows
|
27e6f99deb
|
use strings for shapeType for JS Entity properties
|
2015-02-20 16:54:58 -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 |
|
Seth Alves
|
4bba4fc387
|
cleanups
|
2015-02-20 13:44:37 -08:00 |
|
Seth Alves
|
907be67135
|
cleanups
|
2015-02-20 13:34:51 -08:00 |
|