Changeset 756
- Timestamp:
- Dec 31, 2007, 10:58:16 AM (16 years ago)
- Location:
- code/branches/FICN_test
- Files:
-
- 3 added
- 3 deleted
- 9 edited
-
src/orxonox/Orxonox.cc (modified) (1 diff)
-
src/orxonox/objects/Explosion.h (modified) (1 diff)
-
src/orxonox/objects/Fighter.cc (modified) (1 diff)
-
src/orxonox/objects/Model.h (modified) (1 diff)
-
src/orxonox/objects/Projectile.h (modified) (1 diff)
-
src/orxonox/objects/SpaceShip.h (modified) (1 diff)
-
src/orxonox/objects/WorldEntity.h (modified) (1 diff)
-
visual_studio/FICN.sln (deleted)
-
visual_studio/FICN_test.sln (added)
-
visual_studio/benixonox.vcproj (modified) (8 diffs)
-
visual_studio/loader.vcproj (modified) (1 diff)
-
visual_studio/tinyxml.vcproj (deleted)
-
visual_studio/tinyxml_properties.vsprops (deleted)
-
visual_studio/util.vcproj (added)
-
visual_studio/util_properties.vsprops (added)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN_test/src/orxonox/Orxonox.cc
r748 r756 70 70 #include "core/Debug.h" 71 71 #include "hud/HUD.h" 72 #include "objects/weapon _system/BulletManager.h"72 #include "objects/weapon/BulletManager.h" 73 73 #include "GraphicsEngine.h" 74 74 -
code/branches/FICN_test/src/orxonox/objects/Explosion.h
r729 r756 5 5 6 6 #include "WorldEntity.h" 7 #include " Timer.h"7 #include "../tools/Timer.h" 8 8 9 9 namespace orxonox -
code/branches/FICN_test/src/orxonox/objects/Fighter.cc
r742 r756 38 38 #include "../Orxonox.h" 39 39 #include "../particle/ParticleInterface.h" 40 #include "weapon _system/AmmunitionDump.h"41 #include "weapon _system/BarrelGun.h"40 #include "weapon/AmmunitionDump.h" 41 #include "weapon/BarrelGun.h" 42 42 43 43 #include "Fighter.h" -
code/branches/FICN_test/src/orxonox/objects/Model.h
r729 r756 5 5 6 6 #include "WorldEntity.h" 7 #include " Mesh.h"7 #include "../tools/Mesh.h" 8 8 9 9 class TiXmlElement; // Forward declaration -
code/branches/FICN_test/src/orxonox/objects/Projectile.h
r729 r756 5 5 6 6 #include "WorldEntity.h" 7 #include " BillboardSet.h"8 #include " Timer.h"7 #include "../tools/BillboardSet.h" 8 #include "../tools/Timer.h" 9 9 10 10 namespace orxonox -
code/branches/FICN_test/src/orxonox/objects/SpaceShip.h
r736 r756 8 8 9 9 #include "Model.h" 10 #include " BillboardSet.h"10 #include "../tools/BillboardSet.h" 11 11 12 12 class TiXmlElement; // Forward declaration -
code/branches/FICN_test/src/orxonox/objects/WorldEntity.h
r742 r756 13 13 #include "orxonox/core/BaseObject.h" 14 14 #include "Tickable.h" 15 #include " Mesh.h"15 #include "../tools/Mesh.h" 16 16 17 17 namespace orxonox -
code/branches/FICN_test/visual_studio/benixonox.vcproj
r733 r756 197 197 </File> 198 198 <File 199 RelativePath="..\src\orxonox\objects\BillboardSet.cc"200 >201 </File>202 <File203 199 RelativePath="..\src\orxonox\objects\Camera.cc" 204 200 > … … 213 209 </File> 214 210 <File 215 RelativePath="..\src\orxonox\objects\Light.cc"216 >217 </File>218 <File219 RelativePath="..\src\orxonox\objects\Mesh.cc"220 >221 </File>222 <File223 211 RelativePath="..\src\orxonox\objects\Model.cc" 224 212 > … … 245 233 </File> 246 234 <Filter 247 Name="weapon _system"248 > 249 <File 250 RelativePath="..\src\orxonox\objects\weapon _system\AmmunitionDump.cc"251 > 252 </File> 253 <File 254 RelativePath="..\src\orxonox\objects\weapon _system\BarrelGun.cc"255 > 256 </File> 257 <File 258 RelativePath="..\src\orxonox\objects\weapon _system\BaseWeapon.cc"259 > 260 </File> 261 <File 262 RelativePath="..\src\orxonox\objects\weapon _system\Bullet.cc"263 > 264 </File> 265 <File 266 RelativePath="..\src\orxonox\objects\weapon _system\BulletManager.cc"267 > 268 </File> 269 <File 270 RelativePath="..\src\orxonox\objects\weapon _system\WeaponStation.cc"235 Name="weapon" 236 > 237 <File 238 RelativePath="..\src\orxonox\objects\weapon\AmmunitionDump.cc" 239 > 240 </File> 241 <File 242 RelativePath="..\src\orxonox\objects\weapon\BarrelGun.cc" 243 > 244 </File> 245 <File 246 RelativePath="..\src\orxonox\objects\weapon\BaseWeapon.cc" 247 > 248 </File> 249 <File 250 RelativePath="..\src\orxonox\objects\weapon\Bullet.cc" 251 > 252 </File> 253 <File 254 RelativePath="..\src\orxonox\objects\weapon\BulletManager.cc" 255 > 256 </File> 257 <File 258 RelativePath="..\src\orxonox\objects\weapon\WeaponStation.cc" 271 259 > 272 260 </File> … … 278 266 <File 279 267 RelativePath="..\src\orxonox\particle\ParticleInterface.cc" 268 > 269 </File> 270 </Filter> 271 <Filter 272 Name="tools" 273 > 274 <File 275 RelativePath="..\src\orxonox\tools\BillboardSet.cc" 276 > 277 </File> 278 <File 279 RelativePath="..\src\orxonox\tools\Light.cc" 280 > 281 </File> 282 <File 283 RelativePath="..\src\orxonox\tools\Mesh.cc" 280 284 > 281 285 </File> … … 327 331 </File> 328 332 <File 329 RelativePath="..\src\orxonox\objects\BillboardSet.h"330 >331 </File>332 <File333 333 RelativePath="..\src\orxonox\objects\Camera.h" 334 334 > … … 343 343 </File> 344 344 <File 345 RelativePath="..\src\orxonox\objects\Light.h"346 >347 </File>348 <File349 RelativePath="..\src\orxonox\objects\Mesh.h"350 >351 </File>352 <File353 345 RelativePath="..\src\orxonox\objects\Model.h" 354 346 > … … 375 367 </File> 376 368 <File 377 RelativePath="..\src\orxonox\objects\Timer.h"378 >379 </File>380 <File381 369 RelativePath="..\src\orxonox\objects\WorldEntity.h" 382 370 > 383 371 </File> 384 372 <Filter 385 Name="weapon _system"386 > 387 <File 388 RelativePath="..\src\orxonox\objects\weapon _system\AmmunitionDump.h"389 > 390 </File> 391 <File 392 RelativePath="..\src\orxonox\objects\weapon _system\BarrelGun.h"393 > 394 </File> 395 <File 396 RelativePath="..\src\orxonox\objects\weapon _system\BaseWeapon.h"397 > 398 </File> 399 <File 400 RelativePath="..\src\orxonox\objects\weapon _system\Bullet.h"401 > 402 </File> 403 <File 404 RelativePath="..\src\orxonox\objects\weapon _system\BulletManager.h"405 > 406 </File> 407 <File 408 RelativePath="..\src\orxonox\objects\weapon _system\WeaponStation.h"373 Name="weapon" 374 > 375 <File 376 RelativePath="..\src\orxonox\objects\weapon\AmmunitionDump.h" 377 > 378 </File> 379 <File 380 RelativePath="..\src\orxonox\objects\weapon\BarrelGun.h" 381 > 382 </File> 383 <File 384 RelativePath="..\src\orxonox\objects\weapon\BaseWeapon.h" 385 > 386 </File> 387 <File 388 RelativePath="..\src\orxonox\objects\weapon\Bullet.h" 389 > 390 </File> 391 <File 392 RelativePath="..\src\orxonox\objects\weapon\BulletManager.h" 393 > 394 </File> 395 <File 396 RelativePath="..\src\orxonox\objects\weapon\WeaponStation.h" 409 397 > 410 398 </File> … … 420 408 </Filter> 421 409 <Filter 422 Name="misc" 423 > 424 <File 425 RelativePath="..\src\misc\ColourValue.h" 426 > 427 </File> 428 <File 429 RelativePath="..\src\misc\Math.h" 430 > 431 </File> 432 <File 433 RelativePath="..\src\misc\Matrix3.h" 434 > 435 </File> 436 <File 437 RelativePath="..\src\misc\Quaternion.h" 438 > 439 </File> 440 <File 441 RelativePath="..\src\misc\Sleep.h" 442 > 443 </File> 444 <File 445 RelativePath="..\src\misc\String2Number.h" 446 > 447 </File> 448 <File 449 RelativePath="..\src\misc\Tokenizer.h" 450 > 451 </File> 452 <File 453 RelativePath="..\src\misc\Vector2.h" 454 > 455 </File> 456 <File 457 RelativePath="..\src\misc\Vector3.h" 458 > 459 </File> 460 <File 461 RelativePath="..\src\misc\Vector4.h" 410 Name="tools" 411 > 412 <File 413 RelativePath="..\src\orxonox\tools\BillboardSet.h" 414 > 415 </File> 416 <File 417 RelativePath="..\src\orxonox\tools\Light.h" 418 > 419 </File> 420 <File 421 RelativePath="..\src\orxonox\tools\Mesh.h" 422 > 423 </File> 424 <File 425 RelativePath="..\src\orxonox\tools\Timer.h" 462 426 > 463 427 </File> -
code/branches/FICN_test/visual_studio/loader.vcproj
r729 r756 54 54 Name="VCLinkerTool" 55 55 AdditionalDependencies="OgreMain_d.lib Orxonox_d.lib" 56 OutputFile="$(OutDir)\$(ProjectName)_d.dll" 56 57 AdditionalLibraryDirectories="$(OutDir)" 57 58 />
Note: See TracChangeset
for help on using the changeset viewer.
