Changeset 7679 for code/trunk

Timestamp:

Nov 28, 2010, 11:21:20 PM (14 years ago)

Author:

dafrick

Message:

Renaming levelfiles (and some other) according to our new naming conventions which is using camelCase, without '_' or spaces.

Location:

code/trunk

Files:

• data/levels/FPSTest.oxw (moved) (moved from code/trunk/data/levels/fps_test.oxw) (1 diff)
• data/levels/asteroids.oxw (moved) (moved from code/trunk/data/levels/gametype_asteroids.oxw) (1 diff)
• data/levels/dynamicMatch.oxw (moved) (moved from code/trunk/data/levels/gametype_dynamicmatch.oxw) (1 diff)
• data/levels/emptyLevel.oxw (moved) (moved from code/trunk/data/levels/empty_level.oxw) (1 diff)
• data/levels/events.oxw (modified) (1 diff)
• data/levels/fightInOurBack.oxw (moved) (moved from code/trunk/data/levels/Fight in our Back.oxw) (2 diffs)
• data/levels/includes/weaponSettings1.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings1.oxi)
• data/levels/includes/weaponSettings2.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings2.oxi)
• data/levels/includes/weaponSettings3.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings3.oxi)
• data/levels/includes/weaponSettingsFPS.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_fps.oxi)
• data/levels/includes/weaponSettingsGhost.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_ghost.oxi)
• data/levels/includes/weaponSettingsH2.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_H2.oxi)
• data/levels/includes/weaponSettingsHXY.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_HXY.oxi)
• data/levels/includes/weaponSettingsPirate.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_pirate.oxi)
• data/levels/includes/weaponSettingsSwallow.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_swallow.oxi)
• data/levels/includes/weaponSettingsTransporter.oxi (moved) (moved from code/trunk/data/levels/includes/weaponsettings_Transporter.oxi)
• data/levels/lastManStanding.oxw (moved) (moved from code/trunk/data/levels/gametype_lastmanstanding.oxw) (1 diff)
• data/levels/notifications.oxw (modified) (1 diff)
• data/levels/old/CuboidSpaceStation.oxw (modified) (1 diff)
• data/levels/old/physicsTest.oxw (moved) (moved from code/trunk/data/levels/old/physicstest.oxw)
• data/levels/old/physicsTest2.oxw (moved) (moved from code/trunk/data/levels/old/physicstest2.oxw) (1 diff)
• data/levels/old/planetTest.oxw (moved) (moved from code/trunk/data/levels/old/planettest.oxw) (1 diff)
• data/levels/old/presentationLOD.oxw (modified) (1 diff)
• data/levels/old/presentationPhysics.oxw (moved) (moved from code/trunk/data/levels/old/presentation_physics.oxw) (1 diff)
• data/levels/old/princessAeryn.oxw (moved) (moved from code/trunk/data/levels/old/princessaeryn.oxw) (1 diff)
• data/levels/old/questSystem.oxw (moved) (moved from code/trunk/data/levels/old/questsystem.oxw) (1 diff)
• data/levels/old/sample4.oxw (modified) (1 diff)
• data/levels/old/spaceshipTemplatesPhysics.oxw (moved) (moved from code/trunk/data/levels/old/spaceshiptemplates_physics.oxw)
• data/levels/old/tutorialHS08.oxw (moved) (moved from code/trunk/data/levels/old/tutorial_hs08.oxw)
• data/levels/pickups.oxw (modified) (1 diff)
• data/levels/pirateAttack.oxw (moved) (moved from code/trunk/data/levels/Quest_PirateAttack.oxw) (1 diff)
• data/levels/presentation.oxw (modified) (1 diff)
• data/levels/presentation09.oxw (modified) (1 diff)
• data/levels/presentation09b.oxw (modified) (1 diff)
• data/levels/presentationDM.oxw (moved) (moved from code/trunk/data/levels/presentation_dm.oxw) (1 diff)
• data/levels/presentationFS10.oxw (modified) (1 diff)
• data/levels/presentationFS102.oxw (moved) (moved from code/trunk/data/levels/presentation_FS10.oxw) (1 diff)
• data/levels/presentationFS10Ed.oxw (moved) (moved from code/trunk/data/levels/presentation_FS10_ed.oxw) (1 diff)
• data/levels/presentationHS09.oxw (modified) (1 diff)
• data/levels/presentationHS09b.oxw (modified) (1 diff)
• data/levels/presentation_pong.oxw (modified) (1 diff)
• data/levels/princessAeryn.oxw (moved) (moved from code/trunk/data/levels/princessaeryn.oxw) (1 diff)
• data/levels/screenshot.oxw (modified) (1 diff)
• data/levels/sound.oxw (modified) (1 diff)
• data/levels/teamBaseMatch.oxw (moved) (moved from code/trunk/data/levels/teambasematchlevel.oxw) (1 diff)
• data/levels/teamDeathMatch.oxw (moved) (moved from code/trunk/data/levels/teamdeathmatch.oxw) (1 diff)
• data/levels/templates/FPS.oxt (moved) (moved from code/trunk/data/levels/templates/fps.oxt) (1 diff)
• data/levels/templates/lodInformation.oxt (moved) (moved from code/trunk/data/levels/templates/lodinformation.oxt)
• data/levels/templates/pickupRepresentationTemplates.oxt (moved) (moved from code/trunk/data/levels/templates/pickup_representation_templates.oxt)
• data/levels/templates/spaceshipAssff.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_assff.oxt) (1 diff)
• data/levels/templates/spaceshipGhost.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_ghost.oxt) (1 diff)
• data/levels/templates/spaceshipH2.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_H2.oxt) (1 diff)
• data/levels/templates/spaceshipHXY.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_HXY.oxt) (1 diff)
• data/levels/templates/spaceshipHXYSL.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_HXY_SL.oxt) (1 diff)
• data/levels/templates/spaceshipPirate.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_pirate.oxt) (1 diff)
• data/levels/templates/spaceshipSwallow.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_swallow.oxt) (1 diff)
• data/levels/templates/spaceshipTransporter.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_Transporter.oxt) (1 diff)
• data/levels/templates/spaceshipTransporterSL.oxt (moved) (moved from code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt) (1 diff)
• data/levels/testStars.oxw (moved) (moved from code/trunk/data/levels/test_stars.oxw) (1 diff)
• data/levels/testSwallow.oxw (moved) (moved from code/trunk/data/levels/test_swallow.oxw) (1 diff)
• data/levels/theTimeMachine.oxw (moved) (moved from code/trunk/data/levels/The Time Machine.oxw) (2 diffs)
• data/levels/tutorial.oxw (modified) (1 diff)
• data/levels/underAttack.oxw (moved) (moved from code/trunk/data/levels/gametype_underattack.oxw) (1 diff)
• data/levels/waypoints.oxw (modified) (1 diff)
• data/overlays/HUD.oxo (moved) (moved from code/trunk/data/overlays/hud.oxo)
• data/overlays/HUDTemplates3.oxo (moved) (moved from code/trunk/data/overlays/hudtemplates3.oxo)
• data/overlays/HUDTemplatesFPS.oxo (moved) (moved from code/trunk/data/overlays/hudtamplates_fps.oxo)
• data/overlays/dynamicMatchHUD.oxo (moved) (moved from code/trunk/data/overlays/dynamicmatchhud.oxo)
• data/overlays/lastManStandingHUD.oxo (moved) (moved from code/trunk/data/overlays/lastmanstandinghud.oxo)
• data/overlays/pongHUD.oxo (moved) (moved from code/trunk/data/overlays/ponghud.oxo)
• data/overlays/teamBaseMatchHUD.oxo (moved) (moved from code/trunk/data/overlays/teambasematchhud.oxo)
• data/overlays/underAttackHUD.oxo (moved) (moved from code/trunk/data/overlays/underattackhud.oxo)
• doc/api/Groups.dox (modified) (7 diffs)

