Context Navigation

← Previous Change
Next Change →

data

Timestamp:

May 28, 2011, 4:21:14 PM (14 years ago)

Author:

dafrick

Message:

Making NotificationQueue XML-loadable. Adding notifications to all levels.

Location:

code/branches/tutoriallevel3/data

Files:

: 1 added
: 37 edited

gui/scripts/NotificationLayer.lua (modified) (2 diffs)
levels/FPSTest.oxw (modified) (1 diff)
levels/asteroids.oxw (modified) (1 diff)
levels/dynamicMatch.oxw (modified) (1 diff)
levels/earth.oxw (modified) (1 diff)
levels/emptyLevel.oxw (modified) (1 diff)
levels/events.oxw (modified) (1 diff)
levels/fightInOurBack.oxw (modified) (1 diff)
levels/includes/notifications.oxi (added)
levels/lastManStanding.oxw (modified) (1 diff)
levels/lastTeamStanding.oxw (modified) (1 diff)
levels/lastTeamStandingII.oxw (modified) (1 diff)
levels/notifications.oxw (modified) (2 diffs)
levels/pickups.oxw (modified) (1 diff)
levels/pirateAttack.oxw (modified) (1 diff)
levels/planets.oxw (modified) (1 diff)
levels/pong.oxw (modified) (1 diff)
levels/presentation.oxw (modified) (1 diff)
levels/presentation09.oxw (modified) (1 diff)
levels/presentation09b.oxw (modified) (1 diff)
levels/presentationDM.oxw (modified) (1 diff)
levels/presentationFS10.oxw (modified) (1 diff)
levels/presentationFS102.oxw (modified) (1 diff)
levels/presentationFS10Ed.oxw (modified) (1 diff)
levels/presentationHS09.oxw (modified) (1 diff)
levels/presentationHS09b.oxw (modified) (1 diff)
levels/princessAeryn.oxw (modified) (1 diff)
levels/quests.oxw (modified) (1 diff)
levels/screenshot.oxw (modified) (1 diff)
levels/sound.oxw (modified) (1 diff)
levels/teamBaseMatch.oxw (modified) (1 diff)
levels/teamDeathMatch.oxw (modified) (1 diff)
levels/testStars.oxw (modified) (1 diff)
levels/testSwallow.oxw (modified) (1 diff)
levels/theTimeMachine.oxw (modified) (1 diff)
levels/tutorial.oxw (modified) (1 diff)
levels/underAttack.oxw (modified) (1 diff)
levels/waypoints.oxw (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/tutoriallevel3/data/gui/scripts/NotificationLayer.lua

-                      r8453
+                      r8636
         ["window"]    = queue,
         ["name"]      = name,
         ["maxSize"]      = size,
+        ["maxSize"]   = size,
         ["visible"]   = false,
         ["fontSize"]  = 12,
 …
     if queue ~= nil then
+        queue.window:getParent():removeChildWindow(queue.window)
         winMgr:destroyWindow(queue.window)
     end

code/branches/tutoriallevel3/data/levels/FPSTest.oxw

r8079	r8636
21	21	<Template link=lodtemplate_default />
22	22	</templates>
	23	<?lua include("includes/notifications.oxi") ?>
23	24
24	25	<Scene

code/branches/tutoriallevel3/data/levels/asteroids.oxw

r8079	r8636
14	14	<Template link=lodtemplate_default />
15	15	</templates>
	16	<?lua include("includes/notifications.oxi") ?>
16	17
17	18	<Scene

code/branches/tutoriallevel3/data/levels/dynamicMatch.oxw

r8079	r8636
16	16	<Template link=lodtemplate_default />
17	17	</templates>
	18	<?lua include("includes/notifications.oxi") ?>
18	19
19	20	<Scene

code/branches/tutoriallevel3/data/levels/earth.oxw

r8438	r8636
19	19	<Template link="lodtemplate_default" />
20	20	</templates>
	21	<?lua include("includes/notifications.oxi") ?>
21	22
22	23	<Scene

code/branches/tutoriallevel3/data/levels/emptyLevel.oxw

r7679	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/events.oxw

r7679	r8636
20	20	<Template link=lodtemplate_default />
21	21	</templates>
	22	<?lua include("includes/notifications.oxi") ?>
22	23
23	24	<Scene

code/branches/tutoriallevel3/data/levels/fightInOurBack.oxw

r8213	r8636
68	68	<Template link=lodtemplate_default />
69	69	</templates>
	70	<?lua include("includes/notifications.oxi") ?>
70	71
71	72	<!-- Ausgang: Szene ===> ambientlight/skybox -->

code/branches/tutoriallevel3/data/levels/lastManStanding.oxw

r8178	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/lastTeamStanding.oxw

r8179	r8636
27	27	skybox = "Orxonox/skypanoramagen1"
28	28	>
	29	<?lua include("includes/notifications.oxi") ?>
29	30
30	31	<?lua

code/branches/tutoriallevel3/data/levels/lastTeamStandingII.oxw

r8351	r8636
22	22	<Template link=lodtemplate_default />
23	23	</templates>
	24	<?lua include("includes/notifications.oxi") ?>
24	25
25	26	<Scene

code/branches/tutoriallevel3/data/levels/notifications.oxw

-                      r7679
+                      r8636
         <Template link=lodtemplate_default />
     </templates>
+    <?lua include("includes/notifications.oxi") ?>
     <Scene
 …
         skybox       = "Orxonox/skypanoramagen1"
+    >
-    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/tutoriallevel3/data/levels/pickups.oxw

r7679	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/pirateAttack.oxw

r8213	r8636
35	35	<Template link=lodtemplate_default />
36	36	</templates>
	37	<?lua include("includes/notifications.oxi") ?>
37	38
38	39	<Scene

code/branches/tutoriallevel3/data/levels/planets.oxw

r8438	r8636
19	19	<Template link="lodtemplate_default" />
20	20	</templates>
	21	<?lua include("includes/notifications.oxi") ?>
21	22
22	23	<Scene

code/branches/tutoriallevel3/data/levels/pong.oxw

r7865	r8636
56	56	<Template link=lodtemplate_default />
57	57	</templates>
	58	<?lua include("includes/notifications.oxi") ?>
58	59
59	60	<WorldAmbientSound source="mainmenu.ogg" playOnLoad=true />

code/branches/tutoriallevel3/data/levels/presentation.oxw

r7679	r8636
19	19	<Template link=lodtemplate_default />
20	20	</templates>
	21	<?lua include("includes/notifications.oxi") ?>
21	22
22	23	<Scene

code/branches/tutoriallevel3/data/levels/presentation09.oxw

r8079	r8636
21	21	<Template link=lodtemplate_default />
22	22	</templates>
	23	<?lua include("includes/notifications.oxi") ?>
23	24
24	25	<Scene

code/branches/tutoriallevel3/data/levels/presentation09b.oxw

r8079	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/presentationDM.oxw

r8079	r8636
20	20	<Template link=lodtemplate_default />
21	21	</templates>
	22	<?lua include("includes/notifications.oxi") ?>
22	23
23	24	<Scene

code/branches/tutoriallevel3/data/levels/presentationFS10.oxw

r7679	r8636
26	26	<Template link=lodtemplate_default />
27	27	</templates>
	28	<?lua include("includes/notifications.oxi") ?>
28	29
29	30	<Scene

code/branches/tutoriallevel3/data/levels/presentationFS102.oxw

r8079	r8636
21	21	<Template link=lodtemplate_default />
22	22	</templates>
	23	<?lua include("includes/notifications.oxi") ?>
23	24
24	25	<Scene

code/branches/tutoriallevel3/data/levels/presentationFS10Ed.oxw

r8079	r8636
21	21	<Template link=lodtemplate_default />
22	22	</templates>
	23	<?lua include("includes/notifications.oxi") ?>
23	24
24	25	<Scene

code/branches/tutoriallevel3/data/levels/presentationHS09.oxw

r8079	r8636
24	24	<Template link=lodtemplate_default />
25	25	</templates>
	26	<?lua include("includes/notifications.oxi") ?>
26	27
27	28	<Scene

code/branches/tutoriallevel3/data/levels/presentationHS09b.oxw

r8079	r8636
29	29	<Template link=lodtemplate_default />
30	30	</templates>
	31	<?lua include("includes/notifications.oxi") ?>
31	32
32	33	<Scene

code/branches/tutoriallevel3/data/levels/princessAeryn.oxw

r7679	r8636
24	24	<Template link=lodtemplate_default />
25	25	</templates>
	26	<?lua include("includes/notifications.oxi") ?>
26	27
27	28	<Scene

code/branches/tutoriallevel3/data/levels/quests.oxw

r8453	r8636
19	19	<Template link=lodtemplate_default />
20	20	</templates>
	21	<?lua include("includes/notifications.oxi") ?>
21	22
22	23	<Scene

code/branches/tutoriallevel3/data/levels/screenshot.oxw

r7679	r8636
22	22	<Template link=lodtemplate_default />
23	23	</templates>
	24	<?lua include("includes/notifications.oxi") ?>
24	25
25	26	<Scene

code/branches/tutoriallevel3/data/levels/sound.oxw

r7854	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/teamBaseMatch.oxw

r8079	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/teamDeathMatch.oxw

r7679	r8636
22	22	<Template link=lodtemplate_default />
23	23	</templates>
	24	<?lua include("includes/notifications.oxi") ?>
24	25
25	26	<Scene

code/branches/tutoriallevel3/data/levels/testStars.oxw

r7679	r8636
23	23	<Template link=lodtemplate_default />
24	24	</templates>
	25	<?lua include("includes/notifications.oxi") ?>
25	26
26	27	<Scene

code/branches/tutoriallevel3/data/levels/testSwallow.oxw

r8079	r8636
22	22	<Template link=lodtemplate_default />
23	23	</templates>
	24	<?lua include("includes/notifications.oxi") ?>
24	25
25	26	<Scene

code/branches/tutoriallevel3/data/levels/theTimeMachine.oxw

r8213	r8636
68	68	<Template link=lodtemplate_default />
69	69	</templates>
	70	<?lua include("includes/notifications.oxi") ?>
	71
70	72	<Scene
71	73	ambientlight="0.8,0.8,0.8"

code/branches/tutoriallevel3/data/levels/tutorial.oxw

r7679	r8636
19	19	<Template link=lodtemplate_default />
20	20	</templates>
	21	<?lua include("includes/notifications.oxi") ?>
21	22
22	23	<Scene

code/branches/tutoriallevel3/data/levels/underAttack.oxw

r8079	r8636
15	15	<Template link=lodtemplate_default />
16	16	</templates>
	17	<?lua include("includes/notifications.oxi") ?>
17	18
18	19	<Scene

code/branches/tutoriallevel3/data/levels/waypoints.oxw

r7679	r8636
21	21	<Template link=lodtemplate_default />
22	22	</templates>
	23	<?lua include("includes/notifications.oxi") ?>
23	24
24	25	<Scene

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8636 for code/branches/tutoriallevel3/data

Legend:

Download in other formats: