Commit graph

22164 commits

Author SHA1 Message Date
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
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
24468a7936 Merge pull request #4315 from birarda/master
use http link for gverb in case no git available
2015-02-18 16:18:04 -08:00
Stephen Birarda
5a3ef34d1e use http link for gverb in case no git available 2015-02-18 16:14:51 -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
a947cda0b2 Update SVG URL to Amazon S3 2015-02-18 13:02:37 -08:00
Clément Brisset
906f7ecced Merge pull request #4306 from birarda/master
make sure the Agent has a SoundCache available
2015-02-18 10:05:22 -08:00
Stephen Birarda
758a552267 make sure the Agent has a SoundCache available 2015-02-18 09:59:33 -08:00
Clément Brisset
87f4ae2425 Merge pull request #4304 from thoys/20245
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
2015-02-18 09:55:34 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43 Merge pull request #4305 from ctrlaltdavid/20308
CR for Job #20308 - Refine progress.js
2015-02-18 08:10:57 -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
6e5c3593b6 Merge pull request #4298 from talentraspel/20339
removed id "g3322" in start-script.svg because it is no longer used and ...
2015-02-18 06:13:35 -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
Andrew Meadows
1c8f1bbcdd Merge pull request #4299 from talentraspel/20338
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
2015-02-17 17:47:47 -08:00
Andrew Meadows
d7664718ee Merge pull request #4303 from sethalves/font-load-failed
Font load failed
2015-02-17 17:31:26 -08:00
Andrew Meadows
80c973c285 Merge pull request #4301 from sethalves/fixes-for-vrchat
fix uninitialized geometry cache id in Line3DOverlay
2015-02-17 17:28:55 -08:00
Grayson Stebbins
f7cc7ad7e7 Added note about running inside visual studio 2015-02-17 17:14:47 -08:00
Seth Alves
8c7e147b82 include debug symbols 2015-02-17 15:16: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
Thijs Wenker
96b3114a36 style 2015-02-17 23:37:37 +01:00
Thijs Wenker
4d12a6d81c Merge branch 'master' of https://github.com/worklist/hifi into 20245
Conflicts:
	examples/notifications.js
2015-02-17 23:30:58 +01:00
Andrew Meadows
505c50ebe1 correct gain variance in linearFade() 2015-02-17 12:07:32 -08:00
Seth Alves
dd64eeb282 fix uninitialized geometry cache id in Line3DOverlay 2015-02-17 11:47:29 -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
Kai Ludwig
4048627de7 2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:50:20 +01:00
Stephen Birarda
d299f015d1 use binary dir for externals as well 2015-02-17 09:46:39 -08:00
Kai Ludwig
fa1bcc43e6 removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script. 2015-02-17 18:40:20 +01:00
Kai Ludwig
0de598586c removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open. 2015-02-17 18:37:23 +01:00
Andrew Meadows
5cd1950bed Merge pull request #4297 from huffman/fix-mouse-look-clash
Fix mouse look clash
2015-02-17 09:33:50 -08:00
Andrew Meadows
bc664435e7 Merge pull request #4296 from thoys/20318
CR for Job #20318 - BUG: Login menu item not popping up
2015-02-17 09:28:53 -08:00
Andrew Meadows
dba206337b Merge pull request #4294 from thoys/20348
CR for Job #20348 - Change audio meter background back to white
2015-02-17 09:24:05 -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
Ryan Huffman
97e70920ce Move handling of add model buttons to mouseRelease 2015-02-17 08:23:39 -08:00
Ryan Huffman
d1f7a730ad Make add-model button non-selectable 2015-02-17 08:23:11 -08:00
Thijs Wenker
4a3550ce0e toggleQAction(); in constructor to make the right initial button connection 2015-02-17 02:27:07 +01:00
Thijs Wenker
42e4eee15e audio meter background "back in black" / "paint it black" 2015-02-16 23:14:27 +01: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
Andrew Meadows
57797329d1 do sample size arithmetic before scaling by sizeof 2015-02-16 12:14:03 -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
Stephen Birarda
feaad37751 add a GET_PROJ_NAME var to skip external projects 2015-02-16 09:38:53 -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