Changeset 9046 for code/branches/shipSelection
- Timestamp:
- Mar 17, 2012, 7:19:14 PM (13 years ago)
- Location:
- code/branches/shipSelection/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua
r9045 r9046 2 2 3 3 local P = createMenuSheet("ShipSelectionMenu") 4 P.levelList = {} 4 level = nil 5 5 P.activeTabIndexes = {} 6 6 P.scrollbarWidth = 13 7 7 function P.loadShips(levelname) 8 --orxonox.execute("echo " .. levelname) 9 --level = levelname 10 end 8 11 function P.onLoad() 9 12 --[[ P.createLevelList() … … 140 143 --]] 141 144 function P.ShipSelectionStartButton_clicked(e) 142 --[[143 local level = P.ShipSelectionGetSelectedLevel()144 if level ~= nil then145 145 146 if level:hasTag("shipselection") then 147 orxout("working!") 148 showMenuSheet("ShipSelectionMenu", true) 149 else 150 orxonox.execute("startGame " .. level:getXMLFilename()) 151 hideAllMenuSheets() 152 end 146 if P.level ~= nil then 147 orxonox.execute("startGame " .. level:getXMLFilename()) 148 hideAllMenuSheets() 149 else 150 orxonox.execute("keyESC") 153 151 end 154 --]]155 152 end 156 153 … … 166 163 167 164 function P.ShipSelectionBackButton_clicked(e) 168 --hideMenuSheet(P.name)165 orxonox.execute("keyESC") 169 166 end 170 167 -
code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua
r9045 r9046 145 145 146 146 if level:hasTag("shipselection") then 147 showMenuSheet("ShipSelectionMenu", true) 147 local shipSelectionMenu = showMenuSheet("ShipSelectionMenu", true) 148 shipSelectionMenu:loadShips(level:getXMLFilename()) 148 149 else 149 150 orxonox.execute("startGame " .. level:getXMLFilename()) -
code/branches/shipSelection/data/levels/tutorial.oxw
r9039 r9046 53 53 for i = 1, 10, 1 do 54 54 ?> 55 <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=s paceshipassff/>55 <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=shipselection /> 56 56 <?lua end ?> 57 57
Note: See TracChangeset
for help on using the changeset viewer.