Changeset 2105 for code/trunk
- Timestamp:
- Nov 2, 2008, 12:54:45 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/core/CommandLine.cc
r2103 r2105 314 314 file.close(); 315 315 } 316 else317 {318 COUT(2) << "Warning: Could not find " << filename319 << " to get additional command line arguments." << std::endl;320 }321 316 322 317 try -
code/trunk/src/orxonox/objects/quest/AddQuest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "AddQuest.h" 31 29 32 #include <string> 30 31 33 #include "core/CoreIncludes.h" 32 34 #include "util/Exception.h" … … 34 36 #include "QuestManager.h" 35 37 #include "Quest.h" 36 #include "AddQuest.h"37 38 38 39 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/AddQuestHint.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "AddQuestHint.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" 31 34 32 #include "AddQuestHint.h"33 35 #include "QuestManager.h" 34 36 #include "QuestItem.h" -
code/trunk/src/orxonox/objects/quest/AddReward.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "AddReward.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 31 #include "AddReward.h"32 34 #include "Rewardable.h" 33 35 -
code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "ChangeQuestStatus.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 31 34 #include "QuestItem.h" 32 #include "ChangeQuestStatus.h"33 35 34 36 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/CompleteQuest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "CompleteQuest.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" … … 32 35 #include "QuestManager.h" 33 36 #include "Quest.h" 34 #include "CompleteQuest.h"35 37 36 38 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/FailQuest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "FailQuest.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" … … 32 35 #include "QuestManager.h" 33 36 #include "Quest.h" 34 #include "FailQuest.h"35 37 36 38 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/GlobalQuest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "GlobalQuest.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" 31 32 #include "GlobalQuest.h"33 34 34 35 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/LocalQuest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "LocalQuest.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" 31 32 #include "LocalQuest.h"33 34 34 35 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/Quest.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "Quest.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 31 #include "Quest.h"32 34 #include "QuestManager.h" 33 35 #include "QuestDescription.h" -
code/trunk/src/orxonox/objects/quest/QuestDescription.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "QuestDescription.h" 31 29 32 #include "core/CoreIncludes.h" 30 31 #include "QuestDescription.h"32 33 33 34 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/QuestEffect.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "QuestEffect.h" 31 29 32 #include "core/CoreIncludes.h" 30 31 #include "QuestEffect.h"32 33 33 34 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/QuestHint.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "QuestHint.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 #include "util/Exception.h" 31 34 32 35 #include "Quest.h" 33 #include "QuestHint.h"34 36 35 37 namespace orxonox { -
code/trunk/src/orxonox/objects/quest/QuestItem.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "QuestItem.h" 31 29 32 #include "core/CoreIncludes.h" 30 33 31 #include "QuestItem.h"32 34 #include "QuestDescription.h" 33 35 -
code/trunk/src/orxonox/objects/quest/QuestManager.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "QuestManager.h" 31 29 32 #include "core/CoreIncludes.h" 33 30 34 #include "util/Exception.h" 31 32 #include "QuestManager.h"33 35 #include "Quest.h" 34 36 #include "QuestHint.h" -
code/trunk/src/orxonox/objects/quest/Rewardable.cc
r2096 r2105 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h" 30 #include "Rewardable.h" 31 29 32 #include "core/CoreIncludes.h" 30 31 #include "Rewardable.h"32 33 33 34 namespace orxonox { -
code/trunk/visual_studio/vc8/orxonox.vcproj
r2087 r2105 233 233 > 234 234 </File> 235 <File 236 RelativePath="..\..\src\orxonox\objects\WeaponSystem.cc" 237 > 238 </File> 235 239 <Filter 236 240 Name="worldentities" … … 378 382 <File 379 383 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.cc" 384 > 385 </File> 386 </Filter> 387 <Filter 388 Name="weaponSystem" 389 > 390 <File 391 RelativePath="..\..\src\orxonox\objects\weaponSystem\Munition.cc" 392 > 393 </File> 394 <File 395 RelativePath="..\..\src\orxonox\objects\weaponSystem\Weapon.cc" 396 > 397 </File> 398 <File 399 RelativePath="..\..\src\orxonox\objects\weaponSystem\WeaponSet.cc" 400 > 401 </File> 402 <File 403 RelativePath="..\..\src\orxonox\objects\weaponSystem\WeaponSlot.cc" 404 > 405 </File> 406 <Filter 407 Name="munitions" 408 > 409 <File 410 RelativePath="..\..\src\orxonox\objects\weaponSystem\munitions\LaserGunMunition.cc" 411 > 412 <FileConfiguration 413 Name="Debug|Win32" 414 ExcludedFromBuild="true" 415 > 416 <Tool 417 Name="VCCLCompilerTool" 418 /> 419 </FileConfiguration> 420 <FileConfiguration 421 Name="Release|Win32" 422 ExcludedFromBuild="true" 423 > 424 <Tool 425 Name="VCCLCompilerTool" 426 /> 427 </FileConfiguration> 428 </File> 429 </Filter> 430 <Filter 431 Name="weapons" 432 > 433 <File 434 RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\LaserGun.cc" 435 > 436 <FileConfiguration 437 Name="Debug|Win32" 438 ExcludedFromBuild="true" 439 > 440 <Tool 441 Name="VCCLCompilerTool" 442 /> 443 </FileConfiguration> 444 <FileConfiguration 445 Name="Release|Win32" 446 ExcludedFromBuild="true" 447 > 448 <Tool 449 Name="VCCLCompilerTool" 450 /> 451 </FileConfiguration> 452 </File> 453 <File 454 RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\Missile.cc" 455 > 456 <FileConfiguration 457 Name="Debug|Win32" 458 ExcludedFromBuild="true" 459 > 460 <Tool 461 Name="VCCLCompilerTool" 462 /> 463 </FileConfiguration> 464 <FileConfiguration 465 Name="Release|Win32" 466 ExcludedFromBuild="true" 467 > 468 <Tool 469 Name="VCCLCompilerTool" 470 /> 471 </FileConfiguration> 472 </File> 473 </Filter> 474 <Filter 475 Name="projectiles" 476 > 477 <File 478 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\BillboardProjectile.cc" 479 > 480 <FileConfiguration 481 Name="Debug|Win32" 482 ExcludedFromBuild="true" 483 > 484 <Tool 485 Name="VCCLCompilerTool" 486 /> 487 </FileConfiguration> 488 <FileConfiguration 489 Name="Release|Win32" 490 ExcludedFromBuild="true" 491 > 492 <Tool 493 Name="VCCLCompilerTool" 494 /> 495 </FileConfiguration> 496 </File> 497 <File 498 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\ParticleProjectile.cc" 499 > 500 <FileConfiguration 501 Name="Debug|Win32" 502 ExcludedFromBuild="true" 503 > 504 <Tool 505 Name="VCCLCompilerTool" 506 /> 507 </FileConfiguration> 508 <FileConfiguration 509 Name="Release|Win32" 510 ExcludedFromBuild="true" 511 > 512 <Tool 513 Name="VCCLCompilerTool" 514 /> 515 </FileConfiguration> 516 </File> 517 <File 518 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\Projectile.cc" 519 > 520 <FileConfiguration 521 Name="Debug|Win32" 522 ExcludedFromBuild="true" 523 > 524 <Tool 525 Name="VCCLCompilerTool" 526 /> 527 </FileConfiguration> 528 <FileConfiguration 529 Name="Release|Win32" 530 ExcludedFromBuild="true" 531 > 532 <Tool 533 Name="VCCLCompilerTool" 534 /> 535 </FileConfiguration> 536 </File> 537 </Filter> 538 </Filter> 539 <Filter 540 Name="quest" 541 > 542 <File 543 RelativePath="..\..\src\orxonox\objects\quest\AddQuest.cc" 544 > 545 </File> 546 <File 547 RelativePath="..\..\src\orxonox\objects\quest\AddQuestHint.cc" 548 > 549 </File> 550 <File 551 RelativePath="..\..\src\orxonox\objects\quest\AddReward.cc" 552 > 553 </File> 554 <File 555 RelativePath="..\..\src\orxonox\objects\quest\ChangeQuestStatus.cc" 556 > 557 </File> 558 <File 559 RelativePath="..\..\src\orxonox\objects\quest\CompleteQuest.cc" 560 > 561 </File> 562 <File 563 RelativePath="..\..\src\orxonox\objects\quest\FailQuest.cc" 564 > 565 </File> 566 <File 567 RelativePath="..\..\src\orxonox\objects\quest\GlobalQuest.cc" 568 > 569 </File> 570 <File 571 RelativePath="..\..\src\orxonox\objects\quest\LocalQuest.cc" 572 > 573 </File> 574 <File 575 RelativePath="..\..\src\orxonox\objects\quest\Quest.cc" 576 > 577 </File> 578 <File 579 RelativePath="..\..\src\orxonox\objects\quest\QuestDescription.cc" 580 > 581 </File> 582 <File 583 RelativePath="..\..\src\orxonox\objects\quest\QuestEffect.cc" 584 > 585 </File> 586 <File 587 RelativePath="..\..\src\orxonox\objects\quest\QuestHint.cc" 588 > 589 </File> 590 <File 591 RelativePath="..\..\src\orxonox\objects\quest\QuestItem.cc" 592 > 593 </File> 594 <File 595 RelativePath="..\..\src\orxonox\objects\quest\QuestManager.cc" 596 > 597 </File> 598 <File 599 RelativePath="..\..\src\orxonox\objects\quest\Rewardable.cc" 380 600 > 381 601 </File> … … 653 873 > 654 874 </File> 875 <File 876 RelativePath="..\..\src\orxonox\objects\WeaponSystem.h" 877 > 878 </File> 655 879 <Filter 656 880 Name="worldentities" … … 780 1004 > 781 1005 </File> 1006 </Filter> 1007 <Filter 1008 Name="quest" 1009 > 1010 <File 1011 RelativePath="..\..\src\orxonox\objects\quest\AddQuest.h" 1012 > 1013 </File> 1014 <File 1015 RelativePath="..\..\src\orxonox\objects\quest\AddQuestHint.h" 1016 > 1017 </File> 1018 <File 1019 RelativePath="..\..\src\orxonox\objects\quest\AddReward.h" 1020 > 1021 </File> 1022 <File 1023 RelativePath="..\..\src\orxonox\objects\quest\ChangeQuestStatus.h" 1024 > 1025 </File> 1026 <File 1027 RelativePath="..\..\src\orxonox\objects\quest\CompleteQuest.h" 1028 > 1029 </File> 1030 <File 1031 RelativePath="..\..\src\orxonox\objects\quest\FailQuest.h" 1032 > 1033 </File> 1034 <File 1035 RelativePath="..\..\src\orxonox\objects\quest\GlobalQuest.h" 1036 > 1037 </File> 1038 <File 1039 RelativePath="..\..\src\orxonox\objects\quest\LocalQuest.h" 1040 > 1041 </File> 1042 <File 1043 RelativePath="..\..\src\orxonox\objects\quest\Quest.h" 1044 > 1045 </File> 1046 <File 1047 RelativePath="..\..\src\orxonox\objects\quest\QuestDescription.h" 1048 > 1049 </File> 1050 <File 1051 RelativePath="..\..\src\orxonox\objects\quest\QuestEffect.h" 1052 > 1053 </File> 1054 <File 1055 RelativePath="..\..\src\orxonox\objects\quest\QuestHint.h" 1056 > 1057 </File> 1058 <File 1059 RelativePath="..\..\src\orxonox\objects\quest\QuestItem.h" 1060 > 1061 </File> 1062 <File 1063 RelativePath="..\..\src\orxonox\objects\quest\QuestManager.h" 1064 > 1065 </File> 1066 <File 1067 RelativePath="..\..\src\orxonox\objects\quest\Rewardable.h" 1068 > 1069 </File> 1070 </Filter> 1071 <Filter 1072 Name="weaponSystem" 1073 > 1074 <File 1075 RelativePath="..\..\src\orxonox\objects\weaponSystem\Munition.h" 1076 > 1077 </File> 1078 <File 1079 RelativePath="..\..\src\orxonox\objects\weaponSystem\Weapon.h" 1080 > 1081 </File> 1082 <File 1083 RelativePath="..\..\src\orxonox\objects\weaponSystem\WeaponSet.h" 1084 > 1085 </File> 1086 <File 1087 RelativePath="..\..\src\orxonox\objects\weaponSystem\WeaponSlot.h" 1088 > 1089 </File> 1090 <Filter 1091 Name="weapons" 1092 > 1093 <File 1094 RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\LaserGun.h" 1095 > 1096 </File> 1097 <File 1098 RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\Missile.h" 1099 > 1100 </File> 1101 </Filter> 1102 <Filter 1103 Name="munitions" 1104 > 1105 <File 1106 RelativePath="..\..\src\orxonox\objects\weaponSystem\munitions\LaserGunMunition.h" 1107 > 1108 </File> 1109 </Filter> 1110 <Filter 1111 Name="projectiles" 1112 > 1113 <File 1114 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\BillboardProjectile.h" 1115 > 1116 </File> 1117 <File 1118 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\ParticleProjectile.h" 1119 > 1120 </File> 1121 <File 1122 RelativePath="..\..\src\orxonox\objects\weaponSystem\projectiles\Projectile.h" 1123 > 1124 </File> 1125 </Filter> 782 1126 </Filter> 783 1127 </Filter>
Note: See TracChangeset
for help on using the changeset viewer.