Context Navigation

← Previous Change
Next Change →

Changeset 9348 for code/trunk/data/levels/old

Timestamp:

Aug 30, 2012, 11:08:17 PM (12 years ago)

Author:

landauf

Message:

merged branch presentation2012merge back to trunk

Location:

code/trunk

Files:

: 4 edited

. (modified) (2 props)
data/levels/old/CuboidSpaceStation.oxw (modified) (8 diffs)
data/levels/old/presentationPhysics.oxw (modified) (1 diff)
data/levels/old/princessAeryn.oxw (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:ignore

old	new
	1	.project
1	2	build
2	3	codeblocks
	4	dependencies
3	5	vs
4		~~dependencies~~

Property svn:mergeinfo changed

/code/branches/newlevel2012 (added)	merged: 9033,9066,9094-9098,9103-9104,9106,9108-9113,9116-9117,9122-9124,9129,9132-9146,9148-9149,9154,9160-9161,9167-9168,9172-9173,9175,9180-9181,9188,9190,9193-9194,9196,9199,9204,9207,9211,9213,9236
/code/branches/pCuts (added)	merged: 9023-9024,9027,9081-9092
/code/branches/pickup2012 (added)	merged: 9029,9099,9118-9119,9155,9184
/code/branches/presentation2012 (added)	merged: 9189,9195,9202-9203,9208,9216,9229,9241,9243-9248,9250,9268
/code/branches/presentation2012merge (added)	merged: 9266,9269-9282,9286-9287,9290-9306,9312-9314,9316,9318-9334,9336-9347
/code/branches/shipSelection (added)	merged: 9038-9039,9045-9046,9057,9074,9101,9127-9128,9157,9185,9201
/code/branches/sound2012 (added)	merged: 9205,9214
/code/branches/surfaceRace (added)	merged: 9028,9035-9037,9041,9056,9059,9061,9070-9071,9107,9120-9121,9130,9150,9162,9169,9171,9174,9187

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

-                      r7679
+                      r9348
 <?lua
         include("HUDTemplates3.oxo")
+    include("HUDTemplates3.oxo")
 ?>
 <?lua
         include("templates/spaceshipAssff.oxt")
+    include("templates/spaceshipAssff.oxt")
 ?>
 <Level
         name = "SpaceStation test Space!"
         description = "All the new SpaceStations are created here!"
+    name = "SpaceStation test Space!"
+    description = "All the new SpaceStations are created here!"
+>
         <Scene
                 ambientlight = "0.5, 0.5, 0.5"
                 skybox = "Orxonox/Starbox"
+        >
+    <Scene
+        ambientlight = "0.5, 0.5, 0.5"
+        skybox = "Orxonox/Starbox"
+    >
 …
 <!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
 <?lua
         dofile("includes/CuboidSpaceStation.lua")
+    dofile("includes/CuboidSpaceStation.lua")
 ?>
 …
 --->
 <?lua
         createSpaceStation()
+    createSpaceStation()
 ?>
 …
 --->
 <PositionableEntity scale=1 position="0,0,-5000">
         <attached>
                 <?lua
                         createSpaceStation()
                 ?>
         </attached>
+    <attached>
+        <?lua
+            createSpaceStation()
+        ?>
+    </attached>
 </PositionableEntity>
 …
 --->
 <MovableEntity scale=1 position="5000,0,0" velocity="50,0,0" yaw=-90>
         <attached>
                 <?lua
                         createSpaceStation()
                 ?>
         </attached>
+    <attached>
+        <?lua
+            createSpaceStation()
+        ?>
+    </attached>
 </MovableEntity>
 …
 --->
 <MovableEntity scale=1 position="-5000,0,0" rotationaxis="0,1,0" rotationrate=5>
         <attached>
                 <?lua
                         createSpaceStation()
                 ?>
         </attached>
+    <attached>
+        <?lua
+            createSpaceStation()
+        ?>
+    </attached>
 </MovableEntity>
 …
 --->
 <MovableEntity scale=1 position="0,0,0" rotationaxis="0,1,0" rotationrate=3>
         <attached>
                 <MovableEntity scale=1 position="10000,0,0" rotationaxis="0,0,1" rotationrate=2>
                         <attached>
                                 <?lua
                                         -- Here I use the createSpaceStationPar(...) function, which has 8 arguments, see the .lua file at the top to understand them.
                                         createSpaceStationPar(0,2,1,2,1,2,1,50)
                                 ?>
                         </attached>
                 </MovableEntity>
         </attached>
+    <attached>
+        <MovableEntity scale=1 position="10000,0,0" rotationaxis="0,0,1" rotationrate=2>
+            <attached>
+                <?lua
+                    -- Here I use the createSpaceStationPar(...) function, which has 8 arguments, see the .lua file at the top to understand them.
+                    createSpaceStationPar(0,2,1,2,1,2,1,50)
+                ?>
+            </attached>
+        </MovableEntity>
+    </attached>
 </MovableEntity>
 …
         <ParticleSpawner position="0,0,0" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+    <ParticleSpawner position="0,0,0" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
       <events>
         <spawn>

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

r7679	r9348
12	12	<Scene
13	13	ambientlight = "0.8, 0.8, 0.8"
14		skybox = "Orxonox/sky~~panoramagen1~~"
	14	skybox = "Orxonox/skyBoxBasic"
15	15	gravity = "0, -10, 0"
16	16	>

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

r7679	r9348
15	15	<Scene
16	16	ambientlight = "0.3, 0.3, 0.3"
17		skybox = "Orxonox/sky~~panoramagen1~~"
	17	skybox = "Orxonox/skyBoxBasic"
18	18	>
19	19

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

Context Navigation

Changeset 9348 for code/trunk/data/levels/old

Legend:

code/trunk

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

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

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

Download in other formats: