Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum
Timestamp:
May 24, 2012, 8:49:19 PM (12 years ago)
Author:
decapitb
Message:

tower defense update

Location:
code/branches/presentation2012
Files:
4 edited

  • code/branches/presentation2012

  • code/branches/presentation2012/data

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/datamergedeligible
      /code/branches/environment3/datamergedeligible
      /code/branches/formation/datamergedeligible
      /code/branches/gamecontent/datamergedeligible
      /code/branches/hud/datamergedeligible
      /code/branches/masterserverfix/datamergedeligible
      /code/branches/menue/datamergedeligible
      /code/branches/newlevel2012/datamergedeligible
      /code/branches/output/datamergedeligible
      /code/branches/pickup2012/datamergedeligible
      /code/branches/presentation/datamergedeligible
      /code/branches/presentation2011/datamergedeligible
      /code/branches/shipSelection/datamergedeligible
      /code/branches/sound2012/datamergedeligible
      /code/branches/spacegate/datamergedeligible
      /code/branches/spaceraceTwo/datamergedeligible
      /code/branches/surfaceRace/datamergedeligible
      /code/branches/usability/datamergedeligible
      /code/trunk/datamergedeligible
      /code/branches/ai/data6592-7033
      /code/branches/ai2/data8721-8880
      /code/branches/bigships/data8137-8588
      /code/branches/buildsystem/data1874-2276,​2278-2400
      /code/branches/buildsystem2/data2506-2658
      /code/branches/buildsystem3/data2662-2708
      /code/branches/ceguilua/data1802-1808
      /code/branches/chat/data6527-6797
      /code/branches/chat2/data6836-6910
      /code/branches/console/data5941-6104
      /code/branches/consolecommands2/data6451-7178
      /code/branches/consolecommands3/data7178-7283
      /code/branches/core3/data1572-1739
      /code/branches/core4/data3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data5768-5928,​6009
      /code/branches/data_cleanup/data7537-7686
      /code/branches/doc/data7290-7400
      /code/branches/dockingsystem/data8101-8192
      /code/branches/dynamicmatch/data6584-7030
      /code/branches/fps/data6591-7072
      /code/branches/gameimmersion/data8102-8577
      /code/branches/gamestate/data6430-6572,​6621-6661
      /code/branches/gamestates2/data6594-6745
      /code/branches/gametypes/data2826-3031
      /code/branches/gcc43/data1580
      /code/branches/gui/data1635-1723,​2795-2894
      /code/branches/hudelements/data6584-6941
      /code/branches/hudimprovements/data7920-8672
      /code/branches/ingamemenu/data6000-6023
      /code/branches/input/data1629-1636
      /code/branches/ipv6/data7293-7458
      /code/branches/kicklib/data7940-8096,​8098-8277
      /code/branches/kicklib2/data8282-8350
      /code/branches/lastmanstanding/data7479-7644
      /code/branches/lastmanstanding3/data7903-8175
      /code/branches/libraries/data5612-5692
      /code/branches/libraries2/data5703-5737
      /code/branches/lod/data6586-6911
      /code/branches/lodfinal/data2372-2411
      /code/branches/mac_osx/data7789-8128,​8135
      /code/branches/map/data2801-3086,​3089
      /code/branches/masterserver/data7502-7738
      /code/branches/menu/data5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data2754-2824
      /code/branches/netp2/data2835-2988
      /code/branches/netp3/data2988-3082
      /code/branches/netp6/data3214-3302
      /code/branches/network/data2356
      /code/branches/network2/data6434-6465
      /code/branches/network3/data7196-7344
      /code/branches/network4/data7497-7755
      /code/branches/network5/data7757-7781
      /code/branches/network6/data7823-8315
      /code/branches/network64/data2210-2355
      /code/branches/notifications/data7314-7401
      /code/branches/objecthierarchy/data1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data2171-2479
      /code/branches/ois_update/data7506-7788
      /code/branches/overlay/data2117-2385
      /code/branches/particles/data2829-3085
      /code/branches/particles2/data6050-6106,​6109
      /code/branches/pch/data3113-3194
      /code/branches/physics/data1912-2055,​2107-2439
      /code/branches/physics_merge/data2436-2457
      /code/branches/pickup/data8145-8555
      /code/branches/pickup2/data5942-6405
      /code/branches/pickup3/data6418-6523
      /code/branches/pickup4/data6594-6710
      /code/branches/pickups/data1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data2107-2497,​2915-3071
      /code/branches/png2/data7262-7263
      /code/branches/portals/data8087-8455
      /code/branches/portals2/data8460-8602
      /code/branches/ppspickups1/data6552-6708
      /code/branches/ppspickups2/data6527-6532,​6554-6709
      /code/branches/ppspickups3/data6757-6997
      /code/branches/ppspickups4/data7003-7089
      /code/branches/presentation2/data6106-6416,​7787-7800
      /code/branches/presentation3/data6913-7162
      /code/branches/questsystem/data1894-2088
      /code/branches/questsystem2/data2107-2259
      /code/branches/questsystem5/data2776-2905
      /code/branches/releasetodo/data7614-7647
      /code/branches/resource/data3327-3366
      /code/branches/resource2/data3372-5694
      /code/branches/rocket/data6523-6950
      /code/branches/rocket2/data6953-6970
      /code/branches/script_trigger/data1295-1953,​1955
      /code/branches/skybox2/data6559-6989
      /code/branches/sound/data2829-3010
      /code/branches/sound3/data5941-6102
      /code/branches/spaceboundaries/data8085-8457
      /code/branches/spaceboundaries2/data8460-8613
      /code/branches/spacerace/data8182-8630
      /code/branches/steering/data5949-6091,​8140-8595
      /code/branches/tetris/data8100-8563
      /code/branches/tutoriallevel/data7827-8370
      /code/branches/tutoriallevel2/data8370-8452
      /code/branches/tutoriallevel3/data8453-8636
      /code/branches/unity_build/data8440-8716
      /code/branches/weapon/data1925-2094
      /code/branches/weapon2/data2107-2488
      /code/branches/weapons/data2897-3051,​8143-8591
      /code/branches/weaponsystem/data2742-2890

  • code/branches/presentation2012/data/levels

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levelsmergedeligible
      /code/branches/environment3/data/levelsmergedeligible
      /code/branches/formation/data/levelsmergedeligible
      /code/branches/gamecontent/data/levelsmergedeligible
      /code/branches/hud/data/levelsmergedeligible
      /code/branches/masterserverfix/data/levelsmergedeligible
      /code/branches/menue/data/levelsmergedeligible
      /code/branches/newlevel2012/data/levelsmergedeligible
      /code/branches/output/data/levelsmergedeligible
      /code/branches/pickup2012/data/levelsmergedeligible
      /code/branches/presentation/data/levelsmergedeligible
      /code/branches/presentation2011/data/levelsmergedeligible
      /code/branches/shipSelection/data/levelsmergedeligible
      /code/branches/sound2012/data/levelsmergednon-inheritableeligible
      /code/branches/spacegate/data/levelsmergedeligible
      /code/branches/spaceraceTwo/data/levelsmergedeligible
      /code/branches/surfaceRace/data/levelsmergedeligible
      /code/branches/usability/data/levelsmergedeligible
      /code/trunk/data/levelsmergedeligible
      /code/branches/ai/data/levels6592-7033
      /code/branches/ai2/data/levels8721-8880
      /code/branches/bigships/data/levels8137-8588
      /code/branches/buildsystem/data/levels1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels2506-2658
      /code/branches/buildsystem3/data/levels2662-2708
      /code/branches/ceguilua/data/levels1802-1808
      /code/branches/chat/data/levels6527-6797
      /code/branches/chat2/data/levels6836-6910
      /code/branches/console/data/levels5941-6104
      /code/branches/consolecommands2/data/levels6451-7178
      /code/branches/consolecommands3/data/levels7178-7283
      /code/branches/core3/data/levels1572-1739
      /code/branches/core4/data/levels3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels5768-5928,​6009
      /code/branches/data_cleanup/data/levels7537-7686
      /code/branches/doc/data/levels7290-7400
      /code/branches/dockingsystem/data/levels8101-8192
      /code/branches/dynamicmatch/data/levels6584-7030
      /code/branches/fps/data/levels6591-7072
      /code/branches/gameimmersion/data/levels8102-8577
      /code/branches/gamestate/data/levels6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels6594-6745
      /code/branches/gametypes/data/levels2826-3031
      /code/branches/gcc43/data/levels1580
      /code/branches/gui/data/levels1635-1723,​2795-2894
      /code/branches/hudelements/data/levels6584-6941
      /code/branches/hudimprovements/data/levels7920-8672
      /code/branches/ingamemenu/data/levels6000-6023
      /code/branches/input/data/levels1629-1636
      /code/branches/ipv6/data/levels7293-7458
      /code/branches/kicklib/data/levels7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels8282-8350
      /code/branches/lastmanstanding/data/levels7479-7644
      /code/branches/lastmanstanding3/data/levels7903-8175
      /code/branches/libraries/data/levels5612-5692
      /code/branches/libraries2/data/levels5703-5737
      /code/branches/lod/data/levels6586-6911
      /code/branches/lodfinal/data/levels2372-2411
      /code/branches/mac_osx/data/levels7789-8128,​8135
      /code/branches/map/data/levels2801-3086,​3089
      /code/branches/masterserver/data/levels7502-7738
      /code/branches/menu/data/levels5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels2754-2824
      /code/branches/netp2/data/levels2835-2988
      /code/branches/netp3/data/levels2988-3082
      /code/branches/netp6/data/levels3214-3302
      /code/branches/network/data/levels2356
      /code/branches/network2/data/levels6434-6465
      /code/branches/network3/data/levels7196-7344
      /code/branches/network4/data/levels7497-7755
      /code/branches/network5/data/levels7757-7781
      /code/branches/network6/data/levels7823-8315
      /code/branches/network64/data/levels2210-2355
      /code/branches/notifications/data/levels7314-7401
      /code/branches/objecthierarchy/data/levels1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels2171-2479
      /code/branches/ois_update/data/levels7506-7788
      /code/branches/overlay/data/levels2117-2385
      /code/branches/particles/data/levels2829-3085
      /code/branches/particles2/data/levels6050-6106,​6109
      /code/branches/pch/data/levels3113-3194
      /code/branches/physics/data/levels1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels2436-2457
      /code/branches/pickup/data/levels8145-8555
      /code/branches/pickup2/data/levels5942-6405
      /code/branches/pickup3/data/levels6418-6523
      /code/branches/pickup4/data/levels6594-6710
      /code/branches/pickups/data/levels1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels2107-2497,​2915-3071
      /code/branches/png2/data/levels7262-7263
      /code/branches/portals/data/levels8087-8455
      /code/branches/portals2/data/levels8460-8602
      /code/branches/ppspickups1/data/levels6552-6708
      /code/branches/ppspickups2/data/levels6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels6757-6997
      /code/branches/ppspickups4/data/levels7003-7089
      /code/branches/presentation2/data/levels6106-6416,​7787-7800
      /code/branches/presentation3/data/levels6913-7162
      /code/branches/questsystem/data/levels1894-2088
      /code/branches/questsystem2/data/levels2107-2259
      /code/branches/questsystem5/data/levels2776-2905
      /code/branches/releasetodo/data/levels7614-7647
      /code/branches/resource/data/levels3327-3366
      /code/branches/resource2/data/levels3372-5694
      /code/branches/rocket/data/levels6523-6950
      /code/branches/rocket2/data/levels6953-6970
      /code/branches/script_trigger/data/levels1295-1953,​1955
      /code/branches/skybox2/data/levels6559-6989
      /code/branches/sound/data/levels2829-3010
      /code/branches/sound3/data/levels5941-6102
      /code/branches/spaceboundaries/data/levels8085-8457
      /code/branches/spaceboundaries2/data/levels8460-8613
      /code/branches/spacerace/data/levels8182-8630
      /code/branches/steering/data/levels5949-6091,​8140-8595
      /code/branches/tetris/data/levels8100-8563
      /code/branches/tutoriallevel/data/levels7827-8370
      /code/branches/tutoriallevel2/data/levels8370-8452
      /code/branches/tutoriallevel3/data/levels8453-8636
      /code/branches/unity_build/data/levels8440-8716
      /code/branches/weapon/data/levels1925-2094
      /code/branches/weapon2/data/levels2107-2488
      /code/branches/weapons/data/levels2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels2742-2890

  • code/branches/presentation2012/data/levels/earth.oxw

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/environment3/data/levels/earth.oxwmergedeligible
      /code/branches/formation/data/levels/earth.oxwmergedeligible
      /code/branches/gamecontent/data/levels/earth.oxwmergedeligible
      /code/branches/hud/data/levels/earth.oxwmergedeligible
      /code/branches/masterserverfix/data/levels/earth.oxwmergedeligible
      /code/branches/menue/data/levels/earth.oxwmergedeligible
      /code/branches/newlevel2012/data/levels/earth.oxwmergedeligible
      /code/branches/output/data/levels/earth.oxwmergedeligible
      /code/branches/pickup2012/data/levels/earth.oxwmergedeligible
      /code/branches/presentation/data/levels/earth.oxwmergedeligible
      /code/branches/presentation2011/data/levels/earth.oxwmergedeligible
      /code/branches/shipSelection/data/levels/earth.oxwmergedeligible
      /code/branches/sound2012/data/levels/earth.oxwmergedeligible
      /code/branches/spacegate/data/levels/earth.oxwmergedeligible
      /code/branches/spaceraceTwo/data/levels/earth.oxwmergedeligible
      /code/branches/surfaceRace/data/levels/earth.oxwmergedeligible
      /code/trunk/data/levels/earth.oxwmergedeligible
      /code/branches/ai/data/levels/earth.oxw6592-7033
      /code/branches/ai2/data/levels/earth.oxw8721-8880
      /code/branches/bigships/data/levels/earth.oxw8137-8588
      /code/branches/buildsystem/data/levels/earth.oxw1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/earth.oxw2506-2658
      /code/branches/buildsystem3/data/levels/earth.oxw2662-2708
      /code/branches/ceguilua/data/levels/earth.oxw1802-1808
      /code/branches/chat/data/levels/earth.oxw6527-6797
      /code/branches/chat2/data/levels/earth.oxw6836-6910
      /code/branches/console/data/levels/earth.oxw5941-6104
      /code/branches/consolecommands2/data/levels/earth.oxw6451-7178
      /code/branches/consolecommands3/data/levels/earth.oxw7178-7283
      /code/branches/core3/data/levels/earth.oxw1572-1739
      /code/branches/core4/data/levels/earth.oxw3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/earth.oxw5768-5928,​6009
      /code/branches/data_cleanup/data/levels/earth.oxw7537-7686
      /code/branches/doc/data/levels/earth.oxw7290-7400
      /code/branches/dockingsystem/data/levels/earth.oxw8101-8192
      /code/branches/dockingsystem2/data/levels/earth.oxw8196-8560
      /code/branches/dynamicmatch/data/levels/earth.oxw6584-7030
      /code/branches/fps/data/levels/earth.oxw6591-7072
      /code/branches/gameimmersion/data/levels/earth.oxw8102-8577
      /code/branches/gamestate/data/levels/earth.oxw6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/earth.oxw6594-6745
      /code/branches/gametypes/data/levels/earth.oxw2826-3031
      /code/branches/gcc43/data/levels/earth.oxw1580
      /code/branches/gui/data/levels/earth.oxw1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/earth.oxw6584-6941
      /code/branches/hudimprovements/data/levels/earth.oxw7920-8672
      /code/branches/ingamemenu/data/levels/earth.oxw6000-6023
      /code/branches/input/data/levels/earth.oxw1629-1636
      /code/branches/ipv6/data/levels/earth.oxw7293-7458
      /code/branches/kicklib/data/levels/earth.oxw7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/earth.oxw8282-8350
      /code/branches/lastmanstanding/data/levels/earth.oxw7479-7644
      /code/branches/lastmanstanding3/data/levels/earth.oxw7903-8175
      /code/branches/libraries/data/levels/earth.oxw5612-5692
      /code/branches/libraries2/data/levels/earth.oxw5703-5737
      /code/branches/lod/data/levels/earth.oxw6586-6911
      /code/branches/lodfinal/data/levels/earth.oxw2372-2411
      /code/branches/mac_osx/data/levels/earth.oxw7789-8128,​8135
      /code/branches/map/data/levels/earth.oxw2801-3086,​3089
      /code/branches/masterserver/data/levels/earth.oxw7502-7738
      /code/branches/menu/data/levels/earth.oxw5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/earth.oxw2754-2824
      /code/branches/netp2/data/levels/earth.oxw2835-2988
      /code/branches/netp3/data/levels/earth.oxw2988-3082
      /code/branches/netp6/data/levels/earth.oxw3214-3302
      /code/branches/network/data/levels/earth.oxw2356
      /code/branches/network2/data/levels/earth.oxw6434-6465
      /code/branches/network3/data/levels/earth.oxw7196-7344
      /code/branches/network4/data/levels/earth.oxw7497-7755
      /code/branches/network5/data/levels/earth.oxw7757-7781
      /code/branches/network6/data/levels/earth.oxw7823-8315
      /code/branches/network64/data/levels/earth.oxw2210-2355
      /code/branches/notifications/data/levels/earth.oxw7314-7401
      /code/branches/objecthierarchy/data/levels/earth.oxw1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/earth.oxw2171-2479
      /code/branches/ois_update/data/levels/earth.oxw7506-7788
      /code/branches/overlay/data/levels/earth.oxw2117-2385
      /code/branches/particles/data/levels/earth.oxw2829-3085
      /code/branches/particles2/data/levels/earth.oxw6050-6106,​6109
      /code/branches/pch/data/levels/earth.oxw3113-3194
      /code/branches/physics/data/levels/earth.oxw1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/earth.oxw2436-2457
      /code/branches/pickup/data/levels/earth.oxw8145-8555
      /code/branches/pickup2/data/levels/earth.oxw5942-6405
      /code/branches/pickup3/data/levels/earth.oxw6418-6523
      /code/branches/pickup4/data/levels/earth.oxw6594-6710
      /code/branches/pickups/data/levels/earth.oxw1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/earth.oxw2107-2497,​2915-3071
      /code/branches/png2/data/levels/earth.oxw7262-7263
      /code/branches/portals/data/levels/earth.oxw8087-8455
      /code/branches/portals2/data/levels/earth.oxw8460-8602
      /code/branches/ppspickups1/data/levels/earth.oxw6552-6708
      /code/branches/ppspickups2/data/levels/earth.oxw6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/earth.oxw6757-6997
      /code/branches/ppspickups4/data/levels/earth.oxw7003-7089
      /code/branches/presentation2/data/levels/earth.oxw6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/earth.oxw6913-7162
      /code/branches/questsystem/data/levels/earth.oxw1894-2088
      /code/branches/questsystem2/data/levels/earth.oxw2107-2259
      /code/branches/questsystem5/data/levels/earth.oxw2776-2905
      /code/branches/releasetodo/data/levels/earth.oxw7614-7647
      /code/branches/resource/data/levels/earth.oxw3327-3366
      /code/branches/resource2/data/levels/earth.oxw3372-5694
      /code/branches/rocket/data/levels/earth.oxw6523-6950
      /code/branches/rocket2/data/levels/earth.oxw6953-6970
      /code/branches/script_trigger/data/levels/earth.oxw1295-1953,​1955
      /code/branches/skybox2/data/levels/earth.oxw6559-6989
      /code/branches/sound/data/levels/earth.oxw2829-3010
      /code/branches/sound3/data/levels/earth.oxw5941-6102
      /code/branches/spaceboundaries/data/levels/earth.oxw8085-8457
      /code/branches/spaceboundaries2/data/levels/earth.oxw8460-8613
      /code/branches/spacerace/data/levels/earth.oxw8182-8630
      /code/branches/steering/data/levels/earth.oxw5949-6091,​8140-8595
      /code/branches/tetris/data/levels/earth.oxw8100-8563
      /code/branches/tutoriallevel/data/levels/earth.oxw7827-8370
      /code/branches/tutoriallevel2/data/levels/earth.oxw8370-8452
      /code/branches/tutoriallevel3/data/levels/earth.oxw8453-8636
      /code/branches/unity_build/data/levels/earth.oxw8440-8716
      /code/branches/usability/data/levels/earth.oxw7915-8078
      /code/branches/weapon/data/levels/earth.oxw1925-2094
      /code/branches/weapon2/data/levels/earth.oxw2107-2488
      /code/branches/weapons/data/levels/earth.oxw2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/earth.oxw2742-2890
Note: See TracChangeset for help on using the changeset viewer.