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
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
Philip Rosedale
d74856e01b
add angularVelocity to controller
2015-02-24 11:21:04 -08:00
Seth Alves
5f9af610c2
coding convention
2015-02-24 10:41:58 -08:00
Andrew Meadows
3cd0a70641
store shapeType whenever it is explicitly changed
2015-02-23 14:35:44 -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
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
Andrew Meadows
27e6f99deb
use strings for shapeType for JS Entity properties
2015-02-20 16:54:58 -08:00
Seth Alves
70c96e496f
don't print ^a to qDebug for unassigned node type
2015-02-20 14:25:13 -08:00
Seth Alves
4bba4fc387
cleanups
2015-02-20 13:44:37 -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
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
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
Andrew Meadows
cf9d92abc0
fix EntityServer crash for zero view aspectRatio
2015-02-18 15:48:12 -08:00
Philip Rosedale
f6f54809d0
Merge pull request #4291 from Atlante45/reverb_smoothing
...
Reverb smoothing
2015-02-18 15:34:14 -08:00
David Rowe
d704af21ac
Generalize "faceshift" data handling to "facetracker"
...
DDE face tracking data is now broadcast to other avatars.
2015-02-18 12:41:54 -08:00
Clément Brisset
1af3a6ffa8
Merge pull request #4302 from AndrewMeadows/inertia
...
correct gain variance in linearFade()
2015-02-18 06:57:51 -08:00
Clément Brisset
3f117ce322
Merge pull request #4293 from AndrewMeadows/thermonuclear
...
fix crash in AudioScope for bad memory access
2015-02-18 06:03:03 -08:00
Seth Alves
ef2d386c75
attempt to load Courier if the requested font-family fails to load
2015-02-17 15:12:24 -08:00
Seth Alves
9fcb7591e6
don't crash if font load fails
2015-02-17 14:52:20 -08:00
Andrew Meadows
505c50ebe1
correct gain variance in linearFade()
2015-02-17 12:07:32 -08:00
Andrew Meadows
488492126e
fix typo in comment
2015-02-17 10:08:20 -08:00
Andrew Meadows
9895df6e7e
merge upstream/master into andrew/thermonuclear
2015-02-17 10:05:36 -08:00
Andrew Meadows
a7d6d6d561
return non-trivial value
2015-02-17 10:04:21 -08:00
Andrew Meadows
53855c89e9
Merge pull request #4289 from birarda/dependencies
...
add gverb and glm as cmake external projects
2015-02-17 10:00:29 -08:00
Andrew Meadows
d896f3a811
Merge pull request #4252 from thoys/20224
...
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
2015-02-17 09:03:17 -08:00
Andrew Meadows
b69ab6c80d
verify NodeList has a linkedData before using it
2015-02-16 12:56:12 -08:00
Andrew Meadows
ac93f86522
Merge pull request #4292 from birarda/master
...
add a NULL initializer for linked data create callback
2015-02-16 12:26:15 -08:00
Stephen Birarda
20b0dee80c
add a NULL initializer for the linked data create callback
2015-02-16 12:07:22 -08:00
Andrew Meadows
935b5ab5b3
Merge pull request #4290 from ZappoMan/backupFixes
...
fix a couple of bugs in backup settings
2015-02-16 09:56:20 -08:00
Clément Brisset
84bd1aeedf
Merge pull request #4283 from birarda/master
...
fix for ASI playSound called from same thread
2015-02-16 09:12:59 -08:00
Stephen Birarda
8acaa062a2
Merge pull request #4281 from Atlante45/fix_mute_environnement
...
Fix mute environnement
2015-02-16 09:11:47 -08:00
Atlante45
17ce2e820f
Cleanup addReverb() code
2015-02-16 17:30:20 +01:00
Atlante45
f279030283
Remove _gverbLocal
2015-02-16 16:15:03 +01:00
Atlante45
b59aaf8a0f
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
...
Conflicts:
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
2015-02-16 16:14:49 +01:00
ZappoMan
573d7971ac
fix a couple of bugs in backup settings
2015-02-13 20:23:12 -08:00
Brad Hefta-Gaub
9b6049489b
Merge pull request #4280 from AndrewMeadows/inertia
...
remove a couple crash modes on shutdown
2015-02-13 17:11:56 -08:00
Andrew Meadows
76b10a60ba
Merge pull request #4285 from ZappoMan/editLogging
...
added logging of edit commands in the server
2015-02-13 17:02:05 -08:00
Andrew Meadows
45208d468e
Merge pull request #4282 from ZappoMan/bugfix
...
some backup logging improvements & a bug fix
2015-02-13 16:54:25 -08:00
Andrew Meadows
9122364c3b
merge upstream/master into andrew/inertia
2015-02-13 16:20:09 -08:00
Andrew Meadows
cfbf8fdca7
explicit cleanup of loaded model animations
...
in Application dtor
2015-02-13 16:19:10 -08:00
Stephen Birarda
4300836810
make gverb a cmake external project
2015-02-13 15:47:35 -08:00
ZappoMan
1fc0225939
change ScriptCache and SoundCache to derive from Dependency
2015-02-13 15:33:41 -08:00