code/trunk/data/levels/FPSTest.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/asteroids.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/dynamicMatch.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_ghost.oxt")
-  include("dynamicmatchhud.oxo")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("dynamicMatchHUD.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/emptyLevel.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 

code/trunk/data/levels/events.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/fightInOurBack.oxw

@@ -7 +7 @@
 <?lua
     include("stats.oxo")
-    include("hudtemplates3.oxo")
-    include("templates/lodinformation.oxt")
-    include("templates/spaceship_assff.oxt")
-    include("templates/spaceship_pirate.oxt")
-    include("templates/spaceship_Transporter.oxt")
+    include("HUDTemplates3.oxo")
+    include("templates/lodInformation.oxt")
+    include("templates/spaceshipAssff.oxt")
+    include("templates/spaceshipPirate.oxt")
+    include("templates/spaceshipTransporter.oxt")
 ?>
 
@@ -54 +54 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponsettings3.oxi")
+  include("includes/weaponSettings3.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/lastManStanding.oxw

@@ -1 +1 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
-  include("lastmanstandinghud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+  include("lastManStandingHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
 ?>
 

code/trunk/data/levels/notifications.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/old/CuboidSpaceStation.oxw

@@ -1 +1 @@
 <?lua
-        include("hudtemplates3.oxo")
+        include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-        include("templates/spaceship_assff.oxt")
+        include("templates/spaceshipAssff.oxt")
 ?>
 

code/trunk/data/levels/old/physicsTest2.oxw

@@ -1 +1 @@
 <?lua
-  include("spaceshiptemplates_physics.oxw")
+  include("spaceshipTemplatesPhysics.oxw")
 ?>
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 

code/trunk/data/levels/old/planetTest.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
 ?>
 

code/trunk/data/levels/old/presentationLOD.oxw

@@ -1 +1 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 

code/trunk/data/levels/old/presentationPhysics.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
   math.randomseed(344)
 ?>

code/trunk/data/levels/old/princessAeryn.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
 ?>
 

code/trunk/data/levels/old/questSystem.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
 ?>
 

code/trunk/data/levels/old/sample4.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
 ?>
 

code/trunk/data/levels/pickups.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/pirateAttack.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_HXY_SL.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipHXYSL.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentation.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentation09.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentation09b.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentationDM.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentationFS10.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/lodinformation.oxt")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_swallow.oxt")
-  include("templates/pickup_representation_templates.oxt")
+  include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipSwallow.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
 ?>
 

code/trunk/data/levels/presentationFS102.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentationFS10Ed.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentationHS09.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/presentationHS09b.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_ghost.oxt")
-  include("templates/spaceship_HXY.oxt")
-  include("templates/spaceship_Transporter.oxt")
-  include("templates/spaceship_HXY_SL.oxt")
-  include("templates/spaceship_Transporter_SL.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipHXY.oxt")
+  include("templates/spaceshipTransporter.oxt")
+  include("templates/spaceshipHXYSL.oxt")
+  include("templates/spaceshipTransporterSL.oxt")
 ?>
 

code/trunk/data/levels/presentation_pong.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("ponghud.oxo")
-  include("templates/lodinformation.oxt")
+  include("pongHUD.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/princessAeryn.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/screenshot.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/sound.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 

code/trunk/data/levels/teamBaseMatch.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("teambasematchhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("teamBaseMatchHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/teamDeathMatch.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/templates/FPS.oxt

@@ -30 +30 @@
     
     <?lua
-        include("includes/weaponsettings_fps.oxi")
+        include("includes/weaponSettingsFPS.oxi")
     ?>
 

code/trunk/data/levels/templates/spaceshipAssff.oxt

@@ -35 +35 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponsettings3.oxi")
+  include("includes/weaponSettings3.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipGhost.oxt

@@ -34 +34 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponsettings_ghost.oxi")
+  include("includes/weaponSettingsGhost.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipH2.oxt

@@ -23 +23 @@
 
 <?lua
-  include("includes/weaponsettings_H2.oxi")
+  include("includes/weaponSettingsH2.oxi")
 ?>
 

code/trunk/data/levels/templates/spaceshipHXY.oxt

@@ -34 +34 @@
 
 <?lua
-  include("includes/weaponsettings_HXY.oxi")
+  include("includes/weaponSettingsHXY.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipHXYSL.oxt

@@ -34 +34 @@
 
 <?lua
-  include("includes/weaponsettings_HXY.oxi")
+  include("includes/weaponSettingsHXY.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipPirate.oxt

@@ -38 +38 @@
 
 <?lua
-  include("includes/weaponsettings_pirate.oxi")
+  include("includes/weaponSettingsPirate.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipSwallow.oxt

@@ -34 +34 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponsettings_swallow.oxi")
+  include("includes/weaponSettingsSwallow.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipTransporter.oxt

@@ -34 +34 @@
 
 <?lua
-  include("includes/weaponsettings_Transporter.oxi")
+  include("includes/weaponSettingsTransporter.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/templates/spaceshipTransporterSL.oxt

@@ -34 +34 @@
 
 <?lua
-  include("includes/weaponsettings_Transporter.oxi")
+  include("includes/weaponSettingsTransporter.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/testStars.oxw

@@ -7 +7 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 

code/trunk/data/levels/testSwallow.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_swallow.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipSwallow.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/theTimeMachine.oxw

@@ -7 +7 @@
 <?lua 
     include("stats.oxo")
-    include("hudtemplates3.oxo")
-    include("templates/lodinformation.oxt")
-    include("templates/spaceship_assff.oxt")
-    include("templates/spaceship_pirate.oxt")
+    include("HUDTemplates3.oxo")
+    include("templates/lodInformation.oxt")
+    include("templates/spaceshipAssff.oxt")
+    include("templates/spaceshipPirate.oxt")
 ?>
 
@@ -53 +53 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponsettings3.oxi")
+  include("includes/weaponSettings3.oxi")
 ?>
   </SpaceShip>

code/trunk/data/levels/tutorial.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/underAttack.oxw

@@ -1 +1 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("underattackhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("underAttackHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/data/levels/waypoints.oxw

@@ -6 +6 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 

code/trunk/doc/api/Groups.dox

@@ -291 +291 @@
 
     @subsection UsingPredifinedPickups Using predefined pickups
-    There is a file called <code>pickup_representation_templates.oxt</code> in <code>levels/templates</code>, which holds the templates for the @ref orxonox::PickupRepresentation "PickupRepresentations" and also templates for @ref orxonox::Pickupable "Pickupables". The templates for the @ref orxonox::PickupRepresentation "PickupRepresentations" define the @ref orxonox::StaticEntity "StaticEntities" that are attached to the @ref orxonox::PickupSpawner "PickupSpawners" to make them look like the @ref orxonox::Pickupable "Pickupable" they are spawning. The templates for the @ref orxonox::Pickupable "Pickupables" can be added just for ease of use.
+    There is a file called <code>pickupRepresentationTemplates.oxt</code> in <code>levels/templates</code>, which holds the templates for the @ref orxonox::PickupRepresentation "PickupRepresentations" and also templates for @ref orxonox::Pickupable "Pickupables". The templates for the @ref orxonox::PickupRepresentation "PickupRepresentations" define the @ref orxonox::StaticEntity "StaticEntities" that are attached to the @ref orxonox::PickupSpawner "PickupSpawners" to make them look like the @ref orxonox::Pickupable "Pickupable" they are spawning. The templates for the @ref orxonox::Pickupable "Pickupables" can be added just for ease of use.
     If you want to use pickups you will have to include this file in your level file, somewhere above the Level-tag.
     @code
     <?lua
-        include("templates/pickup_representation_templates.oxt")
+        include("templates/pickupRepresentationTemplates.oxt")
     ?>
     ...
@@ -301 +301 @@
     ...
     @endcode
-    There is another file called <code>pickups.oxi</code> in <code>level/includes</code> which creates all @ref orxonox::PickupRepresentation "PickupRepresentations" needed for the @ref orxonox::Pickupable "Pickupable" supplied by the <code>pickup_representation_templates.oxt</code> file. This file will have to be included as well. It has to be somewhere after the opening Scene-tag and your first use of a pickup.
+    There is another file called <code>pickups.oxi</code> in <code>level/includes</code> which creates all @ref orxonox::PickupRepresentation "PickupRepresentations" needed for the @ref orxonox::Pickupable "Pickupable" supplied by the <code>pickupRepresentationTemplates.oxt</code> file. This file will have to be included as well. It has to be somewhere after the opening Scene-tag and your first use of a pickup.
     @code
     <Scene>
@@ -324 +324 @@
     @endcode
     Please be aware, that the @ref orxonox::Pickupable "Pickupable" specified for the @ref orxonox::PickupSpawner "PickupSpawner", has to be exactly the same (including all parameters) to the one specified in the <code>pickups.oxi</code> file.
-    To make things simpler, one could just use the templates specified in the <code>pickup_representation_templates.oxt</code> file. Which, following the previous example, would look like this:
+    To make things simpler, one could just use the templates specified in the <code>pickupRepresentationTemplates.oxt</code> file. Which, following the previous example, would look like this:
     @code
     <PickupSpawner position="-100,0,-100" respawnTime="30" maxSpawnedItems="10">
@@ -347 +347 @@
     </PickupSpawner>
     @endcode
-    As can be seen in the <code>pickup_representation_templates.oxt</code> file and the <code>pickups.oxi</code> file there is no @ref orxonox::PickupRepresentation "PickupRepresentation" defined for this type of pickup. Thus the default representation will be used.
+    As can be seen in the <code>pickupRepresentationTemplates.oxt</code> file and the <code>pickups.oxi</code> file there is no @ref orxonox::PickupRepresentation "PickupRepresentation" defined for this type of pickup. Thus the default representation will be used.
 
     To create an appropriate @ref orxonox::PickupRepresentation "PickupRepresentation" for the inserted pickup above, you can just create a @ref orxonox::PickupRepresentation "PickupRepresentation" within the scene (Within the Scene-tags).
@@ -388 +388 @@
     </Template>
     @endcode
-    Please refer to the <code>pickup_representation_templates.oxt</code> for more examples.
+    Please refer to the <code>pickupRepresentationTemplates.oxt</code> for more examples.
 
     The @ref orxonox::PickupRepresentation "PickupRepresentation" also needs another parameter the <em>inventoryRepresentation</em>. This parameter defined how the @ref orxonox::Pickupable "Pickupable" is displayed in the PickupInventory (a menu to browse the currently equipped pickups).
@@ -396 +396 @@
     This is the name of an image defined in the PickupInventory imageset (<code>PickupInventory.imageset</code>), which can be found in <code>data_extern/gui/imagesets</code>.
 
-    This is all that has to be done. Now you have a new pickup type with an appropriate @ref orxonox::PickupRepresentation "PickupRepresentation" for your use. If you feel that your pickup is useful in general, please don't hesitate to create a template for the pickup and add your pickup to the <code>pickup_representation_templates.oxt</code> file and the <code>pickups.oxi</code> file, so that anyone who wants to use it can do so quite easily.
+    This is all that has to be done. Now you have a new pickup type with an appropriate @ref orxonox::PickupRepresentation "PickupRepresentation" for your use. If you feel that your pickup is useful in general, please don't hesitate to create a template for the pickup and add your pickup to the <code>pickupRepresentationTemplates.oxt</code> file and the <code>pickups.oxi</code> file, so that anyone who wants to use it can do so quite easily.
 
     There is also an additional way to create new types of pickups to be used in a level (without having to do any coding). There is a @ref orxonox::Pickupable "Pickupable" called the @ref orxonox::PickupCollection "PickupCollection", which is just a collection (hence the name) of @ref orxonox::Pickupable "Pickupables" (more precisely of @ref orxonox::CollectiblePickup "CollectiblePickups"), behaving as if it was just one @ref orxonox::Pickupable "Pickupable".
@@ -686 +686 @@
 
     @section SampleQuest Sample quest
-    To get your head around all of this and see some of the things mentioned here in action you might want to check out the "The Tale of Princess Aeryn"-Quest (Levelfile: princessaeryn.oxw) in the level-folder.
+    To get your head around all of this and see some of the things mentioned here in action you might want to check out the "The Tale of Princess Aeryn"-Quest (Levelfile: princessAeryn.oxw) in the level-folder.
 */