Commit graph

32 commits

Author SHA1 Message Date
Zander Otavka
055133b82e Refactor inheritance for billboard overlays.
BillboardOverlays is now Image3DOverlay.  Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
2015-08-04 14:22:21 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416
Conflicts:
	examples/notifications.js
2015-03-27 12:13:29 -07:00
ZappoMan
0e44126106 added LOD Warnings to notifications.js 2015-03-24 16:38:13 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
Stephen Birarda
03de43d451 simplify notifications.js after chat removal 2015-03-03 10:22:57 -08:00
Thijs Wenker
793116b90c ability to mute all notifications or just certain types 2015-02-23 21:00:26 +01:00
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -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
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
David Rowe
7d1cc1f20d Make 3D "x" button work 2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6 Position and angle 3D notifications in lower part of view 2015-01-21 21:34:34 -08:00
David Rowe
00de7062cc Longer persist time for 3D notifications 2015-01-21 18:03:00 -08:00
David Rowe
f3147ab3e4 Move 3D notifications up as old ones are deleted 2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f Update 3D notification positions as avatar moves 2015-01-21 17:08:31 -08:00
David Rowe
be6c6ed8ca Add 3D notifications on a simple vertical plane 2015-01-21 16:10:33 -08:00
Thijs Wenker
9c2f6c78a8 Merge branch '20224' of github.com:thoys/hifi into 20245
Conflicts:
	examples/notifications.js
2015-01-21 17:26:22 +01:00
David Rowe
42b9ee8e77 Lint: Preferred control constructs 2015-01-21 08:14:45 -08:00
David Rowe
adba46f90c Lint: Preferred operators 2015-01-21 08:14:44 -08:00
David Rowe
63310fac50 Lint: Syntax 2015-01-21 08:14:44 -08:00
David Rowe
ce0c91628a Lint: Declaration order 2015-01-21 08:14:43 -08:00
David Rowe
c4b024e510 Lint: Variable declarations 2015-01-21 08:14:42 -08:00
David Rowe
e35c6be45e Lint: White space 2015-01-21 08:14:41 -08:00
David Rowe
b2cadbe36a Stop notifications of all users at startup 2015-01-16 15:24:26 -08:00
Thijs Wenker
7b88deef16 Implement UI sounds for virtualKeyboard & notifications 2015-01-13 22:08:35 +01:00
Adrianl3d
51121554e5 clean up code
intentations lines 263 264
2014-12-20 04:28:39 +10:00
Adrianl3d
af1591277c changes as per list
removed dummy code, remove mic mute state at startup, some text changes.
2014-12-19 04:17:36 +10:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -08:00
Adrianl3d
ffe66cd5c5 Clean up code
Fix code to standards
2014-11-25 04:23:00 +10:00
Adrianl3d
2edd252576 Fix persist time
Set persist time to 10 secs
2014-11-22 21:47:14 +10:00
Adrianl3d
6a66351e7f Clean up code
Fix indentations, whitespace, and layout
2014-11-22 10:39:34 +10:00
Adrianl3d
f1543a9d36 Added notifications.js
Creates overlay notifications from events and key strokes. improved
fading.
2014-11-19 04:36:57 +10:00