Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/buildsystem3/src/orxonox @ 2682

Name Size Rev Age Author Last Change
../
tools 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
pch 2665   16 years rgrieder Manual merge.
overlays 2665   16 years rgrieder Manual merge.
objects 2671   16 years rgrieder Fixed build: - Two inline functions without inline body in …
gui 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
gamestates 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
Settings.h 2.2 KB 2171   16 years landauf merged revisions 2111-2170 from objecthierarchy branch back to trunk.
Settings.cc 2.5 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
PlayerManager.h 1.8 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
PlayerManager.cc 3.3 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
PawnManager.h 1.4 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
PawnManager.cc 1.9 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
OrxonoxPrereqs.h 6.2 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
orxonox.vcproj.user 1.2 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
Main.cc 4.6 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
LevelManager.h 1.7 KB 2171   16 years landauf merged revisions 2111-2170 from objecthierarchy branch back to trunk.
LevelManager.cc 2.7 KB 2171   16 years landauf merged revisions 2111-2170 from objecthierarchy branch back to trunk.
GraphicsEngine.h 3.0 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
GraphicsEngine.cc 2.7 KB 2662   16 years rgrieder Merged presentation branch back to trunk.
CMakeLists.txt 3.2 KB 2673   16 years rgrieder - Renamed some Cache variables - Hid some other (into the advanced …
CameraManager.h 1.9 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
CameraManager.cc 4.5 KB 2664   16 years rgrieder Merged buildsystem2 to buildsystem3. Note: Bare merge, just resolved …
Note: See TracBrowser for help on using the repository browser.