Changeset 2485 for code/branches/presentation/visual_studio
- Timestamp:
- Dec 16, 2008, 6:01:13 PM (16 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
-
code/branches/presentation/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/lua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/orxonox.vcproj
r2459 r2485 167 167 </File> 168 168 <File 169 RelativePath="..\..\src\orxonox\PawnManager.cc" 170 > 171 </File> 172 <File 169 173 RelativePath="..\..\src\orxonox\PlayerManager.cc" 170 174 > … … 210 214 </File> 211 215 <File 216 RelativePath="..\..\src\orxonox\objects\GlobalShader.cc" 217 > 218 </File> 219 <File 212 220 RelativePath="..\..\src\orxonox\objects\Level.cc" 213 221 > … … 247 255 RelativePath="..\..\src\orxonox\objects\worldentities\Backlight.cc" 248 256 > 249 <FileConfiguration250 Name="Debug|Win32"251 ExcludedFromBuild="true"252 >253 <Tool254 Name="VCCLCompilerTool"255 />256 </FileConfiguration>257 <FileConfiguration258 Name="Release|Win32"259 ExcludedFromBuild="true"260 >261 <Tool262 Name="VCCLCompilerTool"263 />264 </FileConfiguration>265 257 </File> 266 258 <File … … 282 274 <File 283 275 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.cc" 276 > 277 </File> 278 <File 279 RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.cc" 280 > 281 </File> 282 <File 283 RelativePath="..\..\src\orxonox\objects\worldentities\FadingBillboard.cc" 284 284 > 285 285 </File> … … 373 373 > 374 374 <File 375 RelativePath="..\..\src\orxonox\objects\infos\Bot.cc" 376 > 377 </File> 378 <File 379 RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.cc" 380 > 381 </File> 382 <File 375 383 RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.cc" 376 384 > … … 389 397 > 390 398 <File 399 RelativePath="..\..\src\orxonox\objects\controllers\AIController.cc" 400 > 401 </File> 402 <File 403 RelativePath="..\..\src\orxonox\objects\controllers\ArtificialController.cc" 404 > 405 </File> 406 <File 391 407 RelativePath="..\..\src\orxonox\objects\controllers\Controller.cc" 392 408 > … … 394 410 <File 395 411 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.cc" 412 > 413 </File> 414 <File 415 RelativePath="..\..\src\orxonox\objects\controllers\ScriptController.cc" 396 416 > 397 417 </File> … … 645 665 </File> 646 666 </Filter> 667 <Filter 668 Name="items" 669 > 670 <File 671 RelativePath="..\..\src\orxonox\objects\items\Engine.cc" 672 > 673 </File> 674 <File 675 RelativePath="..\..\src\orxonox\objects\items\Item.cc" 676 > 677 </File> 678 <File 679 RelativePath="..\..\src\orxonox\objects\items\MultiStateEngine.cc" 680 > 681 </File> 682 </Filter> 647 683 </Filter> 648 684 <Filter … … 659 695 <File 660 696 RelativePath="..\..\src\orxonox\tools\ParticleInterface.cc" 697 > 698 </File> 699 <File 700 RelativePath="..\..\src\orxonox\tools\Shader.cc" 661 701 > 662 702 </File> … … 755 795 </File> 756 796 <File 797 RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.cc" 798 > 799 </File> 800 <File 757 801 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.cc" 802 > 803 </File> 804 <File 805 RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.cc" 758 806 > 759 807 </File> … … 887 935 </File> 888 936 <File 937 RelativePath="..\..\src\orxonox\PawnManager.h" 938 > 939 </File> 940 <File 889 941 RelativePath="..\..\src\orxonox\PlayerManager.h" 890 942 > … … 910 962 </File> 911 963 <File 964 RelativePath="..\..\src\orxonox\objects\GlobalShader.h" 965 > 966 </File> 967 <File 912 968 RelativePath="..\..\src\orxonox\objects\Level.h" 913 969 > … … 966 1022 <File 967 1023 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.h" 1024 > 1025 </File> 1026 <File 1027 RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.h" 1028 > 1029 </File> 1030 <File 1031 RelativePath="..\..\src\orxonox\objects\worldentities\FadingBillboard.h" 968 1032 > 969 1033 </File> … … 1057 1121 > 1058 1122 <File 1123 RelativePath="..\..\src\orxonox\objects\infos\Bot.h" 1124 > 1125 </File> 1126 <File 1127 RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.h" 1128 > 1129 </File> 1130 <File 1131 RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.h" 1132 > 1133 </File> 1134 <File 1059 1135 RelativePath="..\..\src\orxonox\objects\infos\Info.h" 1060 1136 > … … 1069 1145 > 1070 1146 <File 1147 RelativePath="..\..\src\orxonox\objects\controllers\AIController.h" 1148 > 1149 </File> 1150 <File 1151 RelativePath="..\..\src\orxonox\objects\controllers\ArtificialController.h" 1152 > 1153 </File> 1154 <File 1071 1155 RelativePath="..\..\src\orxonox\objects\controllers\Controller.h" 1072 1156 > … … 1074 1158 <File 1075 1159 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.h" 1160 > 1161 </File> 1162 <File 1163 RelativePath="..\..\src\orxonox\objects\controllers\ScriptController.h" 1076 1164 > 1077 1165 </File> … … 1229 1317 </File> 1230 1318 </Filter> 1319 <Filter 1320 Name="items" 1321 > 1322 <File 1323 RelativePath="..\..\src\orxonox\objects\items\Engine.h" 1324 > 1325 </File> 1326 <File 1327 RelativePath="..\..\src\orxonox\objects\items\Item.h" 1328 > 1329 </File> 1330 <File 1331 RelativePath="..\..\src\orxonox\objects\items\MultiStateEngine.h" 1332 > 1333 </File> 1334 </Filter> 1231 1335 </Filter> 1232 1336 <Filter … … 1250 1354 </File> 1251 1355 <File 1356 RelativePath="..\..\src\orxonox\tools\Shader.h" 1357 > 1358 </File> 1359 <File 1252 1360 RelativePath="..\..\src\orxonox\tools\TextureGenerator.h" 1253 1361 > … … 1293 1401 </File> 1294 1402 <File 1403 RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.h" 1404 > 1405 </File> 1406 <File 1295 1407 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.h" 1408 > 1409 </File> 1410 <File 1411 RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.h" 1296 1412 > 1297 1413 </File> -
code/branches/presentation/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/toluagen.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/toluagen.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/presentation/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.