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
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
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
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
Kai Ludwig
d659ac573a
now all application timers should get stopped correctly on exit
2015-02-18 19:53:45 +01: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
Triplelexx
1bcb3f7c75
Merge remote-tracking branch 'upstream/master' into 20315
2015-02-17 20:45:44 +00:00
Triplelexx
ffc6a6883e
Add images to welcome page
...
Replaced SVG placeholder items with images in interface-welcome.html.
2015-02-17 20:45:01 +00: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
