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 |
|
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 |
|
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 |
|
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 |
|
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 |
|