Changeset 1059 for code/trunk
- Timestamp:
- Apr 14, 2008, 2:19:42 PM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 8 edited
-
src/core/CommandExecutor.cc (modified) (1 diff)
-
src/core/Identifier.cc (modified) (1 diff)
-
src/core/XMLPort.h (modified) (1 diff)
-
src/orxonox/CMakeLists.txt (modified) (1 diff)
-
visual_studio/base_properties.vsprops (modified) (1 diff)
-
visual_studio/vc8/core.vcproj (modified) (2 diffs)
-
visual_studio/vc8/tolua++.vcproj (modified) (2 diffs)
-
visual_studio/vc8/util.vcproj (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/core/CommandExecutor.cc
r1056 r1059 196 196 // return KeybindMode::onPress; 197 197 } 198 // FIXME: Had to insert a return statement 199 return (KeybindMode)0; 198 200 } 199 201 -
code/trunk/src/core/Identifier.cc
r1056 r1059 155 155 bool Identifier::isA(const Identifier* identifier) const 156 156 { 157 return (identifier == this || (this->parents_.find(identifier) != this-> children_->end()));157 return (identifier == this || (this->parents_.find(identifier) != this->parents_.end())); 158 158 } 159 159 -
code/trunk/src/core/XMLPort.h
r1057 r1059 96 96 class _CoreExport XMLPortParamContainer 97 97 { 98 public: 98 99 enum ParseResult 99 100 { -
code/trunk/src/orxonox/CMakeLists.txt
r1052 r1059 43 43 audio 44 44 network 45 # loader46 45 ) 47 46 -
code/trunk/visual_studio/base_properties.vsprops
r1024 r1059 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI" 12 12 WarningLevel="3" 13 DisableSpecificWarnings="4522;4251 "13 DisableSpecificWarnings="4522;4251;4800" 14 14 /> 15 15 <Tool -
code/trunk/visual_studio/vc8/core.vcproj
r1048 r1059 149 149 > 150 150 <File 151 RelativePath="..\..\src\orxonox\core\BaseObject.cc" 152 > 153 </File> 154 <File 155 RelativePath="..\..\src\orxonox\core\ClassTreeMask.cc" 156 > 157 </File> 158 <File 159 RelativePath="..\..\src\orxonox\core\ConfigValueContainer.cc" 160 > 161 </File> 162 <File 163 RelativePath="..\..\src\orxonox\core\DebugLevel.cc" 164 > 165 </File> 166 <File 167 RelativePath="..\..\src\orxonox\core\Error.cc" 168 > 169 </File> 170 <File 171 RelativePath="..\..\src\orxonox\core\Executor.cc" 172 > 173 </File> 174 <File 175 RelativePath="..\..\src\orxonox\core\Factory.cc" 176 > 177 </File> 178 <File 179 RelativePath="..\..\src\orxonox\core\Identifier.cc" 180 > 181 </File> 182 <File 183 RelativePath="..\..\src\orxonox\core\IdentifierDistributor.cc" 184 > 185 </File> 186 <File 187 RelativePath="..\..\src\orxonox\core\InputEventListener.cc" 188 > 189 </File> 190 <File 191 RelativePath="..\..\src\orxonox\core\InputHandler.cc" 192 > 193 </File> 194 <File 195 RelativePath="..\..\src\orxonox\core\InputManager.cc" 196 > 197 </File> 198 <File 199 RelativePath="..\..\src\orxonox\core\Language.cc" 200 > 201 </File> 202 <File 203 RelativePath="..\..\src\orxonox\core\Loader.cc" 204 > 205 </File> 206 <File 207 RelativePath="..\..\src\orxonox\core\MetaObjectList.cc" 208 > 209 </File> 210 <File 211 RelativePath="..\..\src\orxonox\core\OrxonoxClass.cc" 212 > 213 </File> 214 <File 215 RelativePath="..\..\src\orxonox\core\OutputHandler.cc" 216 > 217 </File> 218 <File 219 RelativePath="..\..\src\orxonox\core\Script.cc" 220 > 221 </File> 222 <File 223 RelativePath="..\..\src\orxonox\core\SignalHandler.cc" 224 > 225 </File> 226 <File 227 RelativePath="..\..\src\orxonox\core\Tickable.cc" 228 > 229 </File> 230 <File 231 RelativePath="..\..\src\orxonox\core\ToLuaBind.cc" 232 > 233 </File> 234 <File 235 RelativePath="..\..\src\orxonox\core\XMLPort.cc" 151 RelativePath="..\..\src\core\BaseObject.cc" 152 > 153 </File> 154 <File 155 RelativePath="..\..\src\core\ClassTreeMask.cc" 156 > 157 </File> 158 <File 159 RelativePath="..\..\src\core\CommandExecutor.cc" 160 > 161 </File> 162 <File 163 RelativePath="..\..\src\core\ConfigFileManager.cc" 164 > 165 </File> 166 <File 167 RelativePath="..\..\src\core\ConfigValueContainer.cc" 168 > 169 </File> 170 <File 171 RelativePath="..\..\src\core\CoreSettings.cc" 172 > 173 </File> 174 <File 175 RelativePath="..\..\src\core\Error.cc" 176 > 177 </File> 178 <File 179 RelativePath="..\..\src\core\Executor.cc" 180 > 181 </File> 182 <File 183 RelativePath="..\..\src\core\Factory.cc" 184 > 185 </File> 186 <File 187 RelativePath="..\..\src\core\Identifier.cc" 188 > 189 </File> 190 <File 191 RelativePath="..\..\src\core\IdentifierDistributor.cc" 192 > 193 </File> 194 <File 195 RelativePath="..\..\src\core\InputBuffer.cc" 196 > 197 </File> 198 <File 199 RelativePath="..\..\src\core\InputEventListener.cc" 200 > 201 </File> 202 <File 203 RelativePath="..\..\src\core\InputHandler.cc" 204 > 205 </File> 206 <File 207 RelativePath="..\..\src\core\InputManager.cc" 208 > 209 </File> 210 <File 211 RelativePath="..\..\src\core\Language.cc" 212 > 213 </File> 214 <File 215 RelativePath="..\..\src\core\Loader.cc" 216 > 217 </File> 218 <File 219 RelativePath="..\..\src\core\MetaObjectList.cc" 220 > 221 </File> 222 <File 223 RelativePath="..\..\src\core\Namespace.cc" 224 > 225 </File> 226 <File 227 RelativePath="..\..\src\core\NamespaceNode.cc" 228 > 229 </File> 230 <File 231 RelativePath="..\..\src\core\OrxonoxClass.cc" 232 > 233 </File> 234 <File 235 RelativePath="..\..\src\core\OutputHandler.cc" 236 > 237 </File> 238 <File 239 RelativePath="..\..\src\core\Script.cc" 240 > 241 </File> 242 <File 243 RelativePath="..\..\src\core\SignalHandler.cc" 244 > 245 </File> 246 <File 247 RelativePath="..\..\src\core\Tickable.cc" 248 > 249 </File> 250 <File 251 RelativePath="..\..\src\core\ToLuaBind.cc" 252 > 253 </File> 254 <File 255 RelativePath="..\..\src\core\XMLPort.cc" 236 256 > 237 257 </File> … … 243 263 > 244 264 <File 245 RelativePath="..\..\src\orxonox\core\BaseObject.h" 246 > 247 </File> 248 <File 249 RelativePath="..\..\src\orxonox\core\ClassFactory.h" 250 > 251 </File> 252 <File 253 RelativePath="..\..\src\orxonox\core\ClassManager.h" 254 > 255 </File> 256 <File 257 RelativePath="..\..\src\orxonox\core\ClassTreeMask.h" 258 > 259 </File> 260 <File 261 RelativePath="..\..\src\orxonox\core\ConfigValueContainer.h" 262 > 263 </File> 264 <File 265 RelativePath="..\..\src\orxonox\core\CoreIncludes.h" 266 > 267 </File> 268 <File 269 RelativePath="..\..\src\orxonox\core\CorePrereqs.h" 270 > 271 </File> 272 <File 273 RelativePath="..\..\src\orxonox\core\Debug.h" 274 > 275 </File> 276 <File 277 RelativePath="..\..\src\orxonox\core\DebugLevel.h" 278 > 279 </File> 280 <File 281 RelativePath="..\..\src\orxonox\core\Error.h" 282 > 283 </File> 284 <File 285 RelativePath="..\..\src\orxonox\core\Executor.h" 286 > 287 </File> 288 <File 289 RelativePath="..\..\src\orxonox\core\Factory.h" 290 > 291 </File> 292 <File 293 RelativePath="..\..\src\orxonox\core\Functor.h" 294 > 295 </File> 296 <File 297 RelativePath="..\..\src\orxonox\core\Identifier.h" 298 > 299 </File> 300 <File 301 RelativePath="..\..\src\orxonox\core\IdentifierDistributor.h" 302 > 303 </File> 304 <File 305 RelativePath="..\..\src\orxonox\core\InputEvent.h" 306 > 307 </File> 308 <File 309 RelativePath="..\..\src\orxonox\core\InputEventListener.h" 310 > 311 </File> 312 <File 313 RelativePath="..\..\src\orxonox\core\InputHandler.h" 314 > 315 </File> 316 <File 317 RelativePath="..\..\src\orxonox\core\InputManager.h" 318 > 319 </File> 320 <File 321 RelativePath="..\..\src\orxonox\core\Iterator.h" 322 > 323 </File> 324 <File 325 RelativePath="..\..\src\orxonox\core\Language.h" 326 > 327 </File> 328 <File 329 RelativePath="..\..\src\orxonox\core\Level.h" 330 > 331 </File> 332 <File 333 RelativePath="..\..\src\orxonox\core\Loader.h" 334 > 335 </File> 336 <File 337 RelativePath="..\..\src\orxonox\core\MetaObjectList.h" 338 > 339 </File> 340 <File 341 RelativePath="..\..\src\orxonox\core\ObjectList.h" 342 > 343 </File> 344 <File 345 RelativePath="..\..\src\orxonox\core\OrxonoxClass.h" 346 > 347 </File> 348 <File 349 RelativePath="..\..\src\orxonox\core\OutputHandler.h" 350 > 351 </File> 352 <File 353 RelativePath="..\..\src\orxonox\core\Script.h" 354 > 355 </File> 356 <File 357 RelativePath="..\..\src\orxonox\core\SignalHandler.h" 358 > 359 </File> 360 <File 361 RelativePath="..\..\src\orxonox\core\Tickable.h" 362 > 363 </File> 364 <File 365 RelativePath="..\..\src\orxonox\core\ToLuaBind.h" 366 > 367 </File> 368 <File 369 RelativePath="..\..\src\orxonox\core\XMLPort.h" 265 RelativePath="..\..\src\core\BaseObject.h" 266 > 267 </File> 268 <File 269 RelativePath="..\..\src\core\ClassFactory.h" 270 > 271 </File> 272 <File 273 RelativePath="..\..\src\core\ClassManager.h" 274 > 275 </File> 276 <File 277 RelativePath="..\..\src\core\ClassTreeMask.h" 278 > 279 </File> 280 <File 281 RelativePath="..\..\src\core\CommandExecutor.h" 282 > 283 </File> 284 <File 285 RelativePath="..\..\src\core\ConfigFileManager.h" 286 > 287 </File> 288 <File 289 RelativePath="..\..\src\core\ConfigValueContainer.h" 290 > 291 </File> 292 <File 293 RelativePath="..\..\src\core\ConfigValueIncludes.h" 294 > 295 </File> 296 <File 297 RelativePath="..\..\src\core\ConsoleCommand.h" 298 > 299 </File> 300 <File 301 RelativePath="..\..\src\core\CoreIncludes.h" 302 > 303 </File> 304 <File 305 RelativePath="..\..\src\core\CorePrereqs.h" 306 > 307 </File> 308 <File 309 RelativePath="..\..\src\core\CoreSettings.h" 310 > 311 </File> 312 <File 313 RelativePath="..\..\src\core\Debug.h" 314 > 315 </File> 316 <File 317 RelativePath="..\..\src\core\Error.h" 318 > 319 </File> 320 <File 321 RelativePath="..\..\src\core\Executor.h" 322 > 323 </File> 324 <File 325 RelativePath="..\..\src\core\Factory.h" 326 > 327 </File> 328 <File 329 RelativePath="..\..\src\core\Functor.h" 330 > 331 </File> 332 <File 333 RelativePath="..\..\src\core\Identifier.h" 334 > 335 </File> 336 <File 337 RelativePath="..\..\src\core\IdentifierDistributor.h" 338 > 339 </File> 340 <File 341 RelativePath="..\..\src\core\InputBuffer.h" 342 > 343 </File> 344 <File 345 RelativePath="..\..\src\core\InputEvent.h" 346 > 347 </File> 348 <File 349 RelativePath="..\..\src\core\InputEventListener.h" 350 > 351 </File> 352 <File 353 RelativePath="..\..\src\core\InputHandler.h" 354 > 355 </File> 356 <File 357 RelativePath="..\..\src\core\InputManager.h" 358 > 359 </File> 360 <File 361 RelativePath="..\..\src\core\Iterator.h" 362 > 363 </File> 364 <File 365 RelativePath="..\..\src\core\Language.h" 366 > 367 </File> 368 <File 369 RelativePath="..\..\src\core\Level.h" 370 > 371 </File> 372 <File 373 RelativePath="..\..\src\core\Loader.h" 374 > 375 </File> 376 <File 377 RelativePath="..\..\src\core\MetaObjectList.h" 378 > 379 </File> 380 <File 381 RelativePath="..\..\src\core\Namespace.h" 382 > 383 </File> 384 <File 385 RelativePath="..\..\src\core\NamespaceNode.h" 386 > 387 </File> 388 <File 389 RelativePath="..\..\src\core\ObjectList.h" 390 > 391 </File> 392 <File 393 RelativePath="..\..\src\core\OrxonoxClass.h" 394 > 395 </File> 396 <File 397 RelativePath="..\..\src\core\OutputHandler.h" 398 > 399 </File> 400 <File 401 RelativePath="..\..\src\core\Script.h" 402 > 403 </File> 404 <File 405 RelativePath="..\..\src\core\SignalHandler.h" 406 > 407 </File> 408 <File 409 RelativePath="..\..\src\core\Tickable.h" 410 > 411 </File> 412 <File 413 RelativePath="..\..\src\core\ToLuaBind.h" 414 > 415 </File> 416 <File 417 RelativePath="..\..\src\core\XMLPort.h" 370 418 > 371 419 </File> -
code/trunk/visual_studio/vc8/tolua++.vcproj
r1039 r1059 131 131 > 132 132 <File 133 RelativePath="..\..\src\ orxonox\core\tolua\tolua.c"133 RelativePath="..\..\src\util\tolua\tolua.c" 134 134 > 135 135 </File> 136 136 <File 137 RelativePath="..\..\src\ orxonox\core\tolua\tolua_bind.cc"137 RelativePath="..\..\src\util\tolua\tolua_event.c" 138 138 > 139 139 </File> 140 140 <File 141 RelativePath="..\..\src\ orxonox\core\tolua\tolua_event.c"141 RelativePath="..\..\src\util\tolua\tolua_is.c" 142 142 > 143 143 </File> 144 144 <File 145 RelativePath="..\..\src\ orxonox\core\tolua\tolua_is.c"145 RelativePath="..\..\src\util\tolua\tolua_map.c" 146 146 > 147 147 </File> 148 148 <File 149 RelativePath="..\..\src\ orxonox\core\tolua\tolua_map.c"149 RelativePath="..\..\src\util\tolua\tolua_push.c" 150 150 > 151 151 </File> 152 152 <File 153 RelativePath="..\..\src\ orxonox\core\tolua\tolua_push.c"153 RelativePath="..\..\src\util\tolua\tolua_to.c" 154 154 > 155 155 </File> 156 156 <File 157 RelativePath="..\..\src\orxonox\core\tolua\tolua_to.c" 158 > 159 </File> 160 <File 161 RelativePath="..\..\src\orxonox\core\tolua\toluabind.c" 157 RelativePath="..\..\src\util\tolua\toluabind.c" 162 158 > 163 159 </File> … … 169 165 > 170 166 <File 171 RelativePath="..\..\src\ orxonox\core\tolua\tolua++.h"167 RelativePath="..\..\src\util\tolua\tolua++.h" 172 168 > 173 169 </File> 174 170 <File 175 RelativePath="..\..\src\ orxonox\core\tolua\tolua_bind.h"171 RelativePath="..\..\src\util\tolua\tolua_event.h" 176 172 > 177 173 </File> 178 174 <File 179 RelativePath="..\..\src\ orxonox\core\tolua\tolua_event.h"175 RelativePath="..\..\src\util\tolua\toluabind.h" 180 176 > 181 177 </File> 182 178 <File 183 RelativePath="..\..\src\orxonox\core\tolua\toluabind.h" 184 > 185 </File> 186 <File 187 RelativePath="..\..\src\orxonox\core\tolua\toluabind_default.h" 179 RelativePath="..\..\src\util\tolua\toluabind_default.h" 188 180 > 189 181 </File> -
code/trunk/visual_studio/vc8/util.vcproj
r1024 r1059 153 153 </File> 154 154 <File 155 RelativePath="..\..\src\util\Clipboard.cc" 156 > 157 </File> 158 <File 155 159 RelativePath="..\..\src\util\Math.cc" 156 160 > … … 187 191 </File> 188 192 <File 193 RelativePath="..\..\src\util\Clipboard.h" 194 > 195 </File> 196 <File 189 197 RelativePath="..\..\src\util\Convert.h" 190 198 >
Note: See TracChangeset
for help on using the changeset viewer.
