Commit graph

22198 commits

Author SHA1 Message Date
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
ZappoMan
7e2d355b56 first cut at properly shutting down timers while shutting down scripts 2015-02-23 11:40:30 -08:00
ZappoMan
1efa7b28b0 removed dead code 2015-02-23 10:04:14 -08:00
ZappoMan
85cec79ff5 removing debug messages 2015-02-23 09:44:22 -08:00
ZappoMan
a8d48e592f removing debug messages 2015-02-23 09:44:18 -08:00
ZappoMan
e5ef61e27e simplifying the change 2015-02-23 09:23:15 -08:00
ZappoMan
d32fc645e8 remove some dead code, added a debugging notes comment 2015-02-23 09:10:15 -08:00
ZappoMan
2e7a43a7fb more hacking 2015-02-20 18:47:47 -08:00
ZappoMan
e3de994c4a more hacking 2015-02-20 18:42:02 -08:00
ZappoMan
8c4474b2d0 more hacking 2015-02-20 17:55:04 -08:00
ZappoMan
b219937902 switch known scripts iterator 2015-02-20 15:46:11 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -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
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -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
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -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