Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 25, 2007, 3:05:01 AM (17 years ago)
Author:
patrick
Message:

merged playability. but got strange bug

Location:
branches/playability.new
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/playability.new

    • Property svn:ignore

      •  

        old new  
        1010autom4te.cache
        1111aclocal.m4
         12tags
         13test.bmp
         14config.sub
         15config.guess
         16OrxonoxPlayability.kdevses
         17OrxonoxPlayability.kdevelop.pcs

  • branches/playability.new/src/world_entities/WorldEntities.am

    r10321 r10362  
    1 
    21## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
    32WorldEntities_SOURCES_ = \
    … …  
    2322                world_entities/character_attributes.cc \
    2423                world_entities/test_entity.cc \
     24                world_entities/test_entity2.cc \
    2525                world_entities/planet.cc \
    2626                world_entities/bsp_entity.cc \
    … …  
    3939                world_entities/weapons/fps_sniper_rifle.cc \
    4040                world_entities/weapons/boomerang_gun.cc \
    41                 \
     41                world_entities/weapons/light_blaster.cc \
     42                world_entities/weapons/medium_blaster.cc \
     43                world_entities/weapons/heavy_blaster.cc \
     44                world_entities/weapons/swarm_launcher.cc \
     45                world_entities/weapons/spike_launcher.cc \
     46                world_entities/weapons/spike_thrower.cc \
     47                world_entities/weapons/acid_launcher.cc \
     48                \
     49                world_entities/projectiles/lbolt.cc \
     50                world_entities/projectiles/mbolt.cc \
     51                world_entities/projectiles/hbolt.cc \
     52                world_entities/projectiles/swarm_projectile.cc \
    4253                world_entities/projectiles/bomb.cc \
    4354                world_entities/projectiles/laser.cc \
    … …  
    4859                world_entities/projectiles/boomerang_projectile.cc \
    4960                world_entities/projectiles/hyperblast.cc \
     61                world_entities/projectiles/spike.cc \
     62                world_entities/projectiles/acid_splash.cc \
     63                \
     64                world_entities/projectiles/projectile_weapon.cc \
     65                world_entities/projectiles/spike_ball.cc \
    5066                \
    5167                world_entities/power_ups/turret_power_up.cc \
    … …  
    8399                world_entities/particles/box_emitter.cc \
    84100                world_entities/particles/plane_emitter.cc \
     101                world_entities/particles/emitter_node.cc \
    85102                \
    86103                world_entities/particles/particle_system.cc \
    … …  
    129146                character_attributes.h \
    130147                test_entity.h \
     148                test_entity2.h \
    131149                planet.h \
    132150                bsp_entity.h \
    … …  
    145163                weapons/aiming_system.h \
    146164                weapons/fps_sniper_rifle.h \
    147                 \
     165                weapons/light_blaster.h \
     166                weapons/medium_blaster.h \
     167                weapons/heavy_blaster.h \
     168                weapons/swarm_launcher.h \
     169                weapons/spike_launcher.h \
     170                weapons/spike_thrower.h \
     171                weapons/acid_launcher.h \
     172                \
     173                projectiles/lbolt.h \
     174                projectiles/mbolt.h \
     175                projectiles/hbolt.h \
     176                projectiles/swarm_projectile.h \
    148177                projectiles/bomb.h \
    149178                projectiles/laser.h \
    … …  
    154183                projectiles/boomerang_projectile.h \
    155184                projectiles/hyperblast.h \
     185                projectiles/spike.h \
     186                projectiles/spike_ball.h \
     187                projectiles/acid_splash.h \
     188                \
     189                projectiles/projectile_weapon.h \
     190                projectiles/spike_ball.h \
    156191                \
    157192                power_ups/turret_power_up.h \
    … …  
    188223                particles/box_emitter.h \
    189224                particles/plane_emitter.h \
     225                particles/emitter_node.h \
    190226                \
    191227                particles/particle_system.h \
    … …  
    209245                weather_effects/lense_flare.h
    210246
    211 
Note: See TracChangeset for help on using the changeset viewer.