Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum
Timestamp:
May 24, 2012, 8:49:19 PM (13 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/overlays

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlaysmergedeligible
      /code/branches/environment3/data/overlaysmergedeligible
      /code/branches/formation/data/overlaysmergedeligible
      /code/branches/gamecontent/data/overlaysmergedeligible
      /code/branches/hud/data/overlaysmergedeligible
      /code/branches/masterserverfix/data/overlaysmergedeligible
      /code/branches/menue/data/overlaysmergedeligible
      /code/branches/newlevel2012/data/overlaysmergedeligible
      /code/branches/output/data/overlaysmergedeligible
      /code/branches/pickup2012/data/overlaysmergedeligible
      /code/branches/presentation/data/overlaysmergedeligible
      /code/branches/presentation2011/data/overlaysmergedeligible
      /code/branches/shipSelection/data/overlaysmergedeligible
      /code/branches/sound2012/data/overlaysmergednon-inheritableeligible
      /code/branches/spacegate/data/overlaysmergedeligible
      /code/branches/spaceraceTwo/data/overlaysmergedeligible
      /code/branches/surfaceRace/data/overlaysmergedeligible
      /code/branches/usability/data/overlaysmergedeligible
      /code/trunk/data/overlaysmergedeligible
      /code/branches/ai/data/overlays6592-7033
      /code/branches/ai2/data/overlays8721-8880
      /code/branches/bigships/data/overlays8137-8588
      /code/branches/buildsystem/data/overlays1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays2506-2658
      /code/branches/buildsystem3/data/overlays2662-2708
      /code/branches/ceguilua/data/overlays1802-1808
      /code/branches/chat/data/overlays6527-6797
      /code/branches/chat2/data/overlays6836-6910
      /code/branches/console/data/overlays5941-6104
      /code/branches/consolecommands2/data/overlays6451-7178
      /code/branches/consolecommands3/data/overlays7178-7283
      /code/branches/core3/data/overlays1572-1739
      /code/branches/core4/data/overlays3221-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/overlays5768-5928,​6009
      /code/branches/data_cleanup/data/overlays7537-7686
      /code/branches/doc/data/overlays7290-7400
      /code/branches/dockingsystem/data/overlays8101-8192
      /code/branches/dynamicmatch/data/overlays6584-7030
      /code/branches/fps/data/overlays6591-7072
      /code/branches/gameimmersion/data/overlays8102-8577
      /code/branches/gamestate/data/overlays6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays6594-6745
      /code/branches/gametypes/data/overlays2826-3031
      /code/branches/gcc43/data/overlays1580
      /code/branches/gui/data/overlays1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays6584-6941
      /code/branches/hudimprovements/data/overlays7920-8672
      /code/branches/ingamemenu/data/overlays6000-6023
      /code/branches/input/data/overlays1629-1636
      /code/branches/ipv6/data/overlays7293-7458
      /code/branches/kicklib/data/overlays7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays8282-8350
      /code/branches/lastmanstanding/data/overlays7479-7644
      /code/branches/lastmanstanding3/data/overlays7903-8175
      /code/branches/libraries/data/overlays5612-5692
      /code/branches/libraries2/data/overlays5703-5737
      /code/branches/lod/data/overlays6586-6911
      /code/branches/lodfinal/data/overlays2372-2411
      /code/branches/mac_osx/data/overlays7789-8128,​8135
      /code/branches/map/data/overlays2801-3086,​3089
      /code/branches/masterserver/data/overlays7502-7738
      /code/branches/menu/data/overlays5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays2754-2824
      /code/branches/netp2/data/overlays2835-2988
      /code/branches/netp3/data/overlays2988-3082
      /code/branches/netp6/data/overlays3214-3302
      /code/branches/network/data/overlays2356
      /code/branches/network2/data/overlays6434-6465
      /code/branches/network3/data/overlays7196-7344
      /code/branches/network4/data/overlays7497-7755
      /code/branches/network5/data/overlays7757-7781
      /code/branches/network6/data/overlays7823-8315
      /code/branches/network64/data/overlays2210-2355
      /code/branches/notifications/data/overlays7314-7401
      /code/branches/objecthierarchy/data/overlays1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays2171-2479
      /code/branches/ois_update/data/overlays7506-7788
      /code/branches/overlay/data/overlays2117-2385
      /code/branches/particles/data/overlays2829-3085
      /code/branches/particles2/data/overlays6050-6106,​6109
      /code/branches/pch/data/overlays3113-3194
      /code/branches/physics/data/overlays1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays2436-2457
      /code/branches/pickup/data/overlays8145-8555
      /code/branches/pickup2/data/overlays5942-6405
      /code/branches/pickup3/data/overlays6418-6523
      /code/branches/pickup4/data/overlays6594-6710
      /code/branches/pickups/data/overlays1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays2107-2497,​2915-3071
      /code/branches/png2/data/overlays7262-7263
      /code/branches/portals/data/overlays8087-8455
      /code/branches/portals2/data/overlays8460-8602
      /code/branches/ppspickups1/data/overlays6552-6708
      /code/branches/ppspickups2/data/overlays6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays6757-6997
      /code/branches/ppspickups4/data/overlays7003-7089
      /code/branches/presentation2/data/overlays6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays6913-7162
      /code/branches/questsystem/data/overlays1894-2088
      /code/branches/questsystem2/data/overlays2107-2259
      /code/branches/questsystem5/data/overlays2776-2905
      /code/branches/releasetodo/data/overlays7614-7647
      /code/branches/resource/data/overlays3327-3366
      /code/branches/resource2/data/overlays3372-5694
      /code/branches/rocket/data/overlays6523-6950
      /code/branches/rocket2/data/overlays6953-6970
      /code/branches/script_trigger/data/overlays1295-1953,​1955
      /code/branches/skybox2/data/overlays6559-6989
      /code/branches/sound/data/overlays2829-3010
      /code/branches/sound3/data/overlays5941-6102
      /code/branches/spaceboundaries/data/overlays8085-8457
      /code/branches/spaceboundaries2/data/overlays8460-8613
      /code/branches/spacerace/data/overlays8182-8630
      /code/branches/steering/data/overlays5949-6091,​8140-8595
      /code/branches/tetris/data/overlays8100-8563
      /code/branches/tutoriallevel/data/overlays7827-8370
      /code/branches/tutoriallevel2/data/overlays8370-8452
      /code/branches/tutoriallevel3/data/overlays8453-8636
      /code/branches/unity_build/data/overlays8440-8716
      /code/branches/weapon/data/overlays1925-2094
      /code/branches/weapon2/data/overlays2107-2488
      /code/branches/weapons/data/overlays2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays2742-2890

  • code/branches/presentation2012/data/overlays/pongHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/pongHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/pongHUD.oxomergedeligible
      /code/branches/formation/data/overlays/pongHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/pongHUD.oxomergedeligible
      /code/branches/hud/data/overlays/pongHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/pongHUD.oxomergedeligible
      /code/branches/menue/data/overlays/pongHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/output/data/overlays/pongHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/pongHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/pongHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/pongHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/pongHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/pongHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/pongHUD.oxomergedeligible
      /code/branches/usability/data/overlays/pongHUD.oxomergedeligible
      /code/trunk/data/overlays/pongHUD.oxomergedeligible
      /code/branches/ai/data/overlays/pongHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/pongHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/pongHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/pongHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/pongHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/pongHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/pongHUD.oxo1802-1808
      /code/branches/chat/data/overlays/pongHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/pongHUD.oxo6836-6910
      /code/branches/console/data/overlays/pongHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/pongHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/pongHUD.oxo7178-7283
      /code/branches/core3/data/overlays/pongHUD.oxo1572-1739
      /code/branches/core4/data/overlays/pongHUD.oxo3221-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/overlays/pongHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/pongHUD.oxo7537-7686
      /code/branches/doc/data/overlays/pongHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/pongHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/pongHUD.oxo6584-7030
      /code/branches/fps/data/overlays/pongHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/pongHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/pongHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/pongHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/pongHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/pongHUD.oxo1580
      /code/branches/gui/data/overlays/pongHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/pongHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/pongHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/pongHUD.oxo6000-6023
      /code/branches/input/data/overlays/pongHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/pongHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/pongHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/pongHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/pongHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/pongHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/pongHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/pongHUD.oxo5703-5737
      /code/branches/lod/data/overlays/pongHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/pongHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/pongHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/pongHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/pongHUD.oxo7502-7738
      /code/branches/menu/data/overlays/pongHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/pongHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/pongHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/pongHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/pongHUD.oxo3214-3302
      /code/branches/network/data/overlays/pongHUD.oxo2356
      /code/branches/network2/data/overlays/pongHUD.oxo6434-6465
      /code/branches/network3/data/overlays/pongHUD.oxo7196-7344
      /code/branches/network4/data/overlays/pongHUD.oxo7497-7755
      /code/branches/network5/data/overlays/pongHUD.oxo7757-7781
      /code/branches/network6/data/overlays/pongHUD.oxo7823-8315
      /code/branches/network64/data/overlays/pongHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/pongHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/pongHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/pongHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/pongHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/pongHUD.oxo2117-2385
      /code/branches/particles/data/overlays/pongHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/pongHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/pongHUD.oxo3113-3194
      /code/branches/physics/data/overlays/pongHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/pongHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/pongHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/pongHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/pongHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/pongHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/pongHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/pongHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/pongHUD.oxo7262-7263
      /code/branches/portals/data/overlays/pongHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/pongHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/pongHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/pongHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/pongHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/pongHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/pongHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/pongHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/pongHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/pongHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/pongHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/pongHUD.oxo7614-7647
      /code/branches/resource/data/overlays/pongHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/pongHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/pongHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/pongHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/pongHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/pongHUD.oxo6559-6989
      /code/branches/sound/data/overlays/pongHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/pongHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/pongHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/pongHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/pongHUD.oxo8182-8630
      /code/branches/steering/data/overlays/pongHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/pongHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/pongHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/pongHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/pongHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/pongHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/pongHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/pongHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/pongHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/pongHUD.oxo2742-2890
Note: See TracChangeset for help on using the changeset viewer.