Changeset 10248 for code/branches/presentationHS14merge/data
- Timestamp:
- Feb 1, 2015, 10:21:51 PM (10 years ago)
- Location:
- code/branches/presentationHS14merge
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationHS14merge
- Property svn:mergeinfo changed
/code/branches/towerdefenseHS14 (added) merged: 10086,10091,10105-10106,10109,10123,10125-10126,10132,10134,10140-10142,10144,10146-10147,10151,10158-10159,10172,10243-10247
- Property svn:mergeinfo changed
-
code/branches/presentationHS14merge/data/levels/templates/tower.oxt
r9348 r10248 1 1 <Template name=tower> 2 <Tower 2 <TowerDefenseTower 3 3 4 4 … … 20 20 </WaypointPatrolController> 21 21 </controller> 22 22 23 23 24 24 25 <attached> 25 26 <Model position="0,0,0" scale=45 mesh="Tower.mesh" /> 27 28 26 29 </attached> 27 30 … … 33 36 include("../includes/towerWeaponSettings.oxi") 34 37 ?> 35 </Tower >38 </TowerDefenseTower> 36 39 </Template> 37 40 41 42 43 <Template name=towerturret> 44 <TowerDefenseTower 45 46 47 explosionchunks = 6 48 49 reloadrate = 10 50 reloadwaittime = 5 51 52 collisionType = "dynamic" 53 team = 1 54 55 56 > 57 <attached> 58 59 <Model position="0,0,0" scale=45 mesh="Tower.mesh" /> 60 61 <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30> 62 63 <controller> 64 <TurretController/> 65 </controller> 66 <?lua 67 include("../includes/weaponSettingsTurret.oxi") 68 ?> 69 </Turret> 70 71 </attached> 72 73 74 75 76 <!--collisionShapes> 77 78 </collisionShapes--> 79 80 <?lua 81 include("../includes/towerWeaponSettings.oxi") 82 ?> 83 </TowerDefenseTower> 84 </Template> 85 86 87 88 <Template name=towerturret1> 89 <TowerDefenseTower 90 91 92 explosionchunks = 6 93 94 reloadrate = 10 95 reloadwaittime = 5 96 97 collisionType = "dynamic" 98 team = 1 99 100 101 > 102 <attached> 103 104 105 <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30> 106 107 <controller> 108 <TurretController/> 109 </controller> 110 <?lua 111 include("../includes/weaponSettingsTurret1.oxi") 112 ?> 113 </Turret> 114 115 </attached> 116 117 118 119 120 <!--collisionShapes> 121 122 </collisionShapes--> 123 124 <?lua 125 include("../includes/towerWeaponSettings.oxi") 126 ?> 127 </TowerDefenseTower> 128 </Template> -
code/branches/presentationHS14merge/data/levels/towerDefense.oxw
r9348 r10248 21 21 include("templates/spaceshipPirate.oxt") 22 22 include("templates/tower.oxt") 23 include("templates/enemytowerdefense.oxt") 24 include("templates/standardTurret.oxt") 23 25 ?> 24 26 25 27 <!-- Specify the position of the camera --> 26 28 <Template name=centerpointmarkcamera defaults=0> 27 <Pawn >29 <Pawn team=1> 28 30 <camerapositions> 29 31 <CameraPosition position="0,0,1500"/> … … 34 36 <!-- Loads a mesh to mark the center--> 35 37 <Template name=centerpointmark> 36 <Pawn camerapositiontemplate=centerpointmarkcamera>38 <Pawn team=1 camerapositiontemplate=centerpointmarkcamera> 37 39 <attached> 38 40 <Model position="0,0,0" mesh="cylinder.mesh" scale3D="1,1,1" /> <!-- the camera is attached to this --> … … 70 72 71 73 <!-- Spawns the camera, attached to a crate --> 72 <SpawnPoint team= 0position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />74 <SpawnPoint team=1 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark /> 73 75 <!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /--> 74 76 … … 76 78 <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /--> 77 79 78 <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 > 79 <templates> 80 <Template link=spaceshipassff /> 81 </templates> 82 <controller> 83 <WaypointController accuracy=60> 84 <waypoints> 85 <!-- 1,3 10,3 10,11, 13,11 --> 86 <Model mesh="cube.mesh" scale=0 position="-700,-500, 150" /> 87 <Model mesh="cube.mesh" scale=0 position=" 200,-500, 150" /> 88 <Model mesh="cube.mesh" scale=0 position=" 200, 300, 150" /> 89 <Model mesh="cube.mesh" scale=0 position=" 500, 300, 150" /> 90 <Model mesh="cube.mesh" scale=0 position=" 500, 700, 150" /> 91 </waypoints> 92 </WaypointController> 93 </controller> 94 </SpaceShip> 80 95 81 96 82 97 83 <!--invisible entity to attach towers to, since playfield is static and towers are dynamic--> 98 <StaticEntity position=0,0,0>84 <StaticEntity team =1 position=0,0,0> 99 85 100 86 <attached> … … 132 118 direction="0,0,0" 133 119 collisionType=dynamic 134 mass=100000 >135 136 </TowerDefenseCenterpoint>120 mass=100000 121 team=1 122 /> 137 123 138 124 </Scene> -
code/branches/presentationHS14merge/data/overlays/towerdefenseHUD.oxo
r9348 r10248 1 1 <Template name="TowerDefenseHUD"> 2 3 2 4 <OverlayGroup name="TowerDefenseHUD" scale = "1, 1"> 5 6 3 7 <OverlayText 4 position = "0. 05, 0.05"8 position = "0.83, 0.05" 5 9 pickpoint = "0.0, 0.0" 6 10 font = "ShareTechMono" … … 9 13 align = "left" 10 14 11 caption = " Hello World"15 caption = "Cash:" 12 16 /> 17 18 19 <TowerDefenseHUDController 20 position = "0.88, 0.10" 21 pickpoint = "0.0, 0.0" 22 font = "ShareTechMono" 23 textsize = 0.05 24 colour = "1.0, 1.0, 1.0, 1.0" 25 align = "left" 26 showlives = false 27 showcredits = true 28 showwaves = false 29 /> 30 31 <OverlayText 32 position = "0.83, 0.22" 33 pickpoint = "0.0, 0.0" 34 font = "ShareTechMono" 35 textsize = 0.05 36 colour = "1.0, 1.0, 1.0, 1.0" 37 align = "left" 38 39 caption = "Lifes:" 40 /> 41 42 <TowerDefenseHUDController 43 position = "0.88, 0.27" 44 pickpoint = "0.0, 0.0" 45 font = "ShareTechMono" 46 textsize = 0.05 47 colour = "1.0, 1.0, 1.0, 1.0" 48 align = "left" 49 showlives = true 50 showcredits = false 51 showwaves = false 52 /> 53 54 <OverlayText 55 position = "0.83, 0.39" 56 pickpoint = "0.0, 0.0" 57 font = "ShareTechMono" 58 textsize = 0.05 59 colour = "1.0, 1.0, 1.0, 1.0" 60 align = "left" 61 62 caption = "Waves:" 63 /> 64 65 <TowerDefenseHUDController 66 position = "0.88, 0.44" 67 pickpoint = "0.0, 0.0" 68 font = "ShareTechMono" 69 textsize = 0.05 70 colour = "1.0, 1.0, 1.0, 1.0" 71 align = "left" 72 showlives = false 73 showcredits = false 74 showwaves = true 75 76 /> 77 78 13 79 </OverlayGroup> 14 80 </Template> 81 82
Note: See TracChangeset
for help on using the changeset viewer.