[Orxonox-commit 5922] r10581 - in code/branches/core7: data/levels src/modules/dodgerace src/modules/gametypes src/modules/invader src/modules/jump src/modules/mini4dgame src/modules/pong src/modules/tetris src/modules/towerdefense
landauf at orxonox.net
landauf at orxonox.net
Sat Sep 12 18:46:55 CEST 2015
Author: landauf
Date: 2015-09-12 18:46:55 +0200 (Sat, 12 Sep 2015)
New Revision: 10581
Modified:
code/branches/core7/data/levels/4Dtest.oxw
code/branches/core7/data/levels/DodgeRace.oxw
code/branches/core7/data/levels/Invaders.oxw
code/branches/core7/data/levels/Spacerace2.oxw
code/branches/core7/data/levels/SurfaceRacePresentation.oxw
code/branches/core7/data/levels/jump.oxw
code/branches/core7/data/levels/pong.oxw
code/branches/core7/data/levels/presentationHS12.oxw
code/branches/core7/data/levels/spaceRace.oxw
code/branches/core7/data/levels/surfaceRace.oxw
code/branches/core7/data/levels/tetris.oxw
code/branches/core7/data/levels/towerDefense.oxw
code/branches/core7/src/modules/dodgerace/CMakeLists.txt
code/branches/core7/src/modules/gametypes/CMakeLists.txt
code/branches/core7/src/modules/invader/CMakeLists.txt
code/branches/core7/src/modules/jump/CMakeLists.txt
code/branches/core7/src/modules/mini4dgame/CMakeLists.txt
code/branches/core7/src/modules/pong/CMakeLists.txt
code/branches/core7/src/modules/tetris/CMakeLists.txt
code/branches/core7/src/modules/towerdefense/CMakeLists.txt
Log:
8 modules are now marked as plugins (which means they are only loaded on demand): dodgerace, gametypes (spacerace), invader, jump, mini4dgame, pong, tetris, and towerdefense.
Modified: code/branches/core7/data/levels/4Dtest.oxw
===================================================================
--- code/branches/core7/data/levels/4Dtest.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/4Dtest.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -15,6 +15,7 @@
<Level
+ plugins=mini4dgame
gametype=Mini4Dgame
>
Modified: code/branches/core7/data/levels/DodgeRace.oxw
===================================================================
--- code/branches/core7/data/levels/DodgeRace.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/DodgeRace.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -18,7 +18,10 @@
include("overlays/DodgeRaceHUD.oxo")
?>
-<Level gametype = DodgeRace>
+<Level
+ plugins = dodgerace
+ gametype = DodgeRace
+>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/core7/data/levels/Invaders.oxw
===================================================================
--- code/branches/core7/data/levels/Invaders.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/Invaders.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -17,7 +17,10 @@
include("overlays/InvaderHUD.oxo")
?>
-<Level gametype = Invader>
+<Level
+ plugins = invader
+ gametype = Invader
+>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/core7/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/core7/data/levels/Spacerace2.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/Spacerace2.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -23,7 +23,8 @@
<Level
name = "Spacerace2"
description = "Just a few tests"
-gametype = SpaceRace
+ plugins = gametypes
+ gametype = SpaceRace
>
<templates>
<Template link=lodtemplate_default />
Modified: code/branches/core7/data/levels/SurfaceRacePresentation.oxw
===================================================================
--- code/branches/core7/data/levels/SurfaceRacePresentation.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/SurfaceRacePresentation.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -19,6 +19,7 @@
?>
<Level
+plugins = gametypes
gametype = SpaceRace
>
Modified: code/branches/core7/data/levels/jump.oxw
===================================================================
--- code/branches/core7/data/levels/jump.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/jump.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -191,7 +191,10 @@
</JumpShield>
</Template>
-<Level gametype = "Jump">
+<Level
+ plugins = "jump"
+ gametype = "Jump"
+>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/core7/data/levels/pong.oxw
===================================================================
--- code/branches/core7/data/levels/pong.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/pong.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -52,6 +52,7 @@
<Level
+ plugins = "pong"
gametype = "Pong"
>
<templates>
Modified: code/branches/core7/data/levels/presentationHS12.oxw
===================================================================
--- code/branches/core7/data/levels/presentationHS12.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/presentationHS12.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -31,6 +31,7 @@
?>
<Level
+ plugins = gametypes
gametype = SpaceRace
>
<templates>
Modified: code/branches/core7/data/levels/spaceRace.oxw
===================================================================
--- code/branches/core7/data/levels/spaceRace.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/spaceRace.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -17,6 +17,7 @@
?>
<Level
+ plugins = "gametypes"
gametype = "OldSpaceRace"
>
<templates>
Modified: code/branches/core7/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/core7/data/levels/surfaceRace.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/surfaceRace.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -22,6 +22,7 @@
<Level
+ plugins = gametypes
gametype = SpaceRace
>
Modified: code/branches/core7/data/levels/tetris.oxw
===================================================================
--- code/branches/core7/data/levels/tetris.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/tetris.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -54,6 +54,7 @@
<Level
+ plugins = "tetris"
gametype = "Tetris"
>
<templates>
Modified: code/branches/core7/data/levels/towerDefense.oxw
===================================================================
--- code/branches/core7/data/levels/towerDefense.oxw 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/data/levels/towerDefense.oxw 2015-09-12 16:46:55 UTC (rev 10581)
@@ -56,7 +56,10 @@
-<Level gametype = "TowerDefense">
+<Level
+ plugins = "towerdefense"
+ gametype = "TowerDefense"
+>
<templates>
<Template link=lodtemplate_default />
</templates>
Modified: code/branches/core7/src/modules/dodgerace/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/dodgerace/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/dodgerace/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -7,7 +7,7 @@
)
ORXONOX_ADD_LIBRARY(dodgerace
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/gametypes/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/gametypes/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/gametypes/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -9,7 +9,7 @@
)
ORXONOX_ADD_LIBRARY(gametypes
- MODULE
+ PLUGIN
FIND_HEADER_FILES
TOLUA_FILES
PCH_FILE
Modified: code/branches/core7/src/modules/invader/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/invader/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/invader/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -12,7 +12,7 @@
)
ORXONOX_ADD_LIBRARY(invader
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/jump/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/jump/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/jump/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -23,7 +23,7 @@
)
ORXONOX_ADD_LIBRARY(jump
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/mini4dgame/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/mini4dgame/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/mini4dgame/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -5,7 +5,7 @@
)
ORXONOX_ADD_LIBRARY(mini4dgame
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/pong/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/pong/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/pong/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -11,7 +11,7 @@
)
ORXONOX_ADD_LIBRARY(pong
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/tetris/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/tetris/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/tetris/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -7,7 +7,7 @@
)
ORXONOX_ADD_LIBRARY(tetris
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
Modified: code/branches/core7/src/modules/towerdefense/CMakeLists.txt
===================================================================
--- code/branches/core7/src/modules/towerdefense/CMakeLists.txt 2015-09-12 14:10:02 UTC (rev 10580)
+++ code/branches/core7/src/modules/towerdefense/CMakeLists.txt 2015-09-12 16:46:55 UTC (rev 10581)
@@ -11,7 +11,7 @@
)
ORXONOX_ADD_LIBRARY(towerdefense
- MODULE
+ PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
orxonox
More information about the Orxonox-commit
mailing list