Changeset 9811 for code/branches/levelElias/src
- Timestamp:
- Nov 25, 2013, 3:25:56 PM (11 years ago)
- Location:
- code/branches/levelElias
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/levelElias
- Property svn:mergeinfo changed
/code/trunk merged: 9756,9759,9763,9765,9782
- Property svn:mergeinfo changed
-
code/branches/levelElias/src/libraries/core/GUIManager.cc
r9675 r9811 350 350 CEGUI::System::getSingleton().setXMLParser("XercesParser"); 351 351 } 352 catch (const CEGUI::GenericException& e)352 catch (const CEGUI::GenericException&) 353 353 { 354 354 // Fall back to default parser -
code/branches/levelElias/src/libraries/util/CMakeLists.txt
r8858 r9811 48 48 ${CEGUI_LIBRARY} 49 49 ${OGRE_LIBRARY} 50 ${Boost_SYSTEM_LIBRARY} 50 51 SOURCE_FILES 51 52 ${UTIL_SRC_FILES} -
code/branches/levelElias/src/modules/tetris/TetrisBrick.cc
r9667 r9811 54 54 { 55 55 RegisterObject(TetrisBrick); 56 this->shapeIndex_ = static_cast<unsigned int>(rnd(7.0f)); //<! random number between 0 and 756 this->shapeIndex_ = 1 + static_cast<unsigned int>(rnd(6.0f)); //<! random number between 0 and 7 57 57 this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones 58 58 this->delay_ = false;
Note: See TracChangeset
for help on using the changeset viewer.