Changeset 2087 for code/trunk/visual_studio
- Timestamp:
- Nov 1, 2008, 7:04:09 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 37 edited
-
. (modified) (1 prop)
-
visual_studio/vc8/audio.vcproj (modified) (1 prop)
-
visual_studio/vc8/audio.vsprops (modified) (2 props)
-
visual_studio/vc8/base.vsprops (modified) (2 props)
-
visual_studio/vc8/ceguilua.vcproj (modified) (1 prop)
-
visual_studio/vc8/ceguilua.vsprops (modified) (2 props)
-
visual_studio/vc8/core.vcproj (modified) (8 diffs, 1 prop)
-
visual_studio/vc8/core.vsprops (modified) (2 props)
-
visual_studio/vc8/cpptcl.vcproj (modified) (1 prop)
-
visual_studio/vc8/cpptcl.vsprops (modified) (2 props)
-
visual_studio/vc8/debug.vsprops (modified) (2 props)
-
visual_studio/vc8/directories.vsprops (modified) (2 props)
-
visual_studio/vc8/lua.vcproj (modified) (1 prop)
-
visual_studio/vc8/lua.vsprops (modified) (2 props)
-
visual_studio/vc8/lua_static.vcproj (modified) (1 prop)
-
visual_studio/vc8/lua_static.vsprops (modified) (1 prop)
-
visual_studio/vc8/network.vcproj (modified) (12 diffs, 1 prop)
-
visual_studio/vc8/network.vsprops (modified) (1 diff, 2 props)
-
visual_studio/vc8/ois.vcproj (modified) (1 prop)
-
visual_studio/vc8/ois.vsprops (modified) (1 prop)
-
visual_studio/vc8/orxonox.vcproj (modified) (16 diffs, 1 prop)
-
visual_studio/vc8/orxonox.vcproj.user (modified) (1 prop)
-
visual_studio/vc8/orxonox.vsprops (modified) (2 diffs, 2 props)
-
visual_studio/vc8/orxonox_vc8.sln (modified) (2 props)
-
visual_studio/vc8/release.vsprops (modified) (2 props)
-
visual_studio/vc8/tinyxml.vcproj (modified) (2 props)
-
visual_studio/vc8/tinyxml.vsprops (modified) (2 props)
-
visual_studio/vc8/tolua.vcproj (modified) (1 prop)
-
visual_studio/vc8/tolua.vsprops (modified) (2 props)
-
visual_studio/vc8/tolua_static.vcproj (modified) (1 prop)
-
visual_studio/vc8/tolua_static.vsprops (modified) (1 prop)
-
visual_studio/vc8/toluagen.vcproj (modified) (2 props)
-
visual_studio/vc8/toluagen.vsprops (modified) (2 props)
-
visual_studio/vc8/toluagen_orxonox.vcproj (modified) (2 props)
-
visual_studio/vc8/toluagen_orxonox.vsprops (modified) (2 props)
-
visual_studio/vc8/util.vcproj (modified) (3 diffs, 1 prop)
-
visual_studio/vc8/util.vsprops (modified) (2 props)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/audio.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/audio.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/ceguilua.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed
/code/branches/ceguilua/visual_studio/ceguilua_properties.vsprops reverse-merged: 1804 /code/branches/objecthierarchy/visual_studio/vc8/ceguilua.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/core.vcproj
- Property svn:eol-style set to native
r1896 r2087 165 165 </File> 166 166 <File 167 RelativePath="..\..\src\core\Event.cc" 168 > 169 </File> 170 <File 167 171 RelativePath="..\..\src\core\GameState.cc" 168 172 > … … 173 177 </File> 174 178 <File 179 RelativePath="..\..\src\core\LuaBind.cc" 180 > 181 </File> 182 <File 175 183 RelativePath="..\..\src\core\OrxonoxClass.cc" 176 184 > … … 181 189 </File> 182 190 <File 183 RelativePath="..\..\src\core\Script.cc" 191 RelativePath="..\..\src\core\Template.cc" 192 > 193 </File> 194 <File 195 RelativePath="..\..\src\core\XMLNameListener.cc" 184 196 > 185 197 </File> … … 397 409 </File> 398 410 <File 411 RelativePath="..\..\src\core\Event.h" 412 > 413 </File> 414 <File 415 RelativePath="..\..\src\core\EventIncludes.h" 416 > 417 </File> 418 <File 399 419 RelativePath="..\..\src\core\GameState.h" 400 420 > … … 405 425 </File> 406 426 <File 427 RelativePath="..\..\src\core\LuaBind.h" 428 > 429 </File> 430 <File 407 431 RelativePath="..\..\src\core\OrxonoxClass.h" 408 432 > … … 413 437 </File> 414 438 <File 415 RelativePath="..\..\src\core\Script.h"416 >417 </File>418 <File419 439 RelativePath="..\..\src\core\Super.h" 420 440 > 421 441 </File> 422 442 <File 443 RelativePath="..\..\src\core\Template.h" 444 > 445 </File> 446 <File 423 447 RelativePath="..\..\src\core\XMLIncludes.h" 424 448 > 425 449 </File> 450 <File 451 RelativePath="..\..\src\core\XMLNameListener.h" 452 > 453 </File> 426 454 <Filter 427 455 Name="input" … … 596 624 </File> 597 625 <File 598 RelativePath="..\..\src\core\Level.h"599 >600 </File>601 <File602 626 RelativePath="..\..\src\core\Loader.h" 603 627 > … … 609 633 <File 610 634 RelativePath="..\..\src\core\NamespaceNode.h" 635 > 636 </File> 637 <File 638 RelativePath="..\..\src\core\XMLFile.h" 611 639 > 612 640 </File> -
code/trunk/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/core.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/cpptcl.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/cpptcl.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/debug.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/directories.vsprops (added) merged: 2017-2018,2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/lua.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/lua.vsprops
- Property svn:mergeinfo changed
/code/branches/ceguilua/visual_studio/lua_properties.vsprops reverse-merged: 1804 /code/branches/objecthierarchy/visual_studio/vc8/lua.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/lua_static.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/lua_static.vsprops
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/network.vcproj
- Property svn:eol-style set to native
r1909 r2087 18 18 <Configuration 19 19 Name="Debug|Win32" 20 ConfigurationType=" 4"20 ConfigurationType="2" 21 21 InheritedPropertySheets=".\debug.vsprops;.\network.vsprops" 22 22 CharacterSet="1" … … 50 50 /> 51 51 <Tool 52 Name="VCLi brarianTool"52 Name="VCLinkerTool" 53 53 /> 54 54 <Tool … … 56 56 /> 57 57 <Tool 58 Name="VCManifestTool" 59 /> 60 <Tool 58 61 Name="VCXDCMakeTool" 59 62 /> … … 63 66 <Tool 64 67 Name="VCFxCopTool" 68 /> 69 <Tool 70 Name="VCAppVerifierTool" 71 /> 72 <Tool 73 Name="VCWebDeploymentTool" 65 74 /> 66 75 <Tool … … 70 79 <Configuration 71 80 Name="Release|Win32" 72 ConfigurationType=" 4"81 ConfigurationType="2" 73 82 InheritedPropertySheets=".\release.vsprops;.\network.vsprops" 74 83 CharacterSet="1" … … 103 112 /> 104 113 <Tool 105 Name="VCLi brarianTool"114 Name="VCLinkerTool" 106 115 /> 107 116 <Tool … … 109 118 /> 110 119 <Tool 120 Name="VCManifestTool" 121 /> 122 <Tool 111 123 Name="VCXDCMakeTool" 112 124 /> … … 116 128 <Tool 117 129 Name="VCFxCopTool" 130 /> 131 <Tool 132 Name="VCAppVerifierTool" 133 /> 134 <Tool 135 Name="VCWebDeploymentTool" 118 136 /> 119 137 <Tool … … 131 149 > 132 150 <File 151 RelativePath="..\..\src\network\ChatListener.cc" 152 > 153 </File> 154 <File 133 155 RelativePath="..\..\src\network\Client.cc" 134 156 > … … 136 158 <File 137 159 RelativePath="..\..\src\network\ClientConnection.cc" 160 > 161 </File> 162 <File 163 RelativePath="..\..\src\network\ClientConnectionListener.cc" 138 164 > 139 165 </File> … … 213 239 > 214 240 <File 241 RelativePath="..\..\src\network\ChatListener.h" 242 > 243 </File> 244 <File 215 245 RelativePath="..\..\src\network\Client.h" 216 246 > … … 218 248 <File 219 249 RelativePath="..\..\src\network\ClientConnection.h" 250 > 251 </File> 252 <File 253 RelativePath="..\..\src\network\ClientConnectionListener.h" 220 254 > 221 255 </File> -
code/trunk/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/network.vsprops (added) merged: 1918,2037,2040,2085 - Property svn:eol-style set to native
r1842 r2087 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 PreprocessorDefinitions=" ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD"11 PreprocessorDefinitions="NETWORK_SHARED_BUILD" 12 12 /> 13 13 <Tool - Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/ois.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/ois.vsprops
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/orxonox.vcproj
- Property svn:eol-style set to native
r1896 r2087 39 39 <Tool 40 40 Name="VCCLCompilerTool" 41 AdditionalOptions="/Zm200"42 41 /> 43 42 <Tool … … 103 102 <Tool 104 103 Name="VCCLCompilerTool" 105 AdditionalOptions="/Zm200"106 104 /> 107 105 <Tool … … 153 151 > 154 152 <File 153 RelativePath="..\..\src\orxonox\CameraManager.cc" 154 > 155 </File> 156 <File 155 157 RelativePath="..\..\src\orxonox\GraphicsEngine.cc" 158 > 159 </File> 160 <File 161 RelativePath="..\..\src\orxonox\LevelManager.cc" 156 162 > 157 163 </File> … … 184 190 > 185 191 </File> 186 <File187 RelativePath="..\..\src\orxonox\SignalHandler.cc"188 >189 </File>190 192 <Filter 191 193 Name="objects" 192 194 > 193 195 <File 194 RelativePath="..\..\src\orxonox\objects\Ambient.cc" 195 > 196 </File> 197 <File 198 RelativePath="..\..\src\orxonox\objects\Backlight.cc" 199 > 200 </File> 201 <File 202 RelativePath="..\..\src\orxonox\objects\BillboardProjectile.cc" 203 > 204 </File> 205 <File 206 RelativePath="..\..\src\orxonox\objects\Camera.cc" 207 > 208 </File> 209 <File 210 RelativePath="..\..\src\orxonox\objects\CameraHandler.cc" 211 > 212 </File> 213 <File 214 RelativePath="..\..\src\orxonox\objects\Model.cc" 215 > 216 </File> 217 <File 218 RelativePath="..\..\src\orxonox\objects\NPC.cc" 219 > 220 </File> 221 <File 222 RelativePath="..\..\src\orxonox\objects\ParticleProjectile.cc" 223 > 224 </File> 225 <File 226 RelativePath="..\..\src\orxonox\objects\ParticleSpawner.cc" 227 > 228 </File> 229 <File 230 RelativePath="..\..\src\orxonox\objects\Projectile.cc" 196 RelativePath="..\..\src\orxonox\objects\EventDispatcher.cc" 197 > 198 </File> 199 <File 200 RelativePath="..\..\src\orxonox\objects\EventListener.cc" 201 > 202 </File> 203 <File 204 RelativePath="..\..\src\orxonox\objects\EventTarget.cc" 231 205 > 232 206 </File> … … 234 208 RelativePath="..\..\src\orxonox\objects\Radar.cc" 235 209 > 236 <FileConfiguration237 Name="Debug|Win32"238 >239 <Tool240 Name="VCCLCompilerTool"241 ObjectFile="$(IntDir)\$(InputName)1.obj"242 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"243 />244 </FileConfiguration>245 <FileConfiguration246 Name="Release|Win32"247 >248 <Tool249 Name="VCCLCompilerTool"250 ObjectFile="$(IntDir)\$(InputName)1.obj"251 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"252 />253 </FileConfiguration>254 210 </File> 255 211 <File 256 212 RelativePath="..\..\src\orxonox\objects\RadarListener.cc" 257 213 > 258 <FileConfiguration259 Name="Debug|Win32"260 >261 <Tool262 Name="VCCLCompilerTool"263 ObjectFile="$(IntDir)\$(InputName)1.obj"264 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"265 />266 </FileConfiguration>267 <FileConfiguration268 Name="Release|Win32"269 >270 <Tool271 Name="VCCLCompilerTool"272 ObjectFile="$(IntDir)\$(InputName)1.obj"273 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"274 />275 </FileConfiguration>276 214 </File> 277 215 <File … … 280 218 </File> 281 219 <File 282 RelativePath="..\..\src\orxonox\objects\RotatingProjectile.cc" 283 > 284 </File> 285 <File 286 RelativePath="..\..\src\orxonox\objects\Skybox.cc" 287 > 288 </File> 289 <File 290 RelativePath="..\..\src\orxonox\objects\SpaceShip.cc" 291 > 292 </File> 293 <File 294 RelativePath="..\..\src\orxonox\objects\SpaceShipAI.cc" 220 RelativePath="..\..\src\orxonox\objects\Scene.cc" 221 > 222 </File> 223 <File 224 RelativePath="..\..\src\orxonox\objects\Script.cc" 225 > 226 </File> 227 <File 228 RelativePath="..\..\src\orxonox\objects\Test.cc" 295 229 > 296 230 </File> … … 299 233 > 300 234 </File> 301 <File 302 RelativePath="..\..\src\orxonox\objects\WorldEntity.cc" 303 > 304 </File> 235 <Filter 236 Name="worldentities" 237 > 238 <File 239 RelativePath="..\..\src\orxonox\objects\worldentities\Backlight.cc" 240 > 241 <FileConfiguration 242 Name="Debug|Win32" 243 ExcludedFromBuild="true" 244 > 245 <Tool 246 Name="VCCLCompilerTool" 247 /> 248 </FileConfiguration> 249 <FileConfiguration 250 Name="Release|Win32" 251 ExcludedFromBuild="true" 252 > 253 <Tool 254 Name="VCCLCompilerTool" 255 /> 256 </FileConfiguration> 257 </File> 258 <File 259 RelativePath="..\..\src\orxonox\objects\worldentities\Billboard.cc" 260 > 261 </File> 262 <File 263 RelativePath="..\..\src\orxonox\objects\worldentities\BlinkingBillboard.cc" 264 > 265 </File> 266 <File 267 RelativePath="..\..\src\orxonox\objects\worldentities\Camera.cc" 268 > 269 </File> 270 <File 271 RelativePath="..\..\src\orxonox\objects\worldentities\CameraPosition.cc" 272 > 273 </File> 274 <File 275 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.cc" 276 > 277 </File> 278 <File 279 RelativePath="..\..\src\orxonox\objects\worldentities\Light.cc" 280 > 281 </File> 282 <File 283 RelativePath="..\..\src\orxonox\objects\worldentities\Model.cc" 284 > 285 </File> 286 <File 287 RelativePath="..\..\src\orxonox\objects\worldentities\MovableEntity.cc" 288 > 289 </File> 290 <File 291 RelativePath="..\..\src\orxonox\objects\worldentities\ParticleEmitter.cc" 292 > 293 </File> 294 <File 295 RelativePath="..\..\src\orxonox\objects\worldentities\ParticleSpawner.cc" 296 > 297 </File> 298 <File 299 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.cc" 300 > 301 </File> 302 <File 303 RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.cc" 304 > 305 </File> 306 <File 307 RelativePath="..\..\src\orxonox\objects\worldentities\WorldEntity.cc" 308 > 309 </File> 310 <Filter 311 Name="pawns" 312 > 313 <File 314 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\Pawn.cc" 315 > 316 </File> 317 <File 318 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\SpaceShip.cc" 319 > 320 </File> 321 <File 322 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\Spectator.cc" 323 > 324 </File> 325 </Filter> 326 <Filter 327 Name="triggers" 328 > 329 <File 330 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\DistanceTrigger.cc" 331 > 332 </File> 333 <File 334 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\EventTrigger.cc" 335 > 336 </File> 337 <File 338 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\Trigger.cc" 339 > 340 </File> 341 </Filter> 342 </Filter> 343 <Filter 344 Name="gametypes" 345 > 346 <File 347 RelativePath="..\..\src\orxonox\objects\gametypes\Gametype.cc" 348 > 349 </File> 350 </Filter> 351 <Filter 352 Name="infos" 353 > 354 <File 355 RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.cc" 356 > 357 </File> 358 <File 359 RelativePath="..\..\src\orxonox\objects\infos\Info.cc" 360 > 361 </File> 362 <File 363 RelativePath="..\..\src\orxonox\objects\infos\Level.cc" 364 > 365 </File> 366 <File 367 RelativePath="..\..\src\orxonox\objects\infos\PlayerInfo.cc" 368 > 369 </File> 370 </Filter> 371 <Filter 372 Name="controllers" 373 > 374 <File 375 RelativePath="..\..\src\orxonox\objects\controllers\Controller.cc" 376 > 377 </File> 378 <File 379 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.cc" 380 > 381 </File> 382 </Filter> 305 383 </Filter> 306 384 <Filter … … 309 387 <File 310 388 RelativePath="..\..\src\orxonox\tools\BillboardSet.cc" 311 >312 </File>313 <File314 RelativePath="..\..\src\orxonox\tools\Light.cc"315 389 > 316 390 </File> … … 413 487 > 414 488 <File 489 RelativePath="..\..\src\orxonox\overlays\hud\ChatOverlay.cc" 490 > 491 </File> 492 <File 415 493 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.cc" 416 494 > … … 452 530 RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.cpp" 453 531 > 454 <FileConfiguration455 Name="Debug|Win32"456 >457 <Tool458 Name="VCCLCompilerTool"459 UsePrecompiledHeader="0"460 />461 </FileConfiguration>462 <FileConfiguration463 Name="Release|Win32"464 >465 <Tool466 Name="VCCLCompilerTool"467 UsePrecompiledHeader="0"468 />469 </FileConfiguration>470 532 </File> 471 533 <File 472 534 RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.cpp" 473 535 > 474 <FileConfiguration475 Name="Debug|Win32"476 >477 <Tool478 Name="VCCLCompilerTool"479 UsePrecompiledHeader="0"480 />481 </FileConfiguration>482 <FileConfiguration483 Name="Release|Win32"484 >485 <Tool486 Name="VCCLCompilerTool"487 UsePrecompiledHeader="0"488 />489 </FileConfiguration>490 536 </File> 491 537 <File 492 538 RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.cpp" 493 539 > 494 <FileConfiguration495 Name="Debug|Win32"496 >497 <Tool498 Name="VCCLCompilerTool"499 UsePrecompiledHeader="0"500 />501 </FileConfiguration>502 <FileConfiguration503 Name="Release|Win32"504 >505 <Tool506 Name="VCCLCompilerTool"507 UsePrecompiledHeader="0"508 />509 </FileConfiguration>510 540 </File> 511 541 </Filter> … … 557 587 > 558 588 <File 589 RelativePath="..\..\src\orxonox\CameraManager.h" 590 > 591 </File> 592 <File 559 593 RelativePath="..\..\src\orxonox\GraphicsEngine.h" 560 594 > 561 595 </File> 562 596 <File 597 RelativePath="..\..\src\orxonox\LevelManager.h" 598 > 599 </File> 600 <File 563 601 RelativePath="..\..\src\orxonox\OrxonoxPrereqs.h" 564 602 > … … 572 610 > 573 611 </File> 574 <File575 RelativePath="..\..\src\orxonox\SignalHandler.h"576 >577 </File>578 612 <Filter 579 613 Name="objects" 580 614 > 581 615 <File 582 RelativePath="..\..\src\orxonox\objects\Ambient.h" 583 > 584 </File> 585 <File 586 RelativePath="..\..\src\orxonox\objects\Backlight.h" 587 > 588 </File> 589 <File 590 RelativePath="..\..\src\orxonox\objects\BillboardProjectile.h" 591 > 592 </File> 593 <File 594 RelativePath="..\..\src\orxonox\objects\Camera.h" 595 > 596 </File> 597 <File 598 RelativePath="..\..\src\orxonox\objects\CameraHandler.h" 599 > 600 </File> 601 <File 602 RelativePath="..\..\src\orxonox\objects\Model.h" 603 > 604 </File> 605 <File 606 RelativePath="..\..\src\orxonox\objects\NPC.h" 607 > 608 </File> 609 <File 610 RelativePath="..\..\src\orxonox\objects\ParticleProjectile.h" 611 > 612 </File> 613 <File 614 RelativePath="..\..\src\orxonox\objects\ParticleSpawner.h" 615 > 616 </File> 617 <File 618 RelativePath="..\..\src\orxonox\objects\Projectile.h" 616 RelativePath="..\..\src\orxonox\objects\EventDispatcher.h" 617 > 618 </File> 619 <File 620 RelativePath="..\..\src\orxonox\objects\EventListener.h" 621 > 622 </File> 623 <File 624 RelativePath="..\..\src\orxonox\objects\EventTarget.h" 619 625 > 620 626 </File> … … 632 638 </File> 633 639 <File 634 RelativePath="..\..\src\orxonox\objects\RotatingProjectile.h" 635 > 636 </File> 637 <File 638 RelativePath="..\..\src\orxonox\objects\Skybox.h" 639 > 640 </File> 641 <File 642 RelativePath="..\..\src\orxonox\objects\SpaceShip.h" 643 > 644 </File> 645 <File 646 RelativePath="..\..\src\orxonox\objects\SpaceShipAI.h" 640 RelativePath="..\..\src\orxonox\objects\Scene.h" 641 > 642 </File> 643 <File 644 RelativePath="..\..\src\orxonox\objects\Script.h" 645 > 646 </File> 647 <File 648 RelativePath="..\..\src\orxonox\objects\Test.h" 647 649 > 648 650 </File> … … 651 653 > 652 654 </File> 653 <File 654 RelativePath="..\..\src\orxonox\objects\WorldEntity.h" 655 > 656 </File> 655 <Filter 656 Name="worldentities" 657 > 658 <File 659 RelativePath="..\..\src\orxonox\objects\worldentities\Backlight.h" 660 > 661 </File> 662 <File 663 RelativePath="..\..\src\orxonox\objects\worldentities\Billboard.h" 664 > 665 </File> 666 <File 667 RelativePath="..\..\src\orxonox\objects\worldentities\BlinkingBillboard.h" 668 > 669 </File> 670 <File 671 RelativePath="..\..\src\orxonox\objects\worldentities\Camera.h" 672 > 673 </File> 674 <File 675 RelativePath="..\..\src\orxonox\objects\worldentities\CameraPosition.h" 676 > 677 </File> 678 <File 679 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.h" 680 > 681 </File> 682 <File 683 RelativePath="..\..\src\orxonox\objects\worldentities\Light.h" 684 > 685 </File> 686 <File 687 RelativePath="..\..\src\orxonox\objects\worldentities\Model.h" 688 > 689 </File> 690 <File 691 RelativePath="..\..\src\orxonox\objects\worldentities\MovableEntity.h" 692 > 693 </File> 694 <File 695 RelativePath="..\..\src\orxonox\objects\worldentities\ParticleEmitter.h" 696 > 697 </File> 698 <File 699 RelativePath="..\..\src\orxonox\objects\worldentities\ParticleSpawner.h" 700 > 701 </File> 702 <File 703 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.h" 704 > 705 </File> 706 <File 707 RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.h" 708 > 709 </File> 710 <File 711 RelativePath="..\..\src\orxonox\objects\worldentities\WorldEntity.h" 712 > 713 </File> 714 <Filter 715 Name="pawns" 716 > 717 <File 718 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\Pawn.h" 719 > 720 </File> 721 <File 722 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\SpaceShip.h" 723 > 724 </File> 725 <File 726 RelativePath="..\..\src\orxonox\objects\worldentities\pawns\Spectator.h" 727 > 728 </File> 729 </Filter> 730 <Filter 731 Name="triggers" 732 > 733 <File 734 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\DistanceTrigger.h" 735 > 736 </File> 737 <File 738 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\EventTrigger.h" 739 > 740 </File> 741 <File 742 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\Trigger.h" 743 > 744 </File> 745 </Filter> 746 </Filter> 747 <Filter 748 Name="gametypes" 749 > 750 <File 751 RelativePath="..\..\src\orxonox\objects\gametypes\Gametype.h" 752 > 753 </File> 754 </Filter> 755 <Filter 756 Name="infos" 757 > 758 <File 759 RelativePath="..\..\src\orxonox\objects\infos\Info.h" 760 > 761 </File> 762 <File 763 RelativePath="..\..\src\orxonox\objects\infos\Level.h" 764 > 765 </File> 766 <File 767 RelativePath="..\..\src\orxonox\objects\infos\PlayerInfo.h" 768 > 769 </File> 770 </Filter> 771 <Filter 772 Name="controllers" 773 > 774 <File 775 RelativePath="..\..\src\orxonox\objects\controllers\Controller.h" 776 > 777 </File> 778 <File 779 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.h" 780 > 781 </File> 782 </Filter> 657 783 </Filter> 658 784 <Filter … … 664 790 </File> 665 791 <File 666 RelativePath="..\..\src\orxonox\tools\Light.h"667 >668 </File>669 <File670 792 RelativePath="..\..\src\orxonox\tools\Mesh.h" 671 793 > … … 714 836 Name="hud" 715 837 > 838 <File 839 RelativePath="..\..\src\orxonox\overlays\hud\ChatOverlay.h" 840 > 841 </File> 716 842 <File 717 843 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.h" -
code/trunk/visual_studio/vc8/orxonox.vcproj.user
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/orxonox.vsprops (added) merged: 1918,2013,2037,2040,2085 - Property svn:eol-style set to native
r1897 r2087 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalOptions="/MP2 "11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS; NETWORK_STATIC_BUILD;LUA_BUILD_AS_DLL"10 AdditionalOptions="/MP2 /Zm200" 11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;ORXONOX_ENABLE_PCH;LUA_BUILD_AS_DLL" 12 12 UsePrecompiledHeader="2" 13 13 PrecompiledHeaderThrough="OrxonoxStableHeaders.h" … … 22 22 Name="VCPostBuildEventTool" 23 23 Description="Copying files from init folder..." 24 CommandLine="for %%a in ($(RootDir)\init\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A >nul "24 CommandLine="for %%a in ($(RootDir)\init\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A >nul
" 25 25 /> 26 26 </VisualStudioPropertySheet> - Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/orxonox_vc8.sln (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/release.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/tinyxml.vcproj (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/tinyxml.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/tolua.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/tolua.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/tolua_static.vcproj
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/tolua_static.vsprops
- Property svn:eol-style set to native
-
code/trunk/visual_studio/vc8/toluagen.vcproj
- Property svn:mergeinfo changed
/code/branches/gui/visual_studio/vc8/tolua_gen.vcproj reverse-merged: 1638 /code/branches/objecthierarchy/visual_studio/vc8/toluagen.vcproj (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/toluagen.vsprops
- Property svn:mergeinfo changed
/code/branches/gui/visual_studio/tolua_gen_properties.vsprops reverse-merged: 1638 /code/branches/objecthierarchy/visual_studio/vc8/toluagen.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/toluagen_orxonox.vcproj
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/toluagen_orxonox.vcproj (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/toluagen_orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/toluagen_orxonox.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/vc8/util.vcproj
- Property svn:eol-style set to native
r1841 r2087 181 181 </File> 182 182 <File 183 RelativePath="..\..\src\util\SignalHandler.cc" 184 > 185 </File> 186 <File 183 187 RelativePath="..\..\src\util\String.cc" 184 188 > … … 227 231 </File> 228 232 <File 233 RelativePath="..\..\src\util\MathConvert.h" 234 > 235 </File> 236 <File 229 237 RelativePath="..\..\src\util\MultiType.h" 230 238 > … … 244 252 <File 245 253 RelativePath="..\..\src\util\OutputHandler.h" 254 > 255 </File> 256 <File 257 RelativePath="..\..\src\util\SignalHandler.h" 246 258 > 247 259 </File> -
code/trunk/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed
/code/branches/objecthierarchy/visual_studio/vc8/util.vsprops (added) merged: 2037,2040,2085 - Property svn:eol-style set to native
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
