|
|
|
@6499
|
19 years |
patrick |
removed the network branche
|
|
|
|
@6498
|
19 years |
patrick |
trunk: merged the network branche into the trunk
|
|
|
|
@6497
|
19 years |
bknecht |
Control: Helicoptercontrol updated
|
|
|
|
@6496
|
19 years |
bensch |
terrain loads hm from ResourceManager::gertFullName
|
|
|
|
@6495
|
19 years |
bensch |
terrain updated, so it can load a new HeightMap from an XML file
|
|
|
|
@6494
|
19 years |
bensch |
orxonox/branches/height_map: copy the heightMap to the trunk_merge-branche
|
|
|
|
@6493
|
19 years |
patrick |
network: playable creation fix
|
|
|
|
@6492
|
19 years |
bensch |
copy of the trunk to heightmap_merge
|
|
|
|
@6491
|
19 years |
bensch |
moved branches/avi-play-merge to branches/avi_play
|
|
|
|
@6490
|
19 years |
bensch |
deleted avi_play
|
|
|
|
@6489
|
19 years |
stefalie |
avi_play_merge: fastfactory works
|
|
|
|
@6488
|
19 years |
stefalie |
avi_play_merge: movie_entity added
|
|
|
|
@6487
|
19 years |
manuel |
moved pickup from spaceship to playable. playable can now pickup …
|
|
|
|
@6486
|
19 years |
bensch |
orxonox/branches/avi_play_merge: merged the trunk, commit for testing
|
|
|
|
@6485
|
19 years |
bknecht |
uint corrections
|
|
|
|
@6484
|
19 years |
bensch |
copy of the trunk for merging the avi_player into the trunk
|
|
|
|
@6483
|
19 years |
rennerc |
base_object.cc: fixed bug with sync
|
|
|
|
@6482
|
19 years |
bensch |
control: copy trunk again
|
|
|
|
@6481
|
19 years |
bensch |
delete
|
|
|
|
@6480
|
19 years |
bensch |
uint to unsigned int
|
|
|
|
@6479
|
19 years |
bensch |
new copy of the trunk
|
|
|
|
@6478
|
19 years |
bensch |
delete again
|
|
|
|
@6477
|
19 years |
bensch |
trunk: uint to unsigned int
|
|
|
|
@6476
|
19 years |
bensch |
branches: copied the trunk to spaceshipcontrol AGAIN
|
|
|
|
@6475
|
19 years |
bensch |
deleted branche/spaceshipcontrol
|
|
|
|
@6474
|
19 years |
bensch |
branches: created branche powerups as a copy of the trunk
|
|
|
|
@6473
|
19 years |
bensch |
delete branche powerups
|
|
|
|
@6472
|
19 years |
bottac |
Added Class Tile to HeightMap (allows a primitive LOD Implementation).
|
|
|
|
@6471
|
19 years |
bensch |
orxonox/trunk: testing, but not working
|
|
|
|
@6470
|
19 years |
bensch |
trunk some work on cubeMap
|
|
|
|
@6469
|
19 years |
rennerc |
space_ship: tried to implement control synchronization
entities will …
|
|
|
|
@6468
|
19 years |
bensch |
trunk: added localPlayer and SkyBox to state
|
|
|
|
@6467
|
19 years |
bensch |
orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager …
|
|
|
|
@6466
|
19 years |
patrick |
network: the spaceship spawning bug has been fixed, but no there is no …
|
|
|
|
@6465
|
19 years |
bensch |
trunk: texture prepared for others than GL_TETURE_2D
|
|
|
|
@6464
|
19 years |
patrick |
network: MultiPlayerWorld debug now switches between to playabilities. …
|
|
|
|
@6463
|
19 years |
patrick |
network: implemented a better debug function
|
|
|
|
@6462
|
19 years |
patrick |
network: work flush
|
|
|
|
@6461
|
19 years |
patrick |
network: changed the network synchronizeable design slighlty
|
|
|
|
@6460
|
19 years |
patrick |
network: skybox parenting fix
|
|
|
|
@6459
|
19 years |
patrick |
network: skybox parenting fix
|
|
|
|
@6458
|
19 years |
bensch |
orxonox/trunk: wave now also rebuilds the Normals (do not know if this …
|
|
|
|
@6457
|
19 years |
bensch |
water works
|
|
|
|
@6456
|
19 years |
bensch |
Water draws itself
|
|
|
|
@6455
|
19 years |
bensch |
trunk: Simple water surface WE
|
|
|
|
@6454
|
19 years |
bensch |
orxonox/trunk: changing the height of the Grid should work
|
|
|
|
@6453
|
19 years |
bensch |
trunk Vectors instead of floats used in VertexArrayModel
|
|
|
|
@6452
|
19 years |
bensch |
trunk: vertexArrayModel minor functionality update
|
|
|
|
@6451
|
19 years |
bensch |
branches: copy trunk to cd_merge
|
|
|
|
@6450
|
19 years |
bensch |
cd: correctness
|
|
|
|
@6449
|
19 years |
patrick |
cd: draw fix
|
|
|
|
@6448
|
19 years |
patrick |
collisiondetection: some small changes
|
|
|
|
@6447
|
19 years |
patrick |
collision: some more debug work on the collision detection framework
|
|
|
|
@6446
|
19 years |
bensch |
orxonox/trunk: added grid class
|
|
|
|
@6445
|
19 years |
bensch |
trunk: bars are nicer now
|
|
|
|
@6444
|
19 years |
bensch |
trunk: sliders get updated, as they should be
|
|
|
|
@6443
|
19 years |
bensch |
huge pipeline
|
|
|
|
@6442
|
19 years |
bensch |
Gui Shows weapons (simple)
|
|
|
|
@6441
|
19 years |
bensch |
orxonox/trunk: the Hud now scales the Widgets itself
|
|
|
|
@6440
|
19 years |
bensch |
orxonox/trunk: now the Widgets are only rendered within the HUD
|
|
|
|
@6439
|
19 years |
bensch |
trunk: WeaponSystem working again:
reverted the changed from revision …
|
|
|
|
@6438
|
19 years |
bensch |
trunk: widget war
|
|
|
|
@6437
|
19 years |
bensch |
trunk: added HUD definition and removed user_control
|
|
|
|
@6436
|
19 years |
bensch |
orxonox/trunk: collides with function now takes away the Energy of our …
|
|
|
|
@6435
|
19 years |
bensch |
orxonox/trunk: weapon tick is now the only tick functions of Weapon. …
|
|
|
|
@6434
|
19 years |
bensch |
orxonox/trunk: moved the projectiles to Projectiles
|
|
|
|
@6433
|
19 years |
bensch |
orxonox/trunk: the turret now fires too
|
|
|
|
@6432
|
19 years |
bensch |
orxonox/trunk: better build process: fake convenience lib through …
|
|
|
|
@6431
|
19 years |
bensch |
orxonox/trunk: projectile inherits Energies from WorldEntity
|
|
|
|
@6430
|
19 years |
bensch |
orxonox/trunk: Energy System on WorldEntity-level
|
|
|
|
@6429
|
19 years |
bensch |
branches: spaceshipcontrol: added as copy of the trunk again
|
|
|
|
@6428
|
19 years |
bensch |
branches: copied the trunk again to network
|
|
|
|
@6427
|
19 years |
bensch |
branches: deleted branche spaceshipcontrol
reason: merged into the trunk
|
|
|
|
@6426
|
19 years |
bensch |
orxonox/trunk: merged the spaceshipcontrol branche back to the trunk
…
|
|
|
|
@6425
|
19 years |
bensch |
deleted branche network
reason: merged to the trunk
|
|
|
|
@6424
|
19 years |
bensch |
orxonox/trunk: merged the branche network back to the trunk
merged …
|
|
|
|
@6423
|
19 years |
bensch |
trunk: staticModel now uses vector instead of tArray (more portable)
|
|
|
|
@6422
|
19 years |
rennerc |
|
|
|
|
@6421
|
19 years |
rennerc |
ParamPowerUp now syncs state correctly
fixed a bug in worldEntity
|
|
|
|
@6420
|
19 years |
rennerc |
tried to place ParamPowerUp
|
|
|
|
@6419
|
19 years |
rennerc |
some more entities should sync now
|
|
|
|
@6418
|
19 years |
bensch |
network: scaling: warn instead of just set to 1.0 if the value of …
|
|
|
|
@6417
|
19 years |
bensch |
network: scale to ALLWAY 1
|
|
|
|
@6416
|
19 years |
bensch |
network: PNodes visible again
|
|
|
|
@6415
|
19 years |
bensch |
network: some debug functions
|
|
|
|
@6414
|
19 years |
rennerc |
|
|
|
|
@6413
|
19 years |
bensch |
better includeds
|
|
|
|
@6412
|
19 years |
bensch |
ParamPowerUp is now also loaded correctly
|
|
|
|
@6411
|
19 years |
bensch |
trunk: sync
|
|
|
|
@6410
|
19 years |
rennerc |
removed argp
|
|
|
|
@6409
|
19 years |
patrick |
network: the network loading now works again, couldn't test it over …
|
|
|
|
@6408
|
19 years |
patrick |
network: MultiPlayerWorld does load again
|
|
|
|
@6407
|
19 years |
patrick |
network: the worlds get loaded again in the new framework
|
|
|
|
@6406
|
19 years |
hdavid |
branches\avi_play: some cleanup
|
|
|
|
@6405
|
19 years |
bensch |
prefs: compile uint on windows (as unsigned int)
|
|
|
|
@6404
|
19 years |
patrick |
network: working on the last steps, completion is in reach. sadly the …
|
|
|
|
@6403
|
19 years |
rennerc |
argp.h tells you now if it is compiled as C or as C++ maybe this helps …
|
|
|
|
@6402
|
19 years |
patrick |
network: more modularity for the GameWorld: data and process are now …
|
|
|
|
@6401
|
19 years |
hdavid |
branches\avi_play
|
|
|
|
@6400
|
19 years |
rennerc |
|
|
|
|
