Changeset 6524 for code/trunk/data

Timestamp:

Mar 15, 2010, 3:27:09 PM (15 years ago)

Author:

dafrick

Message:

Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, very soon.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/empty_level.oxw (modified) (1 diff)
• data/levels/includes/pickups.oxi (copied) (copied from code/branches/pickup3/data/levels/includes/pickups.oxi)
• data/levels/pickup.oxw (copied) (copied from code/branches/pickup3/data/levels/pickup.oxw)
• data/levels/templates/pickup_representation_templates.oxt (copied) (copied from code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt)

code/trunk/data/levels/empty_level.oxw

@@ -30 +30 @@
         </attached>
     </Rocket-->
+    
+<?lua
+for i = 1,100,1
+do ?>
+    <StaticEntity position="<?lua print(math.random() * 1000) ?>, <?lua print(math.random() * 1000) ?>, <?lua print(math.random() * 1000) ?>">
+      <attached>
+          <Model scale="<?lua print(math.random() * 20 + 5) ?>" mesh="ast1.mesh" shadow=false />
+      </attached>
+    </StaticEntity>
+<?lua
+end
+?>