Changeset 6120
- Timestamp:
- Nov 22, 2009, 4:25:02 PM (15 years ago)
- Location:
- code/branches/presentation2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake
r5929 r6120 94 94 SET(_old_flags "") 95 95 ENDIF() 96 96 SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES COMPILE_FLAGS "${_old_flags} /FI\"${_pch_header_file}\" /Yu\"${_pch_header_file}\" /Fp\"${_pch_file}\"") 97 97 ENDIF(NOT _is_header) 98 98 ENDFOREACH(_file) … … 152 152 COMMAND ${CMAKE_CXX_COMPILER} 153 153 ARGS ${pchsupport_compiler_cxx_arg1} ${_pch_gcc_flags} -c -x c++-header -o ${_pch_file} ${_pch_header_file} 154 154 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} 155 155 DEPENDS ${_pch_dep_helper_file} 156 156 IMPLICIT_DEPENDS CXX ${_pch_header_file} -
code/branches/presentation2/cmake/SourceFileUtilities.cmake
r6084 r6120 75 75 IF(_compile AND NOT DISABLE_COMPILATIONS) 76 76 LIST(APPEND _compilation ${_filepath}) 77 77 LIST(APPEND _fullpath_sources "H") 78 78 ENDIF() 79 79 ENDIF() -
code/branches/presentation2/data/overlays/stats.oxo
r5781 r6120 6 6 name = "Title" 7 7 position = "0.79, 0.19" 8 pickpoint = "1, 1" 8 pickpoint = "1, 1" 9 9 font = "Monofur" 10 10 caption = "Scoreboard" … … 25 25 name = "descr2" 26 26 position = "0.6, 0.20" 27 pickpoint = "0, 1" 27 pickpoint = "0, 1" 28 28 font = "Monofur" 29 29 caption = "score" … … 34 34 name = "descr3" 35 35 position = "0.8, 0.20" 36 pickpoint = "0, 1" 36 pickpoint = "0, 1" 37 37 font = "Monofur" 38 38 caption = "deaths" -
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
r6119 r6120 41 41 namespace orxonox 42 42 { 43 CreateFactory(Rocket); 43 CreateFactory(Rocket); 44 44 // create the factory for the Rocket 45 45 … … 52 52 RegisterObject(Rocket);// - register the Rocket class to the core 53 53 54 54 this->localAngularVelocity_ = 0; 55 55 56 56 if (GameMode::isMaster()) -
code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
r6119 r6120 27 27 */ 28 28 29 #ifndef _NewNewHumanController_H__ 29 #ifndef _NewNewHumanController_H__ 30 30 #define _NewNewHumanController_H__ 31 31
Note: See TracChangeset
for help on using the changeset viewer.