Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 24, 2012, 8:49:19 PM (13 years ago)
Author:
decapitb
Message:

tower defense update

Location:
code/branches/presentation2012
Files:
17 edited
4 copied

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2012

  • code/branches/presentation2012/src

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/srcmergedeligible
      /code/branches/environment3/srcmergedeligible
      /code/branches/formation/srcmergedeligible
      /code/branches/gamecontent/srcmergedeligible
      /code/branches/hud/srcmergedeligible
      /code/branches/masterserverfix/srcmergedeligible
      /code/branches/menue/srcmergedeligible
      /code/branches/newlevel2012/srcmergedeligible
      /code/branches/output/srcmergedeligible
      /code/branches/pickup2012/srcmergedeligible
      /code/branches/presentation/srcmergedeligible
      /code/branches/presentation2011/srcmergedeligible
      /code/branches/shipSelection/srcmergedeligible
      /code/branches/sound2012/srcmergedeligible
      /code/branches/spacegate/srcmergedeligible
      /code/branches/spaceraceTwo/srcmergedeligible
      /code/branches/surfaceRace/srcmergedeligible
      /code/branches/usability/srcmergedeligible
      /code/trunk/srcmergedeligible
      /code/branches/ai/src6592-7033
      /code/branches/ai2/src8721-8880
      /code/branches/bigships/src8137-8588
      /code/branches/buildsystem/src1874-2276,​2278-2400
      /code/branches/buildsystem2/src2506-2658
      /code/branches/buildsystem3/src2662-2708
      /code/branches/ceguilua/src1802-1808
      /code/branches/chat/src6527-6797
      /code/branches/chat2/src6836-6910
      /code/branches/console/src5941-6104
      /code/branches/consolecommands2/src6451-7178
      /code/branches/consolecommands3/src7178-7283
      /code/branches/core3/src1572-1739
      /code/branches/core4/src3221-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/src5768-5928,​6009
      /code/branches/data_cleanup/src7537-7686
      /code/branches/doc/src7290-7400
      /code/branches/dockingsystem/src8101-8192
      /code/branches/dynamicmatch/src6584-7030
      /code/branches/fps/src6591-7072
      /code/branches/gameimmersion/src8102-8577
      /code/branches/gamestate/src6430-6572,​6621-6661
      /code/branches/gamestates2/src6594-6745
      /code/branches/gametypes/src2826-3031
      /code/branches/gcc43/src1580
      /code/branches/gui/src1635-1723,​2795-2894
      /code/branches/hudelements/src6584-6941
      /code/branches/hudimprovements/src7920-8672
      /code/branches/ingamemenu/src6000-6023
      /code/branches/input/src1629-1636
      /code/branches/ipv6/src7293-7458
      /code/branches/kicklib/src7940-8096,​8098-8277
      /code/branches/kicklib2/src8282-8350
      /code/branches/lastmanstanding/src7479-7644
      /code/branches/lastmanstanding3/src7903-8175
      /code/branches/libraries/src5612-5692
      /code/branches/libraries2/src5703-5737
      /code/branches/lod/src6586-6911
      /code/branches/lodfinal/src2372-2411
      /code/branches/mac_osx/src7789-8128,​8135
      /code/branches/map/src2801-3086,​3089
      /code/branches/masterserver/src7502-7738
      /code/branches/menu/src5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src2754-2824
      /code/branches/netp2/src2835-2988
      /code/branches/netp3/src2988-3082
      /code/branches/netp6/src3214-3302
      /code/branches/network/src2356
      /code/branches/network2/src6434-6465
      /code/branches/network3/src7196-7344
      /code/branches/network4/src7497-7755
      /code/branches/network5/src7757-7781
      /code/branches/network6/src7823-8315
      /code/branches/network64/src2210-2355
      /code/branches/notifications/src7314-7401
      /code/branches/objecthierarchy/src1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src2171-2479
      /code/branches/ois_update/src7506-7788
      /code/branches/overlay/src2117-2385
      /code/branches/particles/src2829-3085
      /code/branches/particles2/src6050-6106,​6109
      /code/branches/pch/src3113-3194
      /code/branches/physics/src1912-2055,​2107-2439
      /code/branches/physics_merge/src2436-2457
      /code/branches/pickup/src8145-8555
      /code/branches/pickup2/src5942-6405
      /code/branches/pickup3/src6418-6523
      /code/branches/pickup4/src6594-6710
      /code/branches/pickups/src1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src2107-2497,​2915-3071
      /code/branches/png2/src7262-7263
      /code/branches/portals/src8087-8455
      /code/branches/portals2/src8460-8602
      /code/branches/ppspickups1/src6552-6708
      /code/branches/ppspickups2/src6527-6532,​6554-6709
      /code/branches/ppspickups3/src6757-6997
      /code/branches/ppspickups4/src7003-7089
      /code/branches/presentation2/src6106-6416,​7787-7800
      /code/branches/presentation3/src6913-7162
      /code/branches/questsystem/src1894-2088
      /code/branches/questsystem2/src2107-2259
      /code/branches/questsystem5/src2776-2905
      /code/branches/releasetodo/src7614-7647
      /code/branches/resource/src3327-3366
      /code/branches/resource2/src3372-5694
      /code/branches/rocket/src6523-6950
      /code/branches/rocket2/src6953-6970
      /code/branches/script_trigger/src1295-1953,​1955
      /code/branches/skybox2/src6559-6989
      /code/branches/sound/src2829-3010
      /code/branches/sound3/src5941-6102
      /code/branches/spaceboundaries/src8085-8457
      /code/branches/spaceboundaries2/src8460-8613
      /code/branches/spacerace/src8182-8630
      /code/branches/steering/src5949-6091,​8140-8595
      /code/branches/tetris/src8100-8563
      /code/branches/tutoriallevel/src7827-8370
      /code/branches/tutoriallevel2/src8370-8452
      /code/branches/tutoriallevel3/src8453-8636
      /code/branches/unity_build/src8440-8716
      /code/branches/weapon/src1925-2094
      /code/branches/weapon2/src2107-2488
      /code/branches/weapons/src2897-3051,​8143-8591
      /code/branches/weaponsystem/src2742-2890
  • code/branches/presentation2012/src/modules

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modulesmergedeligible
      /code/branches/environment3/src/modulesmergedeligible
      /code/branches/formation/src/modulesmergedeligible
      /code/branches/gamecontent/src/modulesmergedeligible
      /code/branches/hud/src/modulesmergedeligible
      /code/branches/masterserverfix/src/modulesmergedeligible
      /code/branches/menue/src/modulesmergedeligible
      /code/branches/newlevel2012/src/modulesmergedeligible
      /code/branches/output/src/modulesmergedeligible
      /code/branches/pickup2012/src/modulesmergedeligible
      /code/branches/presentation/src/modulesmergedeligible
      /code/branches/presentation2011/src/modulesmergedeligible
      /code/branches/shipSelection/src/modulesmergedeligible
      /code/branches/sound2012/src/modulesmergednon-inheritableeligible
      /code/branches/spacegate/src/modulesmergedeligible
      /code/branches/spaceraceTwo/src/modulesmergedeligible
      /code/branches/surfaceRace/src/modulesmergedeligible
      /code/branches/usability/src/modulesmergedeligible
      /code/trunk/src/modulesmergedeligible
      /code/branches/ai/src/modules6592-7033
      /code/branches/ai2/src/modules8721-8880
      /code/branches/bigships/src/modules8137-8588
      /code/branches/buildsystem/src/modules1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules2506-2658
      /code/branches/buildsystem3/src/modules2662-2708
      /code/branches/ceguilua/src/modules1802-1808
      /code/branches/chat/src/modules6527-6797
      /code/branches/chat2/src/modules6836-6910
      /code/branches/console/src/modules5941-6104
      /code/branches/consolecommands2/src/modules6451-7178
      /code/branches/consolecommands3/src/modules7178-7283
      /code/branches/core3/src/modules1572-1739
      /code/branches/core4/src/modules3221-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/src/modules5768-5928,​6009
      /code/branches/data_cleanup/src/modules7537-7686
      /code/branches/doc/src/modules7290-7400
      /code/branches/dockingsystem/src/modules8101-8192
      /code/branches/dynamicmatch/src/modules6584-7030
      /code/branches/fps/src/modules6591-7072
      /code/branches/gameimmersion/src/modules8102-8577
      /code/branches/gamestate/src/modules6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules6594-6745
      /code/branches/gametypes/src/modules2826-3031
      /code/branches/gcc43/src/modules1580
      /code/branches/gui/src/modules1635-1723,​2795-2894
      /code/branches/hudelements/src/modules6584-6941
      /code/branches/hudimprovements/src/modules7920-8672
      /code/branches/ingamemenu/src/modules6000-6023
      /code/branches/input/src/modules1629-1636
      /code/branches/ipv6/src/modules7293-7458
      /code/branches/kicklib/src/modules7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules8282-8350
      /code/branches/lastmanstanding/src/modules7479-7644
      /code/branches/lastmanstanding3/src/modules7903-8175
      /code/branches/libraries/src/modules5612-5692
      /code/branches/libraries2/src/modules5703-5737
      /code/branches/lod/src/modules6586-6911
      /code/branches/lodfinal/src/modules2372-2411
      /code/branches/mac_osx/src/modules7789-8128,​8135
      /code/branches/map/src/modules2801-3086,​3089
      /code/branches/masterserver/src/modules7502-7738
      /code/branches/menu/src/modules5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules2754-2824
      /code/branches/netp2/src/modules2835-2988
      /code/branches/netp3/src/modules2988-3082
      /code/branches/netp6/src/modules3214-3302
      /code/branches/network/src/modules2356
      /code/branches/network2/src/modules6434-6465
      /code/branches/network3/src/modules7196-7344
      /code/branches/network4/src/modules7497-7755
      /code/branches/network5/src/modules7757-7781
      /code/branches/network6/src/modules7823-8315
      /code/branches/network64/src/modules2210-2355
      /code/branches/notifications/src/modules7314-7401
      /code/branches/objecthierarchy/src/modules1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules2171-2479
      /code/branches/ois_update/src/modules7506-7788
      /code/branches/overlay/src/modules2117-2385
      /code/branches/particles/src/modules2829-3085
      /code/branches/particles2/src/modules6050-6106,​6109
      /code/branches/pch/src/modules3113-3194
      /code/branches/physics/src/modules1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules2436-2457
      /code/branches/pickup/src/modules8145-8555
      /code/branches/pickup2/src/modules5942-6405
      /code/branches/pickup3/src/modules6418-6523
      /code/branches/pickup4/src/modules6594-6710
      /code/branches/pickups/src/modules1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules2107-2497,​2915-3071
      /code/branches/png2/src/modules7262-7263
      /code/branches/portals/src/modules8087-8455
      /code/branches/portals2/src/modules8460-8602
      /code/branches/ppspickups1/src/modules6552-6708
      /code/branches/ppspickups2/src/modules6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules6757-6997
      /code/branches/ppspickups4/src/modules7003-7089
      /code/branches/presentation2/src/modules6106-6416,​7787-7800
      /code/branches/presentation3/src/modules6913-7162
      /code/branches/questsystem/src/modules1894-2088
      /code/branches/questsystem2/src/modules2107-2259
      /code/branches/questsystem5/src/modules2776-2905
      /code/branches/releasetodo/src/modules7614-7647
      /code/branches/resource/src/modules3327-3366
      /code/branches/resource2/src/modules3372-5694
      /code/branches/rocket/src/modules6523-6950
      /code/branches/rocket2/src/modules6953-6970
      /code/branches/script_trigger/src/modules1295-1953,​1955
      /code/branches/skybox2/src/modules6559-6989
      /code/branches/sound/src/modules2829-3010
      /code/branches/sound3/src/modules5941-6102
      /code/branches/spaceboundaries/src/modules8085-8457
      /code/branches/spaceboundaries2/src/modules8460-8613
      /code/branches/spacerace/src/modules8182-8630
      /code/branches/steering/src/modules5949-6091,​8140-8595
      /code/branches/tetris/src/modules8100-8563
      /code/branches/tutoriallevel/src/modules7827-8370
      /code/branches/tutoriallevel2/src/modules8370-8452
      /code/branches/tutoriallevel3/src/modules8453-8636
      /code/branches/unity_build/src/modules8440-8716
      /code/branches/weapon/src/modules1925-2094
      /code/branches/weapon2/src/modules2107-2488
      /code/branches/weapons/src/modules2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules2742-2890
  • code/branches/presentation2012/src/modules/CMakeLists.txt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/CMakeLists.txtmergedeligible
      /code/branches/environment3/src/modules/CMakeLists.txtmergedeligible
      /code/branches/formation/src/modules/CMakeLists.txtmergedeligible
      /code/branches/gamecontent/src/modules/CMakeLists.txtmergedeligible
      /code/branches/hud/src/modules/CMakeLists.txtmergedeligible
      /code/branches/masterserverfix/src/modules/CMakeLists.txtmergedeligible
      /code/branches/menue/src/modules/CMakeLists.txtmergedeligible
      /code/branches/newlevel2012/src/modules/CMakeLists.txtmergedeligible
      /code/branches/output/src/modules/CMakeLists.txtmergedeligible
      /code/branches/pickup2012/src/modules/CMakeLists.txtmergedeligible
      /code/branches/presentation/src/modules/CMakeLists.txtmergedeligible
      /code/branches/presentation2011/src/modules/CMakeLists.txtmergedeligible
      /code/branches/shipSelection/src/modules/CMakeLists.txtmergedeligible
      /code/branches/sound2012/src/modules/CMakeLists.txtmergedeligible
      /code/branches/spacegate/src/modules/CMakeLists.txtmergedeligible
      /code/branches/spaceraceTwo/src/modules/CMakeLists.txtmergedeligible
      /code/branches/surfaceRace/src/modules/CMakeLists.txtmergedeligible
      /code/branches/usability/src/modules/CMakeLists.txtmergedeligible
      /code/trunk/src/modules/CMakeLists.txtmergedeligible
      /code/branches/ai/src/modules/CMakeLists.txt6592-7033
      /code/branches/ai2/src/modules/CMakeLists.txt8721-8880
      /code/branches/bigships/src/modules/CMakeLists.txt8137-8588
      /code/branches/buildsystem/src/modules/CMakeLists.txt1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/CMakeLists.txt2506-2658
      /code/branches/buildsystem3/src/modules/CMakeLists.txt2662-2708
      /code/branches/ceguilua/src/modules/CMakeLists.txt1802-1808
      /code/branches/chat/src/modules/CMakeLists.txt6527-6797
      /code/branches/chat2/src/modules/CMakeLists.txt6836-6910
      /code/branches/console/src/modules/CMakeLists.txt5941-6104
      /code/branches/consolecommands2/src/modules/CMakeLists.txt6451-7178
      /code/branches/consolecommands3/src/modules/CMakeLists.txt7178-7283
      /code/branches/core3/src/modules/CMakeLists.txt1572-1739
      /code/branches/core4/src/modules/CMakeLists.txt3221-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/src/modules/CMakeLists.txt5768-5928,​6009
      /code/branches/data_cleanup/src/modules/CMakeLists.txt7537-7686
      /code/branches/doc/src/modules/CMakeLists.txt7290-7400
      /code/branches/dockingsystem/src/modules/CMakeLists.txt8101-8192
      /code/branches/dynamicmatch/src/modules/CMakeLists.txt6584-7030
      /code/branches/fps/src/modules/CMakeLists.txt6591-7072
      /code/branches/gameimmersion/src/modules/CMakeLists.txt8102-8577
      /code/branches/gamestate/src/modules/CMakeLists.txt6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/CMakeLists.txt6594-6745
      /code/branches/gametypes/src/modules/CMakeLists.txt2826-3031
      /code/branches/gcc43/src/modules/CMakeLists.txt1580
      /code/branches/gui/src/modules/CMakeLists.txt1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/CMakeLists.txt6584-6941
      /code/branches/hudimprovements/src/modules/CMakeLists.txt7920-8672
      /code/branches/ingamemenu/src/modules/CMakeLists.txt6000-6023
      /code/branches/input/src/modules/CMakeLists.txt1629-1636
      /code/branches/ipv6/src/modules/CMakeLists.txt7293-7458
      /code/branches/kicklib/src/modules/CMakeLists.txt7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/CMakeLists.txt8282-8350
      /code/branches/lastmanstanding/src/modules/CMakeLists.txt7479-7644
      /code/branches/lastmanstanding3/src/modules/CMakeLists.txt7903-8175
      /code/branches/libraries/src/modules/CMakeLists.txt5612-5692
      /code/branches/libraries2/src/modules/CMakeLists.txt5703-5737
      /code/branches/lod/src/modules/CMakeLists.txt6586-6911
      /code/branches/lodfinal/src/modules/CMakeLists.txt2372-2411
      /code/branches/mac_osx/src/modules/CMakeLists.txt7789-8128,​8135
      /code/branches/map/src/modules/CMakeLists.txt2801-3086,​3089
      /code/branches/masterserver/src/modules/CMakeLists.txt7502-7738
      /code/branches/menu/src/modules/CMakeLists.txt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/CMakeLists.txt2754-2824
      /code/branches/netp2/src/modules/CMakeLists.txt2835-2988
      /code/branches/netp3/src/modules/CMakeLists.txt2988-3082
      /code/branches/netp6/src/modules/CMakeLists.txt3214-3302
      /code/branches/network/src/modules/CMakeLists.txt2356
      /code/branches/network2/src/modules/CMakeLists.txt6434-6465
      /code/branches/network3/src/modules/CMakeLists.txt7196-7344
      /code/branches/network4/src/modules/CMakeLists.txt7497-7755
      /code/branches/network5/src/modules/CMakeLists.txt7757-7781
      /code/branches/network6/src/modules/CMakeLists.txt7823-8315
      /code/branches/network64/src/modules/CMakeLists.txt2210-2355
      /code/branches/notifications/src/modules/CMakeLists.txt7314-7401
      /code/branches/objecthierarchy/src/modules/CMakeLists.txt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/CMakeLists.txt2171-2479
      /code/branches/ois_update/src/modules/CMakeLists.txt7506-7788
      /code/branches/overlay/src/modules/CMakeLists.txt2117-2385
      /code/branches/particles/src/modules/CMakeLists.txt2829-3085
      /code/branches/particles2/src/modules/CMakeLists.txt6050-6106,​6109
      /code/branches/pch/src/modules/CMakeLists.txt3113-3194
      /code/branches/physics/src/modules/CMakeLists.txt1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/CMakeLists.txt2436-2457
      /code/branches/pickup/src/modules/CMakeLists.txt8145-8555
      /code/branches/pickup2/src/modules/CMakeLists.txt5942-6405
      /code/branches/pickup3/src/modules/CMakeLists.txt6418-6523
      /code/branches/pickup4/src/modules/CMakeLists.txt6594-6710
      /code/branches/pickups/src/modules/CMakeLists.txt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/CMakeLists.txt2107-2497,​2915-3071
      /code/branches/png2/src/modules/CMakeLists.txt7262-7263
      /code/branches/portals/src/modules/CMakeLists.txt8087-8455
      /code/branches/portals2/src/modules/CMakeLists.txt8460-8602
      /code/branches/ppspickups1/src/modules/CMakeLists.txt6552-6708
      /code/branches/ppspickups2/src/modules/CMakeLists.txt6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/CMakeLists.txt6757-6997
      /code/branches/ppspickups4/src/modules/CMakeLists.txt7003-7089
      /code/branches/presentation2/src/modules/CMakeLists.txt6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/CMakeLists.txt6913-7162
      /code/branches/questsystem/src/modules/CMakeLists.txt1894-2088
      /code/branches/questsystem2/src/modules/CMakeLists.txt2107-2259
      /code/branches/questsystem5/src/modules/CMakeLists.txt2776-2905
      /code/branches/releasetodo/src/modules/CMakeLists.txt7614-7647
      /code/branches/resource/src/modules/CMakeLists.txt3327-3366
      /code/branches/resource2/src/modules/CMakeLists.txt3372-5694
      /code/branches/rocket/src/modules/CMakeLists.txt6523-6950
      /code/branches/rocket2/src/modules/CMakeLists.txt6953-6970
      /code/branches/script_trigger/src/modules/CMakeLists.txt1295-1953,​1955
      /code/branches/skybox2/src/modules/CMakeLists.txt6559-6989
      /code/branches/sound/src/modules/CMakeLists.txt2829-3010
      /code/branches/sound3/src/modules/CMakeLists.txt5941-6102
      /code/branches/spaceboundaries/src/modules/CMakeLists.txt8085-8457
      /code/branches/spaceboundaries2/src/modules/CMakeLists.txt8460-8613
      /code/branches/spacerace/src/modules/CMakeLists.txt8182-8630
      /code/branches/steering/src/modules/CMakeLists.txt5949-6091,​8140-8595
      /code/branches/tetris/src/modules/CMakeLists.txt8100-8563
      /code/branches/tutoriallevel/src/modules/CMakeLists.txt7827-8370
      /code/branches/tutoriallevel2/src/modules/CMakeLists.txt8370-8452
      /code/branches/tutoriallevel3/src/modules/CMakeLists.txt8453-8636
      /code/branches/unity_build/src/modules/CMakeLists.txt8440-8716
      /code/branches/weapon/src/modules/CMakeLists.txt1925-2094
      /code/branches/weapon2/src/modules/CMakeLists.txt2107-2488
      /code/branches/weapons/src/modules/CMakeLists.txt2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/CMakeLists.txt2742-2890
  • code/branches/presentation2012/src/modules/designtools

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/designtoolsmergedeligible
      /code/branches/environment3/src/modules/designtoolsmergedeligible
      /code/branches/formation/src/modules/designtoolsmergedeligible
      /code/branches/gamecontent/src/modules/designtoolsmergedeligible
      /code/branches/hud/src/modules/designtoolsmergedeligible
      /code/branches/masterserverfix/src/modules/designtoolsmergedeligible
      /code/branches/menue/src/modules/designtoolsmergedeligible
      /code/branches/newlevel2012/src/modules/designtoolsmergedeligible
      /code/branches/output/src/modules/designtoolsmergedeligible
      /code/branches/pickup2012/src/modules/designtoolsmergedeligible
      /code/branches/presentation/src/modules/designtoolsmergedeligible
      /code/branches/presentation2011/src/modules/designtoolsmergedeligible
      /code/branches/shipSelection/src/modules/designtoolsmergedeligible
      /code/branches/sound2012/src/modules/designtoolsmergedeligible
      /code/branches/spacegate/src/modules/designtoolsmergedeligible
      /code/branches/spaceraceTwo/src/modules/designtoolsmergedeligible
      /code/branches/surfaceRace/src/modules/designtoolsmergedeligible
      /code/branches/usability/src/modules/designtoolsmergedeligible
      /code/trunk/src/modules/designtoolsmergedeligible
      /code/branches/ai/src/modules/designtools6592-7033
      /code/branches/ai2/src/modules/designtools8721-8880
      /code/branches/bigships/src/modules/designtools8137-8588
      /code/branches/buildsystem/src/modules/designtools1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/designtools2506-2658
      /code/branches/buildsystem3/src/modules/designtools2662-2708
      /code/branches/ceguilua/src/modules/designtools1802-1808
      /code/branches/chat/src/modules/designtools6527-6797
      /code/branches/chat2/src/modules/designtools6836-6910
      /code/branches/console/src/modules/designtools5941-6104
      /code/branches/consolecommands2/src/modules/designtools6451-7178
      /code/branches/consolecommands3/src/modules/designtools7178-7283
      /code/branches/core3/src/modules/designtools1572-1739
      /code/branches/core4/src/modules/designtools3221-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/src/modules/designtools5768-5928,​6009
      /code/branches/data_cleanup/src/modules/designtools7537-7686
      /code/branches/doc/src/modules/designtools7290-7400
      /code/branches/dockingsystem/src/modules/designtools8101-8192
      /code/branches/dynamicmatch/src/modules/designtools6584-7030
      /code/branches/fps/src/modules/designtools6591-7072
      /code/branches/gameimmersion/src/modules/designtools8102-8577
      /code/branches/gamestate/src/modules/designtools6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/designtools6594-6745
      /code/branches/gametypes/src/modules/designtools2826-3031
      /code/branches/gcc43/src/modules/designtools1580
      /code/branches/gui/src/modules/designtools1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/designtools6584-6941
      /code/branches/hudimprovements/src/modules/designtools7920-8672
      /code/branches/ingamemenu/src/modules/designtools6000-6023
      /code/branches/input/src/modules/designtools1629-1636
      /code/branches/ipv6/src/modules/designtools7293-7458
      /code/branches/kicklib/src/modules/designtools7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/designtools8282-8350
      /code/branches/lastmanstanding/src/modules/designtools7479-7644
      /code/branches/lastmanstanding3/src/modules/designtools7903-8175
      /code/branches/libraries/src/modules/designtools5612-5692
      /code/branches/libraries2/src/modules/designtools5703-5737
      /code/branches/lod/src/modules/designtools6586-6911
      /code/branches/lodfinal/src/modules/designtools2372-2411
      /code/branches/mac_osx/src/modules/designtools7789-8128,​8135
      /code/branches/map/src/modules/designtools2801-3086,​3089
      /code/branches/masterserver/src/modules/designtools7502-7738
      /code/branches/menu/src/modules/designtools5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/designtools2754-2824
      /code/branches/netp2/src/modules/designtools2835-2988
      /code/branches/netp3/src/modules/designtools2988-3082
      /code/branches/netp6/src/modules/designtools3214-3302
      /code/branches/network/src/modules/designtools2356
      /code/branches/network2/src/modules/designtools6434-6465
      /code/branches/network3/src/modules/designtools7196-7344
      /code/branches/network4/src/modules/designtools7497-7755
      /code/branches/network5/src/modules/designtools7757-7781
      /code/branches/network6/src/modules/designtools7823-8315
      /code/branches/network64/src/modules/designtools2210-2355
      /code/branches/notifications/src/modules/designtools7314-7401
      /code/branches/objecthierarchy/src/modules/designtools1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/designtools2171-2479
      /code/branches/ois_update/src/modules/designtools7506-7788
      /code/branches/overlay/src/modules/designtools2117-2385
      /code/branches/particles/src/modules/designtools2829-3085
      /code/branches/particles2/src/modules/designtools6050-6106,​6109
      /code/branches/pch/src/modules/designtools3113-3194
      /code/branches/physics/src/modules/designtools1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/designtools2436-2457
      /code/branches/pickup/src/modules/designtools8145-8555
      /code/branches/pickup2/src/modules/designtools5942-6405
      /code/branches/pickup3/src/modules/designtools6418-6523
      /code/branches/pickup4/src/modules/designtools6594-6710
      /code/branches/pickups/src/modules/designtools1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/designtools2107-2497,​2915-3071
      /code/branches/png2/src/modules/designtools7262-7263
      /code/branches/portals/src/modules/designtools8087-8455
      /code/branches/portals2/src/modules/designtools8460-8602
      /code/branches/ppspickups1/src/modules/designtools6552-6708
      /code/branches/ppspickups2/src/modules/designtools6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/designtools6757-6997
      /code/branches/ppspickups4/src/modules/designtools7003-7089
      /code/branches/presentation2/src/modules/designtools6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/designtools6913-7162
      /code/branches/questsystem/src/modules/designtools1894-2088
      /code/branches/questsystem2/src/modules/designtools2107-2259
      /code/branches/questsystem5/src/modules/designtools2776-2905
      /code/branches/releasetodo/src/modules/designtools7614-7647
      /code/branches/resource/src/modules/designtools3327-3366
      /code/branches/resource2/src/modules/designtools3372-5694
      /code/branches/rocket/src/modules/designtools6523-6950
      /code/branches/rocket2/src/modules/designtools6953-6970
      /code/branches/script_trigger/src/modules/designtools1295-1953,​1955
      /code/branches/skybox2/src/modules/designtools6559-6989
      /code/branches/sound/src/modules/designtools2829-3010
      /code/branches/sound3/src/modules/designtools5941-6102
      /code/branches/spaceboundaries/src/modules/designtools8085-8457
      /code/branches/spaceboundaries2/src/modules/designtools8460-8613
      /code/branches/spacerace/src/modules/designtools8182-8630
      /code/branches/steering/src/modules/designtools5949-6091,​8140-8595
      /code/branches/tetris/src/modules/designtools8100-8563
      /code/branches/tutoriallevel/src/modules/designtools7827-8370
      /code/branches/tutoriallevel2/src/modules/designtools8370-8452
      /code/branches/tutoriallevel3/src/modules/designtools8453-8636
      /code/branches/unity_build/src/modules/designtools8440-8716
      /code/branches/weapon/src/modules/designtools1925-2094
      /code/branches/weapon2/src/modules/designtools2107-2488
      /code/branches/weapons/src/modules/designtools2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/designtools2742-2890
  • code/branches/presentation2012/src/modules/docking

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/dockingmergedeligible
      /code/branches/environment3/src/modules/dockingmergedeligible
      /code/branches/formation/src/modules/dockingmergedeligible
      /code/branches/gamecontent/src/modules/dockingmergedeligible
      /code/branches/hud/src/modules/dockingmergedeligible
      /code/branches/masterserverfix/src/modules/dockingmergedeligible
      /code/branches/menue/src/modules/dockingmergedeligible
      /code/branches/newlevel2012/src/modules/dockingmergedeligible
      /code/branches/output/src/modules/dockingmergedeligible
      /code/branches/pickup2012/src/modules/dockingmergedeligible
      /code/branches/presentation/src/modules/dockingmergedeligible
      /code/branches/presentation2011/src/modules/dockingmergedeligible
      /code/branches/shipSelection/src/modules/dockingmergedeligible
      /code/branches/sound2012/src/modules/dockingmergedeligible
      /code/branches/spacegate/src/modules/dockingmergedeligible
      /code/branches/spaceraceTwo/src/modules/dockingmergedeligible
      /code/branches/surfaceRace/src/modules/dockingmergedeligible
      /code/trunk/src/modules/dockingmergedeligible
      /code/branches/ai/src/modules/docking6592-7033
      /code/branches/ai2/src/modules/docking8721-8880
      /code/branches/bigships/src/modules/docking8137-8588
      /code/branches/buildsystem/src/modules/docking1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/docking2506-2658
      /code/branches/buildsystem3/src/modules/docking2662-2708
      /code/branches/ceguilua/src/modules/docking1802-1808
      /code/branches/chat/src/modules/docking6527-6797
      /code/branches/chat2/src/modules/docking6836-6910
      /code/branches/console/src/modules/docking5941-6104
      /code/branches/consolecommands2/src/modules/docking6451-7178
      /code/branches/consolecommands3/src/modules/docking7178-7283
      /code/branches/core3/src/modules/docking1572-1739
      /code/branches/core4/src/modules/docking3221-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/src/modules/docking5768-5928,​6009
      /code/branches/data_cleanup/src/modules/docking7537-7686
      /code/branches/doc/src/modules/docking7290-7400
      /code/branches/dockingsystem/src/modules/docking8101-8192
      /code/branches/dynamicmatch/src/modules/docking6584-7030
      /code/branches/fps/src/modules/docking6591-7072
      /code/branches/gameimmersion/src/modules/docking8102-8577
      /code/branches/gamestate/src/modules/docking6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/docking6594-6745
      /code/branches/gametypes/src/modules/docking2826-3031
      /code/branches/gcc43/src/modules/docking1580
      /code/branches/gui/src/modules/docking1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/docking6584-6941
      /code/branches/hudimprovements/src/modules/docking7920-8672
      /code/branches/ingamemenu/src/modules/docking6000-6023
      /code/branches/input/src/modules/docking1629-1636
      /code/branches/ipv6/src/modules/docking7293-7458
      /code/branches/kicklib/src/modules/docking7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/docking8282-8350
      /code/branches/lastmanstanding/src/modules/docking7479-7644
      /code/branches/lastmanstanding3/src/modules/docking7903-8175
      /code/branches/libraries/src/modules/docking5612-5692
      /code/branches/libraries2/src/modules/docking5703-5737
      /code/branches/lod/src/modules/docking6586-6911
      /code/branches/lodfinal/src/modules/docking2372-2411
      /code/branches/mac_osx/src/modules/docking7789-8128,​8135
      /code/branches/map/src/modules/docking2801-3086,​3089
      /code/branches/masterserver/src/modules/docking7502-7738
      /code/branches/menu/src/modules/docking5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/docking2754-2824
      /code/branches/netp2/src/modules/docking2835-2988
      /code/branches/netp3/src/modules/docking2988-3082
      /code/branches/netp6/src/modules/docking3214-3302
      /code/branches/network/src/modules/docking2356
      /code/branches/network2/src/modules/docking6434-6465
      /code/branches/network3/src/modules/docking7196-7344
      /code/branches/network4/src/modules/docking7497-7755
      /code/branches/network5/src/modules/docking7757-7781
      /code/branches/network6/src/modules/docking7823-8315
      /code/branches/network64/src/modules/docking2210-2355
      /code/branches/notifications/src/modules/docking7314-7401
      /code/branches/objecthierarchy/src/modules/docking1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/docking2171-2479
      /code/branches/ois_update/src/modules/docking7506-7788
      /code/branches/overlay/src/modules/docking2117-2385
      /code/branches/particles/src/modules/docking2829-3085
      /code/branches/particles2/src/modules/docking6050-6106,​6109
      /code/branches/pch/src/modules/docking3113-3194
      /code/branches/physics/src/modules/docking1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/docking2436-2457
      /code/branches/pickup/src/modules/docking8145-8555
      /code/branches/pickup2/src/modules/docking5942-6405
      /code/branches/pickup3/src/modules/docking6418-6523
      /code/branches/pickup4/src/modules/docking6594-6710
      /code/branches/pickups/src/modules/docking1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/docking2107-2497,​2915-3071
      /code/branches/png2/src/modules/docking7262-7263
      /code/branches/portals/src/modules/docking8087-8455
      /code/branches/portals2/src/modules/docking8460-8602
      /code/branches/ppspickups1/src/modules/docking6552-6708
      /code/branches/ppspickups2/src/modules/docking6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/docking6757-6997
      /code/branches/ppspickups4/src/modules/docking7003-7089
      /code/branches/presentation2/src/modules/docking6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/docking6913-7162
      /code/branches/questsystem/src/modules/docking1894-2088
      /code/branches/questsystem2/src/modules/docking2107-2259
      /code/branches/questsystem5/src/modules/docking2776-2905
      /code/branches/releasetodo/src/modules/docking7614-7647
      /code/branches/resource/src/modules/docking3327-3366
      /code/branches/resource2/src/modules/docking3372-5694
      /code/branches/rocket/src/modules/docking6523-6950
      /code/branches/rocket2/src/modules/docking6953-6970
      /code/branches/script_trigger/src/modules/docking1295-1953,​1955
      /code/branches/skybox2/src/modules/docking6559-6989
      /code/branches/sound/src/modules/docking2829-3010
      /code/branches/sound3/src/modules/docking5941-6102
      /code/branches/spaceboundaries/src/modules/docking8085-8457
      /code/branches/spaceboundaries2/src/modules/docking8460-8613
      /code/branches/spacerace/src/modules/docking8182-8630
      /code/branches/steering/src/modules/docking5949-6091,​8140-8595
      /code/branches/tetris/src/modules/docking8100-8563
      /code/branches/tutoriallevel/src/modules/docking7827-8370
      /code/branches/tutoriallevel2/src/modules/docking8370-8452
      /code/branches/tutoriallevel3/src/modules/docking8453-8636
      /code/branches/unity_build/src/modules/docking8440-8716
      /code/branches/usability/src/modules/docking7915-8078
      /code/branches/weapon/src/modules/docking1925-2094
      /code/branches/weapon2/src/modules/docking2107-2488
      /code/branches/weapons/src/modules/docking2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/docking2742-2890
  • code/branches/presentation2012/src/modules/gametypes

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/environment3/src/modules/gametypesmergedeligible
      /code/branches/formation/src/modules/gametypesmergedeligible
      /code/branches/gamecontent/src/modules/gametypesmergedeligible
      /code/branches/hud/src/modules/gametypesmergedeligible
      /code/branches/masterserverfix/src/modules/gametypesmergedeligible
      /code/branches/menue/src/modules/gametypesmergedeligible
      /code/branches/newlevel2012/src/modules/gametypesmergedeligible
      /code/branches/output/src/modules/gametypesmergedeligible
      /code/branches/pickup2012/src/modules/gametypesmergedeligible
      /code/branches/presentation/src/modules/gametypesmergedeligible
      /code/branches/presentation2011/src/modules/gametypesmergedeligible
      /code/branches/shipSelection/src/modules/gametypesmergedeligible
      /code/branches/sound2012/src/modules/gametypesmergedeligible
      /code/branches/spacegate/src/modules/gametypesmergedeligible
      /code/branches/spaceraceTwo/src/modules/gametypesmergedeligible
      /code/branches/surfaceRace/src/modules/gametypesmergedeligible
      /code/trunk/src/modules/gametypesmergedeligible
      /code/branches/ai/src/modules/gametypes6592-7033
      /code/branches/ai2/src/modules/gametypes8721-8880
      /code/branches/bigships/src/modules/gametypes8137-8588
      /code/branches/buildsystem/src/modules/gametypes1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/gametypes2506-2658
      /code/branches/buildsystem3/src/modules/gametypes2662-2708
      /code/branches/ceguilua/src/modules/gametypes1802-1808
      /code/branches/chat/src/modules/gametypes6527-6797
      /code/branches/chat2/src/modules/gametypes6836-6910
      /code/branches/console/src/modules/gametypes5941-6104
      /code/branches/consolecommands2/src/modules/gametypes6451-7178
      /code/branches/consolecommands3/src/modules/gametypes7178-7283
      /code/branches/core3/src/modules/gametypes1572-1739
      /code/branches/core4/src/modules/gametypes3221-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/src/modules/gametypes5768-5928,​6009
      /code/branches/data_cleanup/src/modules/gametypes7537-7686
      /code/branches/doc/src/modules/gametypes7290-7400
      /code/branches/dockingsystem/src/modules/gametypes8101-8192
      /code/branches/dockingsystem2/src/modules/gametypes8196-8560
      /code/branches/dynamicmatch/src/modules/gametypes6584-7030
      /code/branches/fps/src/modules/gametypes6591-7072
      /code/branches/gameimmersion/src/modules/gametypes8102-8577
      /code/branches/gamestate/src/modules/gametypes6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/gametypes6594-6745
      /code/branches/gametypes/src/modules/gametypes2826-3031
      /code/branches/gcc43/src/modules/gametypes1580
      /code/branches/gui/src/modules/gametypes1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/gametypes6584-6941
      /code/branches/hudimprovements/src/modules/gametypes7920-8672
      /code/branches/ingamemenu/src/modules/gametypes6000-6023
      /code/branches/input/src/modules/gametypes1629-1636
      /code/branches/ipv6/src/modules/gametypes7293-7458
      /code/branches/kicklib/src/modules/gametypes7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/gametypes8282-8350
      /code/branches/lastmanstanding/src/modules/gametypes7479-7644
      /code/branches/lastmanstanding3/src/modules/gametypes7903-8175
      /code/branches/libraries/src/modules/gametypes5612-5692
      /code/branches/libraries2/src/modules/gametypes5703-5737
      /code/branches/lod/src/modules/gametypes6586-6911
      /code/branches/lodfinal/src/modules/gametypes2372-2411
      /code/branches/mac_osx/src/modules/gametypes7789-8128,​8135
      /code/branches/map/src/modules/gametypes2801-3086,​3089
      /code/branches/masterserver/src/modules/gametypes7502-7738
      /code/branches/menu/src/modules/gametypes5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/gametypes2754-2824
      /code/branches/netp2/src/modules/gametypes2835-2988
      /code/branches/netp3/src/modules/gametypes2988-3082
      /code/branches/netp6/src/modules/gametypes3214-3302
      /code/branches/network/src/modules/gametypes2356
      /code/branches/network2/src/modules/gametypes6434-6465
      /code/branches/network3/src/modules/gametypes7196-7344
      /code/branches/network4/src/modules/gametypes7497-7755
      /code/branches/network5/src/modules/gametypes7757-7781
      /code/branches/network6/src/modules/gametypes7823-8315
      /code/branches/network64/src/modules/gametypes2210-2355
      /code/branches/notifications/src/modules/gametypes7314-7401
      /code/branches/objecthierarchy/src/modules/gametypes1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/gametypes2171-2479
      /code/branches/ois_update/src/modules/gametypes7506-7788
      /code/branches/overlay/src/modules/gametypes2117-2385
      /code/branches/particles/src/modules/gametypes2829-3085
      /code/branches/particles2/src/modules/gametypes6050-6106,​6109
      /code/branches/pch/src/modules/gametypes3113-3194
      /code/branches/physics/src/modules/gametypes1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/gametypes2436-2457
      /code/branches/pickup/src/modules/gametypes8145-8555
      /code/branches/pickup2/src/modules/gametypes5942-6405
      /code/branches/pickup3/src/modules/gametypes6418-6523
      /code/branches/pickup4/src/modules/gametypes6594-6710
      /code/branches/pickups/src/modules/gametypes1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/gametypes2107-2497,​2915-3071
      /code/branches/png2/src/modules/gametypes7262-7263
      /code/branches/portals/src/modules/gametypes8087-8455
      /code/branches/portals2/src/modules/gametypes8460-8602
      /code/branches/ppspickups1/src/modules/gametypes6552-6708
      /code/branches/ppspickups2/src/modules/gametypes6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/gametypes6757-6997
      /code/branches/ppspickups4/src/modules/gametypes7003-7089
      /code/branches/presentation2/src/modules/gametypes6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/gametypes6913-7162
      /code/branches/questsystem/src/modules/gametypes1894-2088
      /code/branches/questsystem2/src/modules/gametypes2107-2259
      /code/branches/questsystem5/src/modules/gametypes2776-2905
      /code/branches/releasetodo/src/modules/gametypes7614-7647
      /code/branches/resource/src/modules/gametypes3327-3366
      /code/branches/resource2/src/modules/gametypes3372-5694
      /code/branches/rocket/src/modules/gametypes6523-6950
      /code/branches/rocket2/src/modules/gametypes6953-6970
      /code/branches/script_trigger/src/modules/gametypes1295-1953,​1955
      /code/branches/skybox2/src/modules/gametypes6559-6989
      /code/branches/sound/src/modules/gametypes2829-3010
      /code/branches/sound3/src/modules/gametypes5941-6102
      /code/branches/spaceboundaries/src/modules/gametypes8085-8457
      /code/branches/spaceboundaries2/src/modules/gametypes8460-8613
      /code/branches/spacerace/src/modules/gametypes8182-8630
      /code/branches/steering/src/modules/gametypes5949-6091,​8140-8595
      /code/branches/tetris/src/modules/gametypes8100-8563
      /code/branches/tutoriallevel/src/modules/gametypes7827-8370
      /code/branches/tutoriallevel2/src/modules/gametypes8370-8452
      /code/branches/tutoriallevel3/src/modules/gametypes8453-8636
      /code/branches/unity_build/src/modules/gametypes8440-8716
      /code/branches/usability/src/modules/gametypes7915-8078
      /code/branches/weapon/src/modules/gametypes1925-2094
      /code/branches/weapon2/src/modules/gametypes2107-2488
      /code/branches/weapons/src/modules/gametypes2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/gametypes2742-2890
  • code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.cc

    r9240 r9241  
    2828#include "CaptureTheFlag.h"
    2929
    30 #include "core/CoreIncludes.h"
    3130#include "core/ConfigValueIncludes.h"
    3231#include "interfaces/TeamColourable.h"
     
    3938{
    4039    CreateUnloadableFactory(CaptureTheFlag);
    41 
     40   
    4241    CaptureTheFlag::CaptureTheFlag(BaseObject* creator) : TeamBaseMatch(creator)
    4342    {
     
    4746        this->pointsTeam1_ = 0;
    4847        this->pointsTeam2_ = 0;
    49        
    50         //this->flagTeamBlue = new FlagPickup(this);
    51         //this->flagTeamRed = new FlagPickup(this);
    52 
     48               
     49//      this->flagTeamBlue = new FlagPickup(this);
     50//      this->flagTeamRed = new FlagPickup(this);
     51       
    5352        this->setConfigValues();
    5453    }
    55 
     54   
    5655    void CaptureTheFlag::tick(float dt){
     56       
     57        SUPER(CaptureTheFlag, tick, dt);
     58       
    5759        if(this->flagTeamBlue->isPickedUp()){
    58                 if(getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer()) == 1){
     60            teamnr = getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer());
     61                if(teamnr == 1){
    5962                    this->flagTeamBlue->ignorePickedUp();
    6063                   
    6164                        if(this->flagTeamBlue->pickedUpBy()->hasFlag()){
    62                                 pointsTeam1_ += 1000;
     65                    this->addTeamPoints(teamnr, 1000);
    6366                                this->flagTeamBlue->pickedUpBy()->setHasFlag(false);
    6467                        }
     
    7073        }
    7174        if(this->flagTeamRed->isPickedUp()){
    72                 if(getTeam(this->flagTeamRed->pickedUpBy()->getPlayer()) == 0){
     75            teamnr = getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer());
     76                if(teamnr == 0){
    7377                    this->flagTeamRed->ignorePickedUp();
    7478                   
    7579                        if(this->flagTeamRed->pickedUpBy()->hasFlag()){
    76                                 pointsTeam1_ += 1000;
     80                    this->addTeamPoints(teamnr, 1000);
    7781                                this->flagTeamRed->pickedUpBy()->setHasFlag(false);
    7882                        }
     
    8387                }
    8488        }
     89       
    8590    }
    8691    void CaptureTheFlag::setConfigValues()
    8792    {
    8893        SetConfigValue(teams_, 2);
    89 
     94       
    9095        static ColourValue colours[] =
    9196        {
     
    96101        };
    97102        static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue));
    98 
     103       
    99104        SetConfigValue(teamcolours_, defaultcolours);
    100105    }
    101 
     106   
    102107    void CaptureTheFlag::playerEntered(PlayerInfo* player)
    103108    {
    104         Deathmatch::playerEntered(player);
    105 
     109        TeamBaseMatch::playerEntered(player);
     110       
    106111        std::vector<unsigned int> playersperteam(this->teams_, 0);
    107 
     112       
    108113        for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
    109114            if (it->second < static_cast<int>(this->teams_) && it->second >= 0)
    110115                playersperteam[it->second]++;
    111 
     116       
    112117        unsigned int minplayers = static_cast<unsigned int>(-1);
    113118        size_t minplayersteam = 0;
     
    120125            }
    121126        }
    122 
     127       
    123128        this->teamnumbers_[player] = minplayersteam;
    124129    }
    125 
     130   
    126131    bool CaptureTheFlag::playerLeft(PlayerInfo* player)
    127132    {
    128133        bool valid_player = Deathmatch::playerLeft(player);
    129 
     134       
    130135        if (valid_player)
    131136            this->teamnumbers_.erase(player);
    132 
     137       
    133138        return valid_player;
    134139    }
    135 
     140   
    136141    bool CaptureTheFlag::allowPawnHit(Pawn* victim, Pawn* originator)
    137142    {
    138143        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
    139144    }
    140 
     145   
    141146    bool CaptureTheFlag::allowPawnDamage(Pawn* victim, Pawn* originator)
    142147    {
    143148        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
    144149    }
    145 
     150   
    146151    bool CaptureTheFlag::allowPawnDeath(Pawn* victim, Pawn* originator)
    147152    {
    148153        return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator);
    149154    }
    150 
     155   
    151156    // collect Points for killing oppenents
    152         void CaptureTheFlag::playerScored(PlayerInfo* player)
    153         {
    154             int teamnr = this->getTeam(player);
    155             this->addTeamPoints(teamnr, 5);
    156         }
    157        
    158        
    159         // show points or each interval of time
    160         void CaptureTheFlag::showPoints()
    161         {
    162             if (!this->hasStarted() || this->hasEnded())
    163                 return;
    164 
    165             orxout(message) << "Points standing:" << '\n' << "Team Blue: "<< pointsTeam1_ << '\n' << "Team Red: " << pointsTeam2_ << endl;
    166             if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) orxout(message) << "Team Blue is near victory!" << endl;
    167             if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) orxout(message) << "Team Red is near victory!" << endl;
    168         }
    169        
    170         // end game if one team reaches 2000 points
    171         void CaptureTheFlag::endGame()
    172         {
    173             if (this->pointsTeam1_ >= 2000 || this->pointsTeam2_ >= 2000)
    174             {
    175                 int winningteam = -1;
    176 
    177                 if (this->pointsTeam1_ > this->pointsTeam2_)
    178                 {
    179                     orxout(message) << "Team Blue has won the match" << endl;
    180                     winningteam = 0;
    181                 }
     157    void CaptureTheFlag::playerScored(PlayerInfo* player)
     158    {
     159        int teamnr = this->getTeam(player);
     160        this->addTeamPoints(teamnr, 5);
     161    }
     162   
     163   
     164    // show points or each interval of time
     165    void CaptureTheFlag::showPoints()
     166    {
     167        if (!this->hasStarted() || this->hasEnded())
     168            return;
     169       
     170        orxout(message) << "Points standing:" << '\n' << "Team Blue: "<< pointsTeam1_ << '\n' << "Team Red: " << pointsTeam2_ << endl;
     171        if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) orxout(message) << "Team Blue is near victory!" << endl;
     172        if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) orxout(message) << "Team Red is near victory!" << endl;
     173    }
     174   
     175    // end game if one team reaches 2000 points
     176    void CaptureTheFlag::endGame()
     177    {
     178        if (this->pointsTeam1_ >= 2000 || this->pointsTeam2_ >= 2000)
     179        {
     180            int winningteam = -1;
     181           
     182            if (this->pointsTeam1_ > this->pointsTeam2_)
     183            {
     184                orxout(message) << "Team Blue has won the match" << endl;
     185                winningteam = 0;
     186            }
     187            else
     188            {
     189                orxout(message) << "Team Red has won the match" << endl;
     190                winningteam = 1;
     191            }
     192           
     193            for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
     194            {
     195                if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
     196                    continue;
     197               
     198                if (it->second == winningteam)
     199                    this->gtinfo_->sendAnnounceMessage("You have won the match!", it->first->getClientID());
    182200                else
    183                 {
    184                     orxout(message) << "Team Red has won the match" << endl;
    185                     winningteam = 1;
    186                 }
    187 
    188                 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
    189                 {
    190                     if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
    191                         continue;
    192 
    193                     if (it->second == winningteam)
    194                         this->gtinfo_->sendAnnounceMessage("You have won the match!", it->first->getClientID());
    195                     else
    196                         this->gtinfo_->sendAnnounceMessage("You have lost the match!", it->first->getClientID());
    197                 }
    198 
    199                 this->end();
    200                 this->scoreTimer_.stopTimer();
    201                 this->outputTimer_.stopTimer();
    202             }
    203         }
    204        
    205         // this function is called by the function winPoints() which adds points to the teams for every base and killed openents at a certain time
    206         void CaptureTheFlag::addTeamPoints(int team, int points)
    207         {
    208             if(team == 0)
    209             {
    210                 this->pointsTeam1_ += points;
    211             }
    212             if(team == 1)
    213             {
    214                 this->pointsTeam2_ += points;
    215             }
    216 
    217             this->endGame();
    218         }
    219 
    220         int TeamBaseMatch::getTeamPoints(int team)
    221         {
    222             if(team == 0)
    223             {
    224                 return this->pointsTeam1_;
    225             }
    226             if(team == 1)
    227             {
    228                 return this->pointsTeam2_;
    229             }
    230 
    231             return 0;
    232         }
    233        
     201                    this->gtinfo_->sendAnnounceMessage("You have lost the match!", it->first->getClientID());
     202            }
     203           
     204            this->end();
     205            this->scoreTimer_.stopTimer();
     206            this->outputTimer_.stopTimer();
     207        }
     208    }
     209   
     210    // this function is called by the function winPoints() which adds points to the teams for every base and killed openents at a certain time
     211    void CaptureTheFlag::addTeamPoints(int team, int points)
     212    {
     213        if(team == 0)
     214        {
     215            this->pointsTeam1_ += points;
     216        }
     217        if(team == 1)
     218        {
     219            this->pointsTeam2_ += points;
     220        }
     221       
     222        this->endGame();
     223    }
     224   
     225    int TeamBaseMatch::getTeamPoints(int team)
     226    {
     227        if(team == 0)
     228        {
     229            return this->pointsTeam1_;
     230        }
     231        if(team == 1)
     232        {
     233            return this->pointsTeam2_;
     234        }
     235       
     236        return 0;
     237    }
     238   
    234239    SpawnPoint* CaptureTheFlag::getBestSpawnPoint(PlayerInfo* player) const
    235240    {
     
    238243        if (it_player != this->teamnumbers_.end())
    239244            desiredTeamNr = it_player->second;
    240 
     245       
    241246        // Only use spawnpoints of the own team (or non-team-spawnpoints)
    242247        std::set<SpawnPoint*> teamSpawnPoints = this->spawnpoints_;
     
    252257                }
    253258            }
    254 
     259           
    255260            ++it;
    256261        }
    257 
     262       
    258263        SpawnPoint* fallbackSpawnPoint = NULL;
    259264        if (teamSpawnPoints.size() > 0)
     
    269274                    break;
    270275                }
    271 
     276               
    272277                ++index;
    273278            }
    274 
     279           
    275280            // Remove all inactive SpawnPoints from the list.
    276281            for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
     
    281286                    continue;
    282287                }
    283 
     288               
    284289                ++it;
    285290            }
    286 
     291           
    287292            randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));
    288293            index = 0;
     
    291296                if (index == randomspawn)
    292297                    return (*it);
    293 
     298               
    294299                ++index;
    295300            }
    296 
     301           
    297302            return fallbackSpawnPoint;
    298303        }
    299 
     304       
    300305        return 0;
    301306    }
    302 
     307   
    303308    void CaptureTheFlag::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
    304309    {
    305310        if (!player)
    306311            return;
    307 
     312       
    308313        // Set the team colour
    309314        std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
     
    313318            {
    314319                pawn->setRadarObjectColour(this->teamcolours_[it_player->second]);
    315 
     320               
    316321                std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
    317322                for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
     
    326331        }
    327332    }
    328 
     333   
    329334    bool CaptureTheFlag::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
    330335    {
     
    333338            std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
    334339            std::map<PlayerInfo*, int>::const_iterator it2 = this->teamnumbers_.find(pawn2->getPlayer());
    335 
     340           
    336341            if (it1 != this->teamnumbers_.end() && it2 != this->teamnumbers_.end())
    337342                return (it1->second == it2->second);
     
    339344        return false;
    340345    }
    341 
     346   
    342347    int CaptureTheFlag::getTeam(PlayerInfo* player)
    343348    {
  • code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h

    r9240 r9241  
    3232#include "OrxonoxPrereqs.h"
    3333#include <set>
     34#include "core/CoreIncludes.h"
     35
    3436#include "tools/Timer.h"
    3537#include "gametypes/TeamBaseMatch.h"
    3638#include "infos/PlayerInfo.h"
    3739#include "pickup/items/FlagPickup.h"
     40#include "pickup/PickupPrereqs.h"
    3841
    3942namespace orxonox
     
    4245    {
    4346    public:
    44                         CaptureTheFlag(BaseObject* creator);
    45                 virtual ~CaptureTheFlag() {}
    46 
    47                 void tick(float dt);
    48 
    49                 void setConfigValues();
    50 
    51                 virtual void playerEntered(PlayerInfo* player);
    52                 virtual bool playerLeft(PlayerInfo* player);
    53 
    54                 virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
    55                 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
    56                 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
    57 
    58                 virtual void playerScored(PlayerInfo* player);
    59                 virtual void showPoints();
    60                 virtual void endGame();
    61 
    62                 void addTeamPoints(int team, int points);
    63                 int getTeamPoints(int team);
    64 
    65                 virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
    66 
    67                 int getTeam(PlayerInfo* player);
    68                 inline const ColourValue& getTeamColour(int teamnr) const
    69                     { return this->teamcolours_[teamnr]; }
    70 
    71             protected:
    72                 virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
    73                 bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
    74 
    75                 std::map<PlayerInfo*, int> teamnumbers_;
    76                 std::vector<ColourValue> teamcolours_;
    77                 unsigned int teams_;
    78 
    79                 FlagPickup* flagTeamBlue;
    80                 FlagPickup* flagTeamRed;
    81                 //points for each team
    82                 int pointsTeam1_;
    83                 int pointsTeam2_;
    84 
     47        CaptureTheFlag(BaseObject* creator);
     48        virtual ~CaptureTheFlag() {}
     49       
     50        void tick(float dt);
     51       
     52        void setConfigValues();
     53       
     54        virtual void playerEntered(PlayerInfo* player);
     55        virtual bool playerLeft(PlayerInfo* player);
     56       
     57        virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
     58        virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
     59        virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
     60       
     61        virtual void playerScored(PlayerInfo* player);
     62        virtual void showPoints();
     63        virtual void endGame();
     64       
     65        void addTeamPoints(int team, int points);
     66        int getTeamPoints(int team);
     67       
     68        virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
     69       
     70        int getTeam(PlayerInfo* player);
     71        inline const ColourValue& getTeamColour(int teamnr) const
     72        { return this->teamcolours_[teamnr]; }
     73       
     74    protected:
     75        virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
     76        bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
     77       
     78        std::map<PlayerInfo*, int> teamnumbers_;
     79        std::vector<ColourValue> teamcolours_;
     80        unsigned int teams_;
     81       
     82        FlagPickup* flagTeamBlue;
     83        FlagPickup* flagTeamRed;
     84       
     85        //points for each team
     86        int pointsTeam1_;
     87        int pointsTeam2_;
     88        int teamnr;
     89       
    8590    };
    8691}
  • code/branches/presentation2012/src/modules/notifications

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/notificationsmergedeligible
      /code/branches/environment3/src/modules/notificationsmergedeligible
      /code/branches/formation/src/modules/notificationsmergedeligible
      /code/branches/gamecontent/src/modules/notificationsmergedeligible
      /code/branches/hud/src/modules/notificationsmergedeligible
      /code/branches/masterserverfix/src/modules/notificationsmergedeligible
      /code/branches/menue/src/modules/notificationsmergedeligible
      /code/branches/newlevel2012/src/modules/notificationsmergedeligible
      /code/branches/output/src/modules/notificationsmergedeligible
      /code/branches/pickup2012/src/modules/notificationsmergedeligible
      /code/branches/presentation/src/modules/notificationsmergedeligible
      /code/branches/presentation2011/src/modules/notificationsmergedeligible
      /code/branches/shipSelection/src/modules/notificationsmergedeligible
      /code/branches/sound2012/src/modules/notificationsmergedeligible
      /code/branches/spacegate/src/modules/notificationsmergedeligible
      /code/branches/spaceraceTwo/src/modules/notificationsmergedeligible
      /code/branches/surfaceRace/src/modules/notificationsmergedeligible
      /code/branches/usability/src/modules/notificationsmergedeligible
      /code/trunk/src/modules/notificationsmergedeligible
      /code/branches/ai/src/modules/notifications6592-7033
      /code/branches/ai2/src/modules/notifications8721-8880
      /code/branches/bigships/src/modules/notifications8137-8588
      /code/branches/buildsystem/src/modules/notifications1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/notifications2506-2658
      /code/branches/buildsystem3/src/modules/notifications2662-2708
      /code/branches/ceguilua/src/modules/notifications1802-1808
      /code/branches/chat/src/modules/notifications6527-6797
      /code/branches/chat2/src/modules/notifications6836-6910
      /code/branches/console/src/modules/notifications5941-6104
      /code/branches/consolecommands2/src/modules/notifications6451-7178
      /code/branches/consolecommands3/src/modules/notifications7178-7283
      /code/branches/core3/src/modules/notifications1572-1739
      /code/branches/core4/src/modules/notifications3221-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/src/modules/notifications5768-5928,​6009
      /code/branches/data_cleanup/src/modules/notifications7537-7686
      /code/branches/doc/src/modules/notifications7290-7400
      /code/branches/dockingsystem/src/modules/notifications8101-8192
      /code/branches/dynamicmatch/src/modules/notifications6584-7030
      /code/branches/fps/src/modules/notifications6591-7072
      /code/branches/gameimmersion/src/modules/notifications8102-8577
      /code/branches/gamestate/src/modules/notifications6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/notifications6594-6745
      /code/branches/gametypes/src/modules/notifications2826-3031
      /code/branches/gcc43/src/modules/notifications1580
      /code/branches/gui/src/modules/notifications1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/notifications6584-6941
      /code/branches/hudimprovements/src/modules/notifications7920-8672
      /code/branches/ingamemenu/src/modules/notifications6000-6023
      /code/branches/input/src/modules/notifications1629-1636
      /code/branches/ipv6/src/modules/notifications7293-7458
      /code/branches/kicklib/src/modules/notifications7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/notifications8282-8350
      /code/branches/lastmanstanding/src/modules/notifications7479-7644
      /code/branches/lastmanstanding3/src/modules/notifications7903-8175
      /code/branches/libraries/src/modules/notifications5612-5692
      /code/branches/libraries2/src/modules/notifications5703-5737
      /code/branches/lod/src/modules/notifications6586-6911
      /code/branches/lodfinal/src/modules/notifications2372-2411
      /code/branches/mac_osx/src/modules/notifications7789-8128,​8135
      /code/branches/map/src/modules/notifications2801-3086,​3089
      /code/branches/masterserver/src/modules/notifications7502-7738
      /code/branches/menu/src/modules/notifications5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/notifications2754-2824
      /code/branches/netp2/src/modules/notifications2835-2988
      /code/branches/netp3/src/modules/notifications2988-3082
      /code/branches/netp6/src/modules/notifications3214-3302
      /code/branches/network/src/modules/notifications2356
      /code/branches/network2/src/modules/notifications6434-6465
      /code/branches/network3/src/modules/notifications7196-7344
      /code/branches/network4/src/modules/notifications7497-7755
      /code/branches/network5/src/modules/notifications7757-7781
      /code/branches/network6/src/modules/notifications7823-8315
      /code/branches/network64/src/modules/notifications2210-2355
      /code/branches/notifications/src/modules/notifications7314-7401
      /code/branches/objecthierarchy/src/modules/notifications1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/notifications2171-2479
      /code/branches/ois_update/src/modules/notifications7506-7788
      /code/branches/overlay/src/modules/notifications2117-2385
      /code/branches/particles/src/modules/notifications2829-3085
      /code/branches/particles2/src/modules/notifications6050-6106,​6109
      /code/branches/pch/src/modules/notifications3113-3194
      /code/branches/physics/src/modules/notifications1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/notifications2436-2457
      /code/branches/pickup/src/modules/notifications8145-8555
      /code/branches/pickup2/src/modules/notifications5942-6405
      /code/branches/pickup3/src/modules/notifications6418-6523
      /code/branches/pickup4/src/modules/notifications6594-6710
      /code/branches/pickups/src/modules/notifications1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/notifications2107-2497,​2915-3071
      /code/branches/png2/src/modules/notifications7262-7263
      /code/branches/portals/src/modules/notifications8087-8455
      /code/branches/portals2/src/modules/notifications8460-8602
      /code/branches/ppspickups1/src/modules/notifications6552-6708
      /code/branches/ppspickups2/src/modules/notifications6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/notifications6757-6997
      /code/branches/ppspickups4/src/modules/notifications7003-7089
      /code/branches/presentation2/src/modules/notifications6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/notifications6913-7162
      /code/branches/questsystem/src/modules/notifications1894-2088
      /code/branches/questsystem2/src/modules/notifications2107-2259
      /code/branches/questsystem5/src/modules/notifications2776-2905
      /code/branches/releasetodo/src/modules/notifications7614-7647
      /code/branches/resource/src/modules/notifications3327-3366
      /code/branches/resource2/src/modules/notifications3372-5694
      /code/branches/rocket/src/modules/notifications6523-6950
      /code/branches/rocket2/src/modules/notifications6953-6970
      /code/branches/script_trigger/src/modules/notifications1295-1953,​1955
      /code/branches/skybox2/src/modules/notifications6559-6989
      /code/branches/sound/src/modules/notifications2829-3010
      /code/branches/sound3/src/modules/notifications5941-6102
      /code/branches/spaceboundaries/src/modules/notifications8085-8457
      /code/branches/spaceboundaries2/src/modules/notifications8460-8613
      /code/branches/spacerace/src/modules/notifications8182-8630
      /code/branches/steering/src/modules/notifications5949-6091,​8140-8595
      /code/branches/tetris/src/modules/notifications8100-8563
      /code/branches/tutoriallevel/src/modules/notifications7827-8370
      /code/branches/tutoriallevel2/src/modules/notifications8370-8452
      /code/branches/tutoriallevel3/src/modules/notifications8453-8636
      /code/branches/unity_build/src/modules/notifications8440-8716
      /code/branches/weapon/src/modules/notifications1925-2094
      /code/branches/weapon2/src/modules/notifications2107-2488
      /code/branches/weapons/src/modules/notifications2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/notifications2742-2890
  • code/branches/presentation2012/src/modules/objects

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/objectsmergedeligible
      /code/branches/environment3/src/modules/objectsmergedeligible
      /code/branches/formation/src/modules/objectsmergedeligible
      /code/branches/gamecontent/src/modules/objectsmergedeligible
      /code/branches/hud/src/modules/objectsmergedeligible
      /code/branches/masterserverfix/src/modules/objectsmergedeligible
      /code/branches/menue/src/modules/objectsmergedeligible
      /code/branches/newlevel2012/src/modules/objectsmergedeligible
      /code/branches/output/src/modules/objectsmergedeligible
      /code/branches/pickup2012/src/modules/objectsmergedeligible
      /code/branches/presentation/src/modules/objectsmergedeligible
      /code/branches/presentation2011/src/modules/objectsmergedeligible
      /code/branches/shipSelection/src/modules/objectsmergedeligible
      /code/branches/sound2012/src/modules/objectsmergedeligible
      /code/branches/spacegate/src/modules/objectsmergedeligible
      /code/branches/spaceraceTwo/src/modules/objectsmergedeligible
      /code/branches/surfaceRace/src/modules/objectsmergedeligible
      /code/branches/usability/src/modules/objectsmergedeligible
      /code/trunk/src/modules/objectsmergedeligible
      /code/branches/ai/src/modules/objects6592-7033
      /code/branches/ai2/src/modules/objects8721-8880
      /code/branches/bigships/src/modules/objects8137-8588
      /code/branches/buildsystem/src/modules/objects1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/objects2506-2658
      /code/branches/buildsystem3/src/modules/objects2662-2708
      /code/branches/ceguilua/src/modules/objects1802-1808
      /code/branches/chat/src/modules/objects6527-6797
      /code/branches/chat2/src/modules/objects6836-6910
      /code/branches/console/src/modules/objects5941-6104
      /code/branches/consolecommands2/src/modules/objects6451-7178
      /code/branches/consolecommands3/src/modules/objects7178-7283
      /code/branches/core3/src/modules/objects1572-1739
      /code/branches/core4/src/modules/objects3221-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/src/modules/objects5768-5928,​6009
      /code/branches/data_cleanup/src/modules/objects7537-7686
      /code/branches/doc/src/modules/objects7290-7400
      /code/branches/dockingsystem/src/modules/objects8101-8192
      /code/branches/dynamicmatch/src/modules/objects6584-7030
      /code/branches/fps/src/modules/objects6591-7072
      /code/branches/gameimmersion/src/modules/objects8102-8577
      /code/branches/gamestate/src/modules/objects6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/objects6594-6745
      /code/branches/gametypes/src/modules/objects2826-3031
      /code/branches/gcc43/src/modules/objects1580
      /code/branches/gui/src/modules/objects1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/objects6584-6941
      /code/branches/hudimprovements/src/modules/objects7920-8672
      /code/branches/ingamemenu/src/modules/objects6000-6023
      /code/branches/input/src/modules/objects1629-1636
      /code/branches/ipv6/src/modules/objects7293-7458
      /code/branches/kicklib/src/modules/objects7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/objects8282-8350
      /code/branches/lastmanstanding/src/modules/objects7479-7644
      /code/branches/lastmanstanding3/src/modules/objects7903-8175
      /code/branches/libraries/src/modules/objects5612-5692
      /code/branches/libraries2/src/modules/objects5703-5737
      /code/branches/lod/src/modules/objects6586-6911
      /code/branches/lodfinal/src/modules/objects2372-2411
      /code/branches/mac_osx/src/modules/objects7789-8128,​8135
      /code/branches/map/src/modules/objects2801-3086,​3089
      /code/branches/masterserver/src/modules/objects7502-7738
      /code/branches/menu/src/modules/objects5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/objects2754-2824
      /code/branches/netp2/src/modules/objects2835-2988
      /code/branches/netp3/src/modules/objects2988-3082
      /code/branches/netp6/src/modules/objects3214-3302
      /code/branches/network/src/modules/objects2356
      /code/branches/network2/src/modules/objects6434-6465
      /code/branches/network3/src/modules/objects7196-7344
      /code/branches/network4/src/modules/objects7497-7755
      /code/branches/network5/src/modules/objects7757-7781
      /code/branches/network6/src/modules/objects7823-8315
      /code/branches/network64/src/modules/objects2210-2355
      /code/branches/notifications/src/modules/objects7314-7401
      /code/branches/objecthierarchy/src/modules/objects1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/objects2171-2479
      /code/branches/ois_update/src/modules/objects7506-7788
      /code/branches/overlay/src/modules/objects2117-2385
      /code/branches/particles/src/modules/objects2829-3085
      /code/branches/particles2/src/modules/objects6050-6106,​6109
      /code/branches/pch/src/modules/objects3113-3194
      /code/branches/physics/src/modules/objects1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/objects2436-2457
      /code/branches/pickup/src/modules/objects8145-8555
      /code/branches/pickup2/src/modules/objects5942-6405
      /code/branches/pickup3/src/modules/objects6418-6523
      /code/branches/pickup4/src/modules/objects6594-6710
      /code/branches/pickups/src/modules/objects1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/objects2107-2497,​2915-3071
      /code/branches/png2/src/modules/objects7262-7263
      /code/branches/portals/src/modules/objects8087-8455
      /code/branches/portals2/src/modules/objects8460-8602
      /code/branches/ppspickups1/src/modules/objects6552-6708
      /code/branches/ppspickups2/src/modules/objects6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/objects6757-6997
      /code/branches/ppspickups4/src/modules/objects7003-7089
      /code/branches/presentation2/src/modules/objects6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/objects6913-7162
      /code/branches/questsystem/src/modules/objects1894-2088
      /code/branches/questsystem2/src/modules/objects2107-2259
      /code/branches/questsystem5/src/modules/objects2776-2905
      /code/branches/releasetodo/src/modules/objects7614-7647
      /code/branches/resource/src/modules/objects3327-3366
      /code/branches/resource2/src/modules/objects3372-5694
      /code/branches/rocket/src/modules/objects6523-6950
      /code/branches/rocket2/src/modules/objects6953-6970
      /code/branches/script_trigger/src/modules/objects1295-1953,​1955
      /code/branches/skybox2/src/modules/objects6559-6989
      /code/branches/sound/src/modules/objects2829-3010
      /code/branches/sound3/src/modules/objects5941-6102
      /code/branches/spaceboundaries/src/modules/objects8085-8457
      /code/branches/spaceboundaries2/src/modules/objects8460-8613
      /code/branches/spacerace/src/modules/objects8182-8630
      /code/branches/steering/src/modules/objects5949-6091,​8140-8595
      /code/branches/tetris/src/modules/objects8100-8563
      /code/branches/tutoriallevel/src/modules/objects7827-8370
      /code/branches/tutoriallevel2/src/modules/objects8370-8452
      /code/branches/tutoriallevel3/src/modules/objects8453-8636
      /code/branches/unity_build/src/modules/objects8440-8716
      /code/branches/weapon/src/modules/objects1925-2094
      /code/branches/weapon2/src/modules/objects2107-2488
      /code/branches/weapons/src/modules/objects2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/objects2742-2890
  • code/branches/presentation2012/src/modules/overlays

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

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/pickupmergedeligible
      /code/branches/environment3/src/modules/pickupmergedeligible
      /code/branches/formation/src/modules/pickupmergedeligible
      /code/branches/gamecontent/src/modules/pickupmergedeligible
      /code/branches/hud/src/modules/pickupmergedeligible
      /code/branches/masterserverfix/src/modules/pickupmergedeligible
      /code/branches/menue/src/modules/pickupmergedeligible
      /code/branches/newlevel2012/src/modules/pickupmergedeligible
      /code/branches/output/src/modules/pickupmergedeligible
      /code/branches/pickup2012/src/modules/pickupmergedeligible
      /code/branches/presentation/src/modules/pickupmergedeligible
      /code/branches/presentation2011/src/modules/pickupmergedeligible
      /code/branches/shipSelection/src/modules/pickupmergedeligible
      /code/branches/sound2012/src/modules/pickupmergedeligible
      /code/branches/spacegate/src/modules/pickupmergedeligible
      /code/branches/spaceraceTwo/src/modules/pickupmergedeligible
      /code/branches/surfaceRace/src/modules/pickupmergedeligible
      /code/branches/usability/src/modules/pickupmergedeligible
      /code/trunk/src/modules/pickupmergedeligible
      /code/branches/ai/src/modules/pickup6592-7033
      /code/branches/ai2/src/modules/pickup8721-8880
      /code/branches/bigships/src/modules/pickup8137-8588
      /code/branches/buildsystem/src/modules/pickup1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/pickup2506-2658
      /code/branches/buildsystem3/src/modules/pickup2662-2708
      /code/branches/ceguilua/src/modules/pickup1802-1808
      /code/branches/chat/src/modules/pickup6527-6797
      /code/branches/chat2/src/modules/pickup6836-6910
      /code/branches/console/src/modules/pickup5941-6104
      /code/branches/consolecommands2/src/modules/pickup6451-7178
      /code/branches/consolecommands3/src/modules/pickup7178-7283
      /code/branches/core3/src/modules/pickup1572-1739
      /code/branches/core4/src/modules/pickup3221-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/src/modules/pickup5768-5928,​6009
      /code/branches/data_cleanup/src/modules/pickup7537-7686
      /code/branches/doc/src/modules/pickup7290-7400
      /code/branches/dockingsystem/src/modules/pickup8101-8192
      /code/branches/dynamicmatch/src/modules/pickup6584-7030
      /code/branches/fps/src/modules/pickup6591-7072
      /code/branches/gameimmersion/src/modules/pickup8102-8577
      /code/branches/gamestate/src/modules/pickup6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/pickup6594-6745
      /code/branches/gametypes/src/modules/pickup2826-3031
      /code/branches/gcc43/src/modules/pickup1580
      /code/branches/gui/src/modules/pickup1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/pickup6584-6941
      /code/branches/hudimprovements/src/modules/pickup7920-8672
      /code/branches/ingamemenu/src/modules/pickup6000-6023
      /code/branches/input/src/modules/pickup1629-1636
      /code/branches/ipv6/src/modules/pickup7293-7458
      /code/branches/kicklib/src/modules/pickup7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/pickup8282-8350
      /code/branches/lastmanstanding/src/modules/pickup7479-7644
      /code/branches/lastmanstanding3/src/modules/pickup7903-8175
      /code/branches/libraries/src/modules/pickup5612-5692
      /code/branches/libraries2/src/modules/pickup5703-5737
      /code/branches/lod/src/modules/pickup6586-6911
      /code/branches/lodfinal/src/modules/pickup2372-2411
      /code/branches/mac_osx/src/modules/pickup7789-8128,​8135
      /code/branches/map/src/modules/pickup2801-3086,​3089
      /code/branches/masterserver/src/modules/pickup7502-7738
      /code/branches/menu/src/modules/pickup5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/pickup2754-2824
      /code/branches/netp2/src/modules/pickup2835-2988
      /code/branches/netp3/src/modules/pickup2988-3082
      /code/branches/netp6/src/modules/pickup3214-3302
      /code/branches/network/src/modules/pickup2356
      /code/branches/network2/src/modules/pickup6434-6465
      /code/branches/network3/src/modules/pickup7196-7344
      /code/branches/network4/src/modules/pickup7497-7755
      /code/branches/network5/src/modules/pickup7757-7781
      /code/branches/network6/src/modules/pickup7823-8315
      /code/branches/network64/src/modules/pickup2210-2355
      /code/branches/notifications/src/modules/pickup7314-7401
      /code/branches/objecthierarchy/src/modules/pickup1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/pickup2171-2479
      /code/branches/ois_update/src/modules/pickup7506-7788
      /code/branches/overlay/src/modules/pickup2117-2385
      /code/branches/particles/src/modules/pickup2829-3085
      /code/branches/particles2/src/modules/pickup6050-6106,​6109
      /code/branches/pch/src/modules/pickup3113-3194
      /code/branches/physics/src/modules/pickup1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/pickup2436-2457
      /code/branches/pickup/src/modules/pickup8145-8555
      /code/branches/pickup2/src/modules/pickup5942-6405
      /code/branches/pickup3/src/modules/pickup6418-6523
      /code/branches/pickup4/src/modules/pickup6594-6710
      /code/branches/pickups/src/modules/pickup1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/pickup2107-2497,​2915-3071
      /code/branches/png2/src/modules/pickup7262-7263
      /code/branches/portals/src/modules/pickup8087-8455
      /code/branches/portals2/src/modules/pickup8460-8602
      /code/branches/ppspickups1/src/modules/pickup6552-6708
      /code/branches/ppspickups2/src/modules/pickup6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/pickup6757-6997
      /code/branches/ppspickups4/src/modules/pickup7003-7089
      /code/branches/presentation2/src/modules/pickup6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/pickup6913-7162
      /code/branches/questsystem/src/modules/pickup1894-2088
      /code/branches/questsystem2/src/modules/pickup2107-2259
      /code/branches/questsystem5/src/modules/pickup2776-2905
      /code/branches/releasetodo/src/modules/pickup7614-7647
      /code/branches/resource/src/modules/pickup3327-3366
      /code/branches/resource2/src/modules/pickup3372-5694
      /code/branches/rocket/src/modules/pickup6523-6950
      /code/branches/rocket2/src/modules/pickup6953-6970
      /code/branches/script_trigger/src/modules/pickup1295-1953,​1955
      /code/branches/skybox2/src/modules/pickup6559-6989
      /code/branches/sound/src/modules/pickup2829-3010
      /code/branches/sound3/src/modules/pickup5941-6102
      /code/branches/spaceboundaries/src/modules/pickup8085-8457
      /code/branches/spaceboundaries2/src/modules/pickup8460-8613
      /code/branches/spacerace/src/modules/pickup8182-8630
      /code/branches/steering/src/modules/pickup5949-6091,​8140-8595
      /code/branches/tetris/src/modules/pickup8100-8563
      /code/branches/tutoriallevel/src/modules/pickup7827-8370
      /code/branches/tutoriallevel2/src/modules/pickup8370-8452
      /code/branches/tutoriallevel3/src/modules/pickup8453-8636
      /code/branches/unity_build/src/modules/pickup8440-8716
      /code/branches/weapon/src/modules/pickup1925-2094
      /code/branches/weapon2/src/modules/pickup2107-2488
      /code/branches/weapons/src/modules/pickup2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/pickup2742-2890
  • code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h

    r9195 r9241  
    6868namespace orxonox
    6969{
    70 
    7170    class CollectiblePickup;
    7271    class DroppedPickup;
  • code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc

    r9240 r9241  
    2828
    2929/**
    30     @file FlagPickup.cc
    31     @brief Implementation of the FlagPickup class.
    32 */
     30 @file FlagPickup.cc
     31 @brief Implementation of the FlagPickup class.
     32 */
    3333
    3434#include "FlagPickup.h"
     
    3737#include "core/CoreIncludes.h"
    3838#include "core/XMLPort.h"
    39 
    4039#include "pickup/PickupIdentifier.h"
    4140
    4241namespace orxonox
    4342{
    44 
     43   
    4544    CreateFactory(FlagPickup);
    46 
     45   
    4746    /**
    48     @brief
    49         Constructor. Registers the object and initializes the member variables.
    50     */
     47     @brief
     48     Constructor. Registers the object and initializes the member variables.
     49     */
    5150    FlagPickup::FlagPickup(BaseObject* creator) : Pickup(creator)
    5251    {
    5352        RegisterObject(FlagPickup);
    54 
     53       
    5554        this->initialize();
    5655    }
    57 
     56   
    5857    /**
    59     @brief
    60         Destructor.
    61     */
     58     @brief
     59     Destructor.
     60     */
    6261    FlagPickup::~FlagPickup()
    6362    {
    64 
     63       
    6564    }
    66 
     65   
    6766    /**
    68     @brief
    69         Initializes the member variables.
    70     */
     67     @brief
     68     Initializes the member variables.
     69     */
    7170    void FlagPickup::initialize(void)
    7271    {
    7372        this->flagType_ = 0;
    74 
     73       
    7574        this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
    7675    }
    77 
     76   
    7877    /**
    79     @brief
    80         Initializes the PickupIdentifier of this pickup.
    81     */
     78     @brief
     79     Initializes the PickupIdentifier of this pickup.
     80     */
    8281    void FlagPickup::initializeIdentifier(void)
    8382    {
     
    9089        this->pickupIdentifier_->addParameter(type1, val);
    9190    }
    92 
     91   
    9392    /**
    94     @brief
    95         Method for creating a FlagPickup object through XML.
    96     */
     93     @brief
     94     Method for creating a FlagPickup object through XML.
     95     */
    9796    void FlagPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
    9897    {
    9998        SUPER(FlagPickup, XMLPort, xmlelement, mode);
    100 
     99       
    101100        XMLPortParam(FlagPickup, "flagType", setFlagType, getFlagType, xmlelement, mode);
    102101        //XMLPortParam(FlagPickup, "teamNumber", setTeamNumber, getTeamNumber, xmlelement, mode);
    103 
     102       
    104103        this->initializeIdentifier();
    105104    }
    106 
    107 
     105   
     106   
    108107    /**
    109     @brief
    110         Get the flag type of this pickup.
    111     @return
    112         Returns the falg type as a string.
    113     */
     108     @brief
     109     Get the flag type of this pickup.
     110     @return
     111     Returns the falg type as a string.
     112     */
    114113    const int FlagPickup::getFlagType(void) const
    115114    {
    116115                return this->flagType_;
    117116        }
    118 
     117   
    119118    /**
    120     @brief
    121         Set the type of the HealthPickup.
    122     @param type
    123         The type as a string.
    124     */
     119     @brief
     120     Set the type of the FlagPickup.
     121     @param type
     122     The type as a string.
     123     */
    125124    void FlagPickup::setFlagType(int type)
    126125    {
     
    133132        }
    134133    }
     134   
     135    /**
     136     @brief
     137     Is called when the pickup has transited from used to unused or the other way around.
     138     */
     139    void FlagPickup::changedUsed(void)
     140    {
     141        SUPER(FlagPickup, changedUsed);
     142       
     143        Pawn* pawn = this->carrierToPawnHelper();
     144       
     145        if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
     146            this->Pickupable::destroy();
     147       
     148        // If the pickup has transited to used.
     149        if(this->isUsed())
     150        {
     151            this->bPickedUp_ = true;
     152            this->pickedUpBy_ = pawn;
     153            orxout(internal_error, context::pickups) << "flag picked up." << endl;
    135154
     155        }
     156    }
     157   
    136158    /**
    137        @brief
    138            Is called when the pickup has transited from used to unused or the other way around.
    139        */
    140        void FlagPickup::changedUsed(void)
    141        {
    142            SUPER(FlagPickup, changedUsed);
    143 
    144            Pawn* pawn = this->carrierToPawnHelper();
    145 
    146            if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
    147                this->Pickupable::destroy();
    148 
    149            // If the pickup has transited to used.
    150            if(this->isUsed())
    151            {
    152                  this->bPickedUp_ = true;
    153                  this->pickedUpBy_ = pawn;
    154            }
    155        }
    156 
    157        /**
    158        @brief
    159            Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
    160        @return
    161            A pointer to the Pawn, or NULL if the conversion failed.
    162        */
    163        Pawn* FlagPickup::carrierToPawnHelper(void)
    164        {
    165            PickupCarrier* carrier = this->getCarrier();
    166            Pawn* pawn = dynamic_cast<Pawn*>(carrier);
    167 
    168            if(pawn == NULL)
    169                orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
    170 
    171            return pawn;
    172        }
    173 
    174 
    175 
     159     @brief
     160     Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     161     @return
     162     A pointer to the Pawn, or NULL if the conversion failed.
     163     */
     164    Pawn* FlagPickup::carrierToPawnHelper(void)
     165    {
     166        PickupCarrier* carrier = this->getCarrier();
     167        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
     168       
     169        if(pawn == NULL)
     170            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in Flag Pickup." << endl;
     171       
     172        return pawn;
     173    }
     174   
     175   
     176   
    176177        void FlagPickup::tick(float dt)
    177            {
    178                    SUPER(FlagPickup, tick, dt);
    179 
    180                Pawn* pawn = this->carrierToPawnHelper();
    181 
    182                    if(pawn->isAlive() && pawn->hasFlag()){
    183                this->Pickupable::destroy();
    184                    }
    185 
    186            }
     178    {
     179        SUPER(FlagPickup, tick, dt);
     180       
     181        //Pawn* pawn = this->carrierToPawnHelper();
     182       
     183//        if(pawn->isAlive() && pawn->hasFlag()){
     184//            this->Pickupable::destroy();
     185//        }
     186       
     187    }
    187188}
  • code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h

    r9240 r9241  
    2828
    2929/**
    30     @file FlagPickup.h
    31     @brief Declaration of the FlagPickup class.
    32     @ingroup PickupItems
    33 */
     30 @file FlagPickup.h
     31 @brief Declaration of the FlagPickup class.
     32 @ingroup PickupItems
     33 */
    3434
    3535#ifndef _FlagPickup_H__
     
    4747
    4848namespace orxonox {
    49 /*
    50     @ingroup PickupItems
    51    
    52 
    53     @author
    54         Nino Weingart
    55 
    56     @ingroup PickupItems
    57     */
     49    /*
     50     @ingroup PickupItems
     51     
     52     
     53     @author
     54     Nino Weingart
     55     
     56     @ingroup PickupItems
     57     */
    5858    class _PickupExport FlagPickup : public Pickup, public Tickable
    5959    {
    60         public:
    61 
    62             FlagPickup(BaseObject* creator); //!< Constructor.
    63             virtual ~FlagPickup(); //!< Destructor.
    64 
    65             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a FlagPickup object through XML.
    66 
    67             virtual void tick(float dt);
    68 
     60    public:
     61       
     62        FlagPickup(BaseObject* creator); //!< Constructor.
     63        ~FlagPickup(); //!< Destructor.
     64       
     65        virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a FlagPickup object through XML.
     66       
     67        virtual void tick(float dt);
     68       
    6969            const int getFlagType(void) const; //!< Get the flag type of this pickup.
    7070           
    7171                inline bool isPickedUp() const
    72                         { return this->bPickedUp_; }
     72        { return this->bPickedUp_; }
    7373                inline Pawn* pickedUpBy() const
    74                         { return this->pickedUpBy_; }
    75                        
     74        { return this->pickedUpBy_; }
     75       
    7676                inline void setPickedUp(bool pickedUp)
    7777                { this->bPickedUp_ = pickedUp; }
     
    7979                inline void ignorePickedUp()
    8080                { this->Pickupable::destroy(); }
    81                        
     81       
    8282            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
    83 
    84         protected:
    85             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
    86 
    87             /**
    88             @brief Set the flag type of this pickup.
    89             @param type The type of this pickup as an enum.
    90             */
    91             inline void setFlagTypeDirect(int type)
    92                 { this->flagType_ = type; }
    93             void setFlagType(int type); //!< Set the type of the FlagPickup.
    94 
    95         private:
    96             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
    97             void initialize(void); //!< Initializes the member variables.
    98             Pawn* pickedUpBy_;
    99                         int flagType_;
    100                        
    101                         bool bPickedUp_;
    102                        
     83       
     84    protected:
     85        void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
     86       
     87        /**
     88         @brief Set the flag type of this pickup.
     89         @param type The type of this pickup as an enum.
     90         */
     91        inline void setFlagTypeDirect(int type)
     92        { this->flagType_ = type; }
     93       
     94        void setFlagType(int type); //!< Set the type of the FlagPickup.
     95       
     96    private:
     97        Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     98        void initialize(void); //!< Initializes the member variables.
     99        Pawn* pickedUpBy_;
     100        int flagType_;
     101       
     102        bool bPickedUp_;
     103       
    103104    };
    104105}
  • code/branches/presentation2012/src/modules/pong

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/pongmergedeligible
      /code/branches/environment3/src/modules/pongmergedeligible
      /code/branches/formation/src/modules/pongmergedeligible
      /code/branches/gamecontent/src/modules/pongmergedeligible
      /code/branches/hud/src/modules/pongmergedeligible
      /code/branches/masterserverfix/src/modules/pongmergedeligible
      /code/branches/menue/src/modules/pongmergedeligible
      /code/branches/newlevel2012/src/modules/pongmergedeligible
      /code/branches/output/src/modules/pongmergedeligible
      /code/branches/pickup2012/src/modules/pongmergedeligible
      /code/branches/presentation/src/modules/pongmergedeligible
      /code/branches/presentation2011/src/modules/pongmergedeligible
      /code/branches/shipSelection/src/modules/pongmergedeligible
      /code/branches/sound2012/src/modules/pongmergedeligible
      /code/branches/spacegate/src/modules/pongmergedeligible
      /code/branches/spaceraceTwo/src/modules/pongmergedeligible
      /code/branches/surfaceRace/src/modules/pongmergedeligible
      /code/branches/usability/src/modules/pongmergedeligible
      /code/trunk/src/modules/pongmergedeligible
      /code/branches/ai/src/modules/pong6592-7033
      /code/branches/ai2/src/modules/pong8721-8880
      /code/branches/bigships/src/modules/pong8137-8588
      /code/branches/buildsystem/src/modules/pong1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/pong2506-2658
      /code/branches/buildsystem3/src/modules/pong2662-2708
      /code/branches/ceguilua/src/modules/pong1802-1808
      /code/branches/chat/src/modules/pong6527-6797
      /code/branches/chat2/src/modules/pong6836-6910
      /code/branches/console/src/modules/pong5941-6104
      /code/branches/consolecommands2/src/modules/pong6451-7178
      /code/branches/consolecommands3/src/modules/pong7178-7283
      /code/branches/core3/src/modules/pong1572-1739
      /code/branches/core4/src/modules/pong3221-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/src/modules/pong5768-5928,​6009
      /code/branches/data_cleanup/src/modules/pong7537-7686
      /code/branches/doc/src/modules/pong7290-7400
      /code/branches/dockingsystem/src/modules/pong8101-8192
      /code/branches/dynamicmatch/src/modules/pong6584-7030
      /code/branches/fps/src/modules/pong6591-7072
      /code/branches/gameimmersion/src/modules/pong8102-8577
      /code/branches/gamestate/src/modules/pong6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/pong6594-6745
      /code/branches/gametypes/src/modules/pong2826-3031
      /code/branches/gcc43/src/modules/pong1580
      /code/branches/gui/src/modules/pong1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/pong6584-6941
      /code/branches/hudimprovements/src/modules/pong7920-8672
      /code/branches/ingamemenu/src/modules/pong6000-6023
      /code/branches/input/src/modules/pong1629-1636
      /code/branches/ipv6/src/modules/pong7293-7458
      /code/branches/kicklib/src/modules/pong7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/pong8282-8350
      /code/branches/lastmanstanding/src/modules/pong7479-7644
      /code/branches/lastmanstanding3/src/modules/pong7903-8175
      /code/branches/libraries/src/modules/pong5612-5692
      /code/branches/libraries2/src/modules/pong5703-5737
      /code/branches/lod/src/modules/pong6586-6911
      /code/branches/lodfinal/src/modules/pong2372-2411
      /code/branches/mac_osx/src/modules/pong7789-8128,​8135
      /code/branches/map/src/modules/pong2801-3086,​3089
      /code/branches/masterserver/src/modules/pong7502-7738
      /code/branches/menu/src/modules/pong5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/pong2754-2824
      /code/branches/netp2/src/modules/pong2835-2988
      /code/branches/netp3/src/modules/pong2988-3082
      /code/branches/netp6/src/modules/pong3214-3302
      /code/branches/network/src/modules/pong2356
      /code/branches/network2/src/modules/pong6434-6465
      /code/branches/network3/src/modules/pong7196-7344
      /code/branches/network4/src/modules/pong7497-7755
      /code/branches/network5/src/modules/pong7757-7781
      /code/branches/network6/src/modules/pong7823-8315
      /code/branches/network64/src/modules/pong2210-2355
      /code/branches/notifications/src/modules/pong7314-7401
      /code/branches/objecthierarchy/src/modules/pong1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/pong2171-2479
      /code/branches/ois_update/src/modules/pong7506-7788
      /code/branches/overlay/src/modules/pong2117-2385
      /code/branches/particles/src/modules/pong2829-3085
      /code/branches/particles2/src/modules/pong6050-6106,​6109
      /code/branches/pch/src/modules/pong3113-3194
      /code/branches/physics/src/modules/pong1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/pong2436-2457
      /code/branches/pickup/src/modules/pong8145-8555
      /code/branches/pickup2/src/modules/pong5942-6405
      /code/branches/pickup3/src/modules/pong6418-6523
      /code/branches/pickup4/src/modules/pong6594-6710
      /code/branches/pickups/src/modules/pong1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/pong2107-2497,​2915-3071
      /code/branches/png2/src/modules/pong7262-7263
      /code/branches/portals/src/modules/pong8087-8455
      /code/branches/portals2/src/modules/pong8460-8602
      /code/branches/ppspickups1/src/modules/pong6552-6708
      /code/branches/ppspickups2/src/modules/pong6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/pong6757-6997
      /code/branches/ppspickups4/src/modules/pong7003-7089
      /code/branches/presentation2/src/modules/pong6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/pong6913-7162
      /code/branches/questsystem/src/modules/pong1894-2088
      /code/branches/questsystem2/src/modules/pong2107-2259
      /code/branches/questsystem5/src/modules/pong2776-2905
      /code/branches/releasetodo/src/modules/pong7614-7647
      /code/branches/resource/src/modules/pong3327-3366
      /code/branches/resource2/src/modules/pong3372-5694
      /code/branches/rocket/src/modules/pong6523-6950
      /code/branches/rocket2/src/modules/pong6953-6970
      /code/branches/script_trigger/src/modules/pong1295-1953,​1955
      /code/branches/skybox2/src/modules/pong6559-6989
      /code/branches/sound/src/modules/pong2829-3010
      /code/branches/sound3/src/modules/pong5941-6102
      /code/branches/spaceboundaries/src/modules/pong8085-8457
      /code/branches/spaceboundaries2/src/modules/pong8460-8613
      /code/branches/spacerace/src/modules/pong8182-8630
      /code/branches/steering/src/modules/pong5949-6091,​8140-8595
      /code/branches/tetris/src/modules/pong8100-8563
      /code/branches/tutoriallevel/src/modules/pong7827-8370
      /code/branches/tutoriallevel2/src/modules/pong8370-8452
      /code/branches/tutoriallevel3/src/modules/pong8453-8636
      /code/branches/unity_build/src/modules/pong8440-8716
      /code/branches/weapon/src/modules/pong1925-2094
      /code/branches/weapon2/src/modules/pong2107-2488
      /code/branches/weapons/src/modules/pong2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/pong2742-2890
  • code/branches/presentation2012/src/modules/portals

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/environment3/src/modules/portalsmergedeligible
      /code/branches/formation/src/modules/portalsmergedeligible
      /code/branches/gamecontent/src/modules/portalsmergedeligible
      /code/branches/hud/src/modules/portalsmergedeligible
      /code/branches/masterserverfix/src/modules/portalsmergedeligible
      /code/branches/menue/src/modules/portalsmergedeligible
      /code/branches/newlevel2012/src/modules/portalsmergedeligible
      /code/branches/output/src/modules/portalsmergedeligible
      /code/branches/pickup2012/src/modules/portalsmergedeligible
      /code/branches/presentation/src/modules/portalsmergedeligible
      /code/branches/presentation2011/src/modules/portalsmergedeligible
      /code/branches/shipSelection/src/modules/portalsmergedeligible
      /code/branches/sound2012/src/modules/portalsmergedeligible
      /code/branches/spacegate/src/modules/portalsmergedeligible
      /code/branches/spaceraceTwo/src/modules/portalsmergedeligible
      /code/branches/surfaceRace/src/modules/portalsmergedeligible
      /code/trunk/src/modules/portalsmergedeligible
      /code/branches/ai/src/modules/portals6592-7033
      /code/branches/ai2/src/modules/portals8721-8880
      /code/branches/bigships/src/modules/portals8137-8588
      /code/branches/buildsystem/src/modules/portals1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/portals2506-2658
      /code/branches/buildsystem3/src/modules/portals2662-2708
      /code/branches/ceguilua/src/modules/portals1802-1808
      /code/branches/chat/src/modules/portals6527-6797
      /code/branches/chat2/src/modules/portals6836-6910
      /code/branches/console/src/modules/portals5941-6104
      /code/branches/consolecommands2/src/modules/portals6451-7178
      /code/branches/consolecommands3/src/modules/portals7178-7283
      /code/branches/core3/src/modules/portals1572-1739
      /code/branches/core4/src/modules/portals3221-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/src/modules/portals5768-5928,​6009
      /code/branches/data_cleanup/src/modules/portals7537-7686
      /code/branches/doc/src/modules/portals7290-7400
      /code/branches/dockingsystem/src/modules/portals8101-8192
      /code/branches/dockingsystem2/src/modules/portals8196-8560
      /code/branches/dynamicmatch/src/modules/portals6584-7030
      /code/branches/fps/src/modules/portals6591-7072
      /code/branches/gameimmersion/src/modules/portals8102-8577
      /code/branches/gamestate/src/modules/portals6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/portals6594-6745
      /code/branches/gametypes/src/modules/portals2826-3031
      /code/branches/gcc43/src/modules/portals1580
      /code/branches/gui/src/modules/portals1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/portals6584-6941
      /code/branches/hudimprovements/src/modules/portals7920-8672
      /code/branches/ingamemenu/src/modules/portals6000-6023
      /code/branches/input/src/modules/portals1629-1636
      /code/branches/ipv6/src/modules/portals7293-7458
      /code/branches/kicklib/src/modules/portals7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/portals8282-8350
      /code/branches/lastmanstanding/src/modules/portals7479-7644
      /code/branches/lastmanstanding3/src/modules/portals7903-8175
      /code/branches/libraries/src/modules/portals5612-5692
      /code/branches/libraries2/src/modules/portals5703-5737
      /code/branches/lod/src/modules/portals6586-6911
      /code/branches/lodfinal/src/modules/portals2372-2411
      /code/branches/mac_osx/src/modules/portals7789-8128,​8135
      /code/branches/map/src/modules/portals2801-3086,​3089
      /code/branches/masterserver/src/modules/portals7502-7738
      /code/branches/menu/src/modules/portals5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/portals2754-2824
      /code/branches/netp2/src/modules/portals2835-2988
      /code/branches/netp3/src/modules/portals2988-3082
      /code/branches/netp6/src/modules/portals3214-3302
      /code/branches/network/src/modules/portals2356
      /code/branches/network2/src/modules/portals6434-6465
      /code/branches/network3/src/modules/portals7196-7344
      /code/branches/network4/src/modules/portals7497-7755
      /code/branches/network5/src/modules/portals7757-7781
      /code/branches/network6/src/modules/portals7823-8315
      /code/branches/network64/src/modules/portals2210-2355
      /code/branches/notifications/src/modules/portals7314-7401
      /code/branches/objecthierarchy/src/modules/portals1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/portals2171-2479
      /code/branches/ois_update/src/modules/portals7506-7788
      /code/branches/overlay/src/modules/portals2117-2385
      /code/branches/particles/src/modules/portals2829-3085
      /code/branches/particles2/src/modules/portals6050-6106,​6109
      /code/branches/pch/src/modules/portals3113-3194
      /code/branches/physics/src/modules/portals1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/portals2436-2457
      /code/branches/pickup/src/modules/portals8145-8555
      /code/branches/pickup2/src/modules/portals5942-6405
      /code/branches/pickup3/src/modules/portals6418-6523
      /code/branches/pickup4/src/modules/portals6594-6710
      /code/branches/pickups/src/modules/portals1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/portals2107-2497,​2915-3071
      /code/branches/png2/src/modules/portals7262-7263
      /code/branches/portals/src/modules/portals8087-8455
      /code/branches/portals2/src/modules/portals8460-8602
      /code/branches/ppspickups1/src/modules/portals6552-6708
      /code/branches/ppspickups2/src/modules/portals6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/portals6757-6997
      /code/branches/ppspickups4/src/modules/portals7003-7089
      /code/branches/presentation2/src/modules/portals6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/portals6913-7162
      /code/branches/questsystem/src/modules/portals1894-2088
      /code/branches/questsystem2/src/modules/portals2107-2259
      /code/branches/questsystem5/src/modules/portals2776-2905
      /code/branches/releasetodo/src/modules/portals7614-7647
      /code/branches/resource/src/modules/portals3327-3366
      /code/branches/resource2/src/modules/portals3372-5694
      /code/branches/rocket/src/modules/portals6523-6950
      /code/branches/rocket2/src/modules/portals6953-6970
      /code/branches/script_trigger/src/modules/portals1295-1953,​1955
      /code/branches/skybox2/src/modules/portals6559-6989
      /code/branches/sound/src/modules/portals2829-3010
      /code/branches/sound3/src/modules/portals5941-6102
      /code/branches/spaceboundaries/src/modules/portals8085-8457
      /code/branches/spaceboundaries2/src/modules/portals8460-8613
      /code/branches/spacerace/src/modules/portals8182-8630
      /code/branches/steering/src/modules/portals5949-6091,​8140-8595
      /code/branches/tetris/src/modules/portals8100-8563
      /code/branches/tutoriallevel/src/modules/portals7827-8370
      /code/branches/tutoriallevel2/src/modules/portals8370-8452
      /code/branches/tutoriallevel3/src/modules/portals8453-8636
      /code/branches/unity_build/src/modules/portals8440-8716
      /code/branches/usability/src/modules/portals7915-8078
      /code/branches/weapon/src/modules/portals1925-2094
      /code/branches/weapon2/src/modules/portals2107-2488
      /code/branches/weapons/src/modules/portals2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/portals2742-2890
  • code/branches/presentation2012/src/modules/questsystem

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/questsystemmergedeligible
      /code/branches/environment3/src/modules/questsystemmergedeligible
      /code/branches/formation/src/modules/questsystemmergedeligible
      /code/branches/gamecontent/src/modules/questsystemmergedeligible
      /code/branches/hud/src/modules/questsystemmergedeligible
      /code/branches/masterserverfix/src/modules/questsystemmergedeligible
      /code/branches/menue/src/modules/questsystemmergedeligible
      /code/branches/newlevel2012/src/modules/questsystemmergedeligible
      /code/branches/output/src/modules/questsystemmergedeligible
      /code/branches/pickup2012/src/modules/questsystemmergedeligible
      /code/branches/presentation/src/modules/questsystemmergedeligible
      /code/branches/presentation2011/src/modules/questsystemmergedeligible
      /code/branches/shipSelection/src/modules/questsystemmergedeligible
      /code/branches/sound2012/src/modules/questsystemmergedeligible
      /code/branches/spacegate/src/modules/questsystemmergedeligible
      /code/branches/spaceraceTwo/src/modules/questsystemmergedeligible
      /code/branches/surfaceRace/src/modules/questsystemmergedeligible
      /code/branches/usability/src/modules/questsystemmergedeligible
      /code/trunk/src/modules/questsystemmergedeligible
      /code/branches/ai/src/modules/questsystem6592-7033
      /code/branches/ai2/src/modules/questsystem8721-8880
      /code/branches/bigships/src/modules/questsystem8137-8588
      /code/branches/buildsystem/src/modules/questsystem1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/questsystem2506-2658
      /code/branches/buildsystem3/src/modules/questsystem2662-2708
      /code/branches/ceguilua/src/modules/questsystem1802-1808
      /code/branches/chat/src/modules/questsystem6527-6797
      /code/branches/chat2/src/modules/questsystem6836-6910
      /code/branches/console/src/modules/questsystem5941-6104
      /code/branches/consolecommands2/src/modules/questsystem6451-7178
      /code/branches/consolecommands3/src/modules/questsystem7178-7283
      /code/branches/core3/src/modules/questsystem1572-1739
      /code/branches/core4/src/modules/questsystem3221-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/src/modules/questsystem5768-5928,​6009
      /code/branches/data_cleanup/src/modules/questsystem7537-7686
      /code/branches/doc/src/modules/questsystem7290-7400
      /code/branches/dockingsystem/src/modules/questsystem8101-8192
      /code/branches/dynamicmatch/src/modules/questsystem6584-7030
      /code/branches/fps/src/modules/questsystem6591-7072
      /code/branches/gameimmersion/src/modules/questsystem8102-8577
      /code/branches/gamestate/src/modules/questsystem6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/questsystem6594-6745
      /code/branches/gametypes/src/modules/questsystem2826-3031
      /code/branches/gcc43/src/modules/questsystem1580
      /code/branches/gui/src/modules/questsystem1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/questsystem6584-6941
      /code/branches/hudimprovements/src/modules/questsystem7920-8672
      /code/branches/ingamemenu/src/modules/questsystem6000-6023
      /code/branches/input/src/modules/questsystem1629-1636
      /code/branches/ipv6/src/modules/questsystem7293-7458
      /code/branches/kicklib/src/modules/questsystem7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/questsystem8282-8350
      /code/branches/lastmanstanding/src/modules/questsystem7479-7644
      /code/branches/lastmanstanding3/src/modules/questsystem7903-8175
      /code/branches/libraries/src/modules/questsystem5612-5692
      /code/branches/libraries2/src/modules/questsystem5703-5737
      /code/branches/lod/src/modules/questsystem6586-6911
      /code/branches/lodfinal/src/modules/questsystem2372-2411
      /code/branches/mac_osx/src/modules/questsystem7789-8128,​8135
      /code/branches/map/src/modules/questsystem2801-3086,​3089
      /code/branches/masterserver/src/modules/questsystem7502-7738
      /code/branches/menu/src/modules/questsystem5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/questsystem2754-2824
      /code/branches/netp2/src/modules/questsystem2835-2988
      /code/branches/netp3/src/modules/questsystem2988-3082
      /code/branches/netp6/src/modules/questsystem3214-3302
      /code/branches/network/src/modules/questsystem2356
      /code/branches/network2/src/modules/questsystem6434-6465
      /code/branches/network3/src/modules/questsystem7196-7344
      /code/branches/network4/src/modules/questsystem7497-7755
      /code/branches/network5/src/modules/questsystem7757-7781
      /code/branches/network6/src/modules/questsystem7823-8315
      /code/branches/network64/src/modules/questsystem2210-2355
      /code/branches/notifications/src/modules/questsystem7314-7401
      /code/branches/objecthierarchy/src/modules/questsystem1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/questsystem2171-2479
      /code/branches/ois_update/src/modules/questsystem7506-7788
      /code/branches/overlay/src/modules/questsystem2117-2385
      /code/branches/particles/src/modules/questsystem2829-3085
      /code/branches/particles2/src/modules/questsystem6050-6106,​6109
      /code/branches/pch/src/modules/questsystem3113-3194
      /code/branches/physics/src/modules/questsystem1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/questsystem2436-2457
      /code/branches/pickup/src/modules/questsystem8145-8555
      /code/branches/pickup2/src/modules/questsystem5942-6405
      /code/branches/pickup3/src/modules/questsystem6418-6523
      /code/branches/pickup4/src/modules/questsystem6594-6710
      /code/branches/pickups/src/modules/questsystem1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/questsystem2107-2497,​2915-3071
      /code/branches/png2/src/modules/questsystem7262-7263
      /code/branches/portals/src/modules/questsystem8087-8455
      /code/branches/portals2/src/modules/questsystem8460-8602
      /code/branches/ppspickups1/src/modules/questsystem6552-6708
      /code/branches/ppspickups2/src/modules/questsystem6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/questsystem6757-6997
      /code/branches/ppspickups4/src/modules/questsystem7003-7089
      /code/branches/presentation2/src/modules/questsystem6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/questsystem6913-7162
      /code/branches/questsystem/src/modules/questsystem1894-2088
      /code/branches/questsystem2/src/modules/questsystem2107-2259
      /code/branches/questsystem5/src/modules/questsystem2776-2905
      /code/branches/releasetodo/src/modules/questsystem7614-7647
      /code/branches/resource/src/modules/questsystem3327-3366
      /code/branches/resource2/src/modules/questsystem3372-5694
      /code/branches/rocket/src/modules/questsystem6523-6950
      /code/branches/rocket2/src/modules/questsystem6953-6970
      /code/branches/script_trigger/src/modules/questsystem1295-1953,​1955
      /code/branches/skybox2/src/modules/questsystem6559-6989
      /code/branches/sound/src/modules/questsystem2829-3010
      /code/branches/sound3/src/modules/questsystem5941-6102
      /code/branches/spaceboundaries/src/modules/questsystem8085-8457
      /code/branches/spaceboundaries2/src/modules/questsystem8460-8613
      /code/branches/spacerace/src/modules/questsystem8182-8630
      /code/branches/steering/src/modules/questsystem5949-6091,​8140-8595
      /code/branches/tetris/src/modules/questsystem8100-8563
      /code/branches/tutoriallevel/src/modules/questsystem7827-8370
      /code/branches/tutoriallevel2/src/modules/questsystem8370-8452
      /code/branches/tutoriallevel3/src/modules/questsystem8453-8636
      /code/branches/unity_build/src/modules/questsystem8440-8716
      /code/branches/weapon/src/modules/questsystem1925-2094
      /code/branches/weapon2/src/modules/questsystem2107-2488
      /code/branches/weapons/src/modules/questsystem2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/questsystem2742-2890
  • code/branches/presentation2012/src/modules/tetris

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/environment3/src/modules/tetrismergedeligible
      /code/branches/formation/src/modules/tetrismergedeligible
      /code/branches/gamecontent/src/modules/tetrismergedeligible
      /code/branches/hud/src/modules/tetrismergedeligible
      /code/branches/masterserverfix/src/modules/tetrismergedeligible
      /code/branches/menue/src/modules/tetrismergedeligible
      /code/branches/newlevel2012/src/modules/tetrismergedeligible
      /code/branches/output/src/modules/tetrismergedeligible
      /code/branches/pickup2012/src/modules/tetrismergedeligible
      /code/branches/presentation/src/modules/tetrismergedeligible
      /code/branches/presentation2011/src/modules/tetrismergedeligible
      /code/branches/shipSelection/src/modules/tetrismergedeligible
      /code/branches/sound2012/src/modules/tetrismergedeligible
      /code/branches/spacegate/src/modules/tetrismergedeligible
      /code/branches/spaceraceTwo/src/modules/tetrismergedeligible
      /code/branches/surfaceRace/src/modules/tetrismergedeligible
      /code/trunk/src/modules/tetrismergedeligible
      /code/branches/ai/src/modules/tetris6592-7033
      /code/branches/ai2/src/modules/tetris8721-8880
      /code/branches/bigships/src/modules/tetris8137-8588
      /code/branches/buildsystem/src/modules/tetris1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/tetris2506-2658
      /code/branches/buildsystem3/src/modules/tetris2662-2708
      /code/branches/ceguilua/src/modules/tetris1802-1808
      /code/branches/chat/src/modules/tetris6527-6797
      /code/branches/chat2/src/modules/tetris6836-6910
      /code/branches/console/src/modules/tetris5941-6104
      /code/branches/consolecommands2/src/modules/tetris6451-7178
      /code/branches/consolecommands3/src/modules/tetris7178-7283
      /code/branches/core3/src/modules/tetris1572-1739
      /code/branches/core4/src/modules/tetris3221-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/src/modules/tetris5768-5928,​6009
      /code/branches/data_cleanup/src/modules/tetris7537-7686
      /code/branches/doc/src/modules/tetris7290-7400
      /code/branches/dockingsystem/src/modules/tetris8101-8192
      /code/branches/dockingsystem2/src/modules/tetris8196-8560
      /code/branches/dynamicmatch/src/modules/tetris6584-7030
      /code/branches/fps/src/modules/tetris6591-7072
      /code/branches/gameimmersion/src/modules/tetris8102-8577
      /code/branches/gamestate/src/modules/tetris6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/tetris6594-6745
      /code/branches/gametypes/src/modules/tetris2826-3031
      /code/branches/gcc43/src/modules/tetris1580
      /code/branches/gui/src/modules/tetris1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/tetris6584-6941
      /code/branches/hudimprovements/src/modules/tetris7920-8672
      /code/branches/ingamemenu/src/modules/tetris6000-6023
      /code/branches/input/src/modules/tetris1629-1636
      /code/branches/ipv6/src/modules/tetris7293-7458
      /code/branches/kicklib/src/modules/tetris7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/tetris8282-8350
      /code/branches/lastmanstanding/src/modules/tetris7479-7644
      /code/branches/lastmanstanding3/src/modules/tetris7903-8175
      /code/branches/libraries/src/modules/tetris5612-5692
      /code/branches/libraries2/src/modules/tetris5703-5737
      /code/branches/lod/src/modules/tetris6586-6911
      /code/branches/lodfinal/src/modules/tetris2372-2411
      /code/branches/mac_osx/src/modules/tetris7789-8128,​8135
      /code/branches/map/src/modules/tetris2801-3086,​3089
      /code/branches/masterserver/src/modules/tetris7502-7738
      /code/branches/menu/src/modules/tetris5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/tetris2754-2824
      /code/branches/netp2/src/modules/tetris2835-2988
      /code/branches/netp3/src/modules/tetris2988-3082
      /code/branches/netp6/src/modules/tetris3214-3302
      /code/branches/network/src/modules/tetris2356
      /code/branches/network2/src/modules/tetris6434-6465
      /code/branches/network3/src/modules/tetris7196-7344
      /code/branches/network4/src/modules/tetris7497-7755
      /code/branches/network5/src/modules/tetris7757-7781
      /code/branches/network6/src/modules/tetris7823-8315
      /code/branches/network64/src/modules/tetris2210-2355
      /code/branches/notifications/src/modules/tetris7314-7401
      /code/branches/objecthierarchy/src/modules/tetris1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/tetris2171-2479
      /code/branches/ois_update/src/modules/tetris7506-7788
      /code/branches/overlay/src/modules/tetris2117-2385
      /code/branches/particles/src/modules/tetris2829-3085
      /code/branches/particles2/src/modules/tetris6050-6106,​6109
      /code/branches/pch/src/modules/tetris3113-3194
      /code/branches/physics/src/modules/tetris1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/tetris2436-2457
      /code/branches/pickup/src/modules/tetris8145-8555
      /code/branches/pickup2/src/modules/tetris5942-6405
      /code/branches/pickup3/src/modules/tetris6418-6523
      /code/branches/pickup4/src/modules/tetris6594-6710
      /code/branches/pickups/src/modules/tetris1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/tetris2107-2497,​2915-3071
      /code/branches/png2/src/modules/tetris7262-7263
      /code/branches/portals/src/modules/tetris8087-8455
      /code/branches/portals2/src/modules/tetris8460-8602
      /code/branches/ppspickups1/src/modules/tetris6552-6708
      /code/branches/ppspickups2/src/modules/tetris6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/tetris6757-6997
      /code/branches/ppspickups4/src/modules/tetris7003-7089
      /code/branches/presentation2/src/modules/tetris6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/tetris6913-7162
      /code/branches/questsystem/src/modules/tetris1894-2088
      /code/branches/questsystem2/src/modules/tetris2107-2259
      /code/branches/questsystem5/src/modules/tetris2776-2905
      /code/branches/releasetodo/src/modules/tetris7614-7647
      /code/branches/resource/src/modules/tetris3327-3366
      /code/branches/resource2/src/modules/tetris3372-5694
      /code/branches/rocket/src/modules/tetris6523-6950
      /code/branches/rocket2/src/modules/tetris6953-6970
      /code/branches/script_trigger/src/modules/tetris1295-1953,​1955
      /code/branches/skybox2/src/modules/tetris6559-6989
      /code/branches/sound/src/modules/tetris2829-3010
      /code/branches/sound3/src/modules/tetris5941-6102
      /code/branches/spaceboundaries/src/modules/tetris8085-8457
      /code/branches/spaceboundaries2/src/modules/tetris8460-8613
      /code/branches/spacerace/src/modules/tetris8182-8630
      /code/branches/steering/src/modules/tetris5949-6091,​8140-8595
      /code/branches/tetris/src/modules/tetris8100-8563
      /code/branches/tutoriallevel/src/modules/tetris7827-8370
      /code/branches/tutoriallevel2/src/modules/tetris8370-8452
      /code/branches/tutoriallevel3/src/modules/tetris8453-8636
      /code/branches/unity_build/src/modules/tetris8440-8716
      /code/branches/usability/src/modules/tetris7915-8078
      /code/branches/weapon/src/modules/tetris1925-2094
      /code/branches/weapon2/src/modules/tetris2107-2488
      /code/branches/weapons/src/modules/tetris2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/tetris2742-2890
  • code/branches/presentation2012/src/modules/weapons

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/src/modules/weaponsmergedeligible
      /code/branches/environment3/src/modules/weaponsmergedeligible
      /code/branches/formation/src/modules/weaponsmergedeligible
      /code/branches/gamecontent/src/modules/weaponsmergedeligible
      /code/branches/hud/src/modules/weaponsmergedeligible
      /code/branches/masterserverfix/src/modules/weaponsmergedeligible
      /code/branches/menue/src/modules/weaponsmergedeligible
      /code/branches/newlevel2012/src/modules/weaponsmergedeligible
      /code/branches/output/src/modules/weaponsmergedeligible
      /code/branches/pickup2012/src/modules/weaponsmergedeligible
      /code/branches/presentation/src/modules/weaponsmergedeligible
      /code/branches/presentation2011/src/modules/weaponsmergedeligible
      /code/branches/shipSelection/src/modules/weaponsmergedeligible
      /code/branches/sound2012/src/modules/weaponsmergedeligible
      /code/branches/spacegate/src/modules/weaponsmergedeligible
      /code/branches/spaceraceTwo/src/modules/weaponsmergedeligible
      /code/branches/surfaceRace/src/modules/weaponsmergedeligible
      /code/branches/usability/src/modules/weaponsmergedeligible
      /code/trunk/src/modules/weaponsmergedeligible
      /code/branches/ai/src/modules/weapons6592-7033
      /code/branches/ai2/src/modules/weapons8721-8880
      /code/branches/bigships/src/modules/weapons8137-8588
      /code/branches/buildsystem/src/modules/weapons1874-2276,​2278-2400
      /code/branches/buildsystem2/src/modules/weapons2506-2658
      /code/branches/buildsystem3/src/modules/weapons2662-2708
      /code/branches/ceguilua/src/modules/weapons1802-1808
      /code/branches/chat/src/modules/weapons6527-6797
      /code/branches/chat2/src/modules/weapons6836-6910
      /code/branches/console/src/modules/weapons5941-6104
      /code/branches/consolecommands2/src/modules/weapons6451-7178
      /code/branches/consolecommands3/src/modules/weapons7178-7283
      /code/branches/core3/src/modules/weapons1572-1739
      /code/branches/core4/src/modules/weapons3221-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/src/modules/weapons5768-5928,​6009
      /code/branches/data_cleanup/src/modules/weapons7537-7686
      /code/branches/doc/src/modules/weapons7290-7400
      /code/branches/dockingsystem/src/modules/weapons8101-8192
      /code/branches/dynamicmatch/src/modules/weapons6584-7030
      /code/branches/fps/src/modules/weapons6591-7072
      /code/branches/gameimmersion/src/modules/weapons8102-8577
      /code/branches/gamestate/src/modules/weapons6430-6572,​6621-6661
      /code/branches/gamestates2/src/modules/weapons6594-6745
      /code/branches/gametypes/src/modules/weapons2826-3031
      /code/branches/gcc43/src/modules/weapons1580
      /code/branches/gui/src/modules/weapons1635-1723,​2795-2894
      /code/branches/hudelements/src/modules/weapons6584-6941
      /code/branches/hudimprovements/src/modules/weapons7920-8672
      /code/branches/ingamemenu/src/modules/weapons6000-6023
      /code/branches/input/src/modules/weapons1629-1636
      /code/branches/ipv6/src/modules/weapons7293-7458
      /code/branches/kicklib/src/modules/weapons7940-8096,​8098-8277
      /code/branches/kicklib2/src/modules/weapons8282-8350
      /code/branches/lastmanstanding/src/modules/weapons7479-7644
      /code/branches/lastmanstanding3/src/modules/weapons7903-8175
      /code/branches/libraries/src/modules/weapons5612-5692
      /code/branches/libraries2/src/modules/weapons5703-5737
      /code/branches/lod/src/modules/weapons6586-6911
      /code/branches/lodfinal/src/modules/weapons2372-2411
      /code/branches/mac_osx/src/modules/weapons7789-8128,​8135
      /code/branches/map/src/modules/weapons2801-3086,​3089
      /code/branches/masterserver/src/modules/weapons7502-7738
      /code/branches/menu/src/modules/weapons5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/src/modules/weapons2754-2824
      /code/branches/netp2/src/modules/weapons2835-2988
      /code/branches/netp3/src/modules/weapons2988-3082
      /code/branches/netp6/src/modules/weapons3214-3302
      /code/branches/network/src/modules/weapons2356
      /code/branches/network2/src/modules/weapons6434-6465
      /code/branches/network3/src/modules/weapons7196-7344
      /code/branches/network4/src/modules/weapons7497-7755
      /code/branches/network5/src/modules/weapons7757-7781
      /code/branches/network6/src/modules/weapons7823-8315
      /code/branches/network64/src/modules/weapons2210-2355
      /code/branches/notifications/src/modules/weapons7314-7401
      /code/branches/objecthierarchy/src/modules/weapons1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/modules/weapons2171-2479
      /code/branches/ois_update/src/modules/weapons7506-7788
      /code/branches/overlay/src/modules/weapons2117-2385
      /code/branches/particles/src/modules/weapons2829-3085
      /code/branches/particles2/src/modules/weapons6050-6106,​6109
      /code/branches/pch/src/modules/weapons3113-3194
      /code/branches/physics/src/modules/weapons1912-2055,​2107-2439
      /code/branches/physics_merge/src/modules/weapons2436-2457
      /code/branches/pickup/src/modules/weapons8145-8555
      /code/branches/pickup2/src/modules/weapons5942-6405
      /code/branches/pickup3/src/modules/weapons6418-6523
      /code/branches/pickup4/src/modules/weapons6594-6710
      /code/branches/pickups/src/modules/weapons1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/modules/weapons2107-2497,​2915-3071
      /code/branches/png2/src/modules/weapons7262-7263
      /code/branches/portals/src/modules/weapons8087-8455
      /code/branches/portals2/src/modules/weapons8460-8602
      /code/branches/ppspickups1/src/modules/weapons6552-6708
      /code/branches/ppspickups2/src/modules/weapons6527-6532,​6554-6709
      /code/branches/ppspickups3/src/modules/weapons6757-6997
      /code/branches/ppspickups4/src/modules/weapons7003-7089
      /code/branches/presentation2/src/modules/weapons6106-6416,​7787-7800
      /code/branches/presentation3/src/modules/weapons6913-7162
      /code/branches/questsystem/src/modules/weapons1894-2088
      /code/branches/questsystem2/src/modules/weapons2107-2259
      /code/branches/questsystem5/src/modules/weapons2776-2905
      /code/branches/releasetodo/src/modules/weapons7614-7647
      /code/branches/resource/src/modules/weapons3327-3366
      /code/branches/resource2/src/modules/weapons3372-5694
      /code/branches/rocket/src/modules/weapons6523-6950
      /code/branches/rocket2/src/modules/weapons6953-6970
      /code/branches/script_trigger/src/modules/weapons1295-1953,​1955
      /code/branches/skybox2/src/modules/weapons6559-6989
      /code/branches/sound/src/modules/weapons2829-3010
      /code/branches/sound3/src/modules/weapons5941-6102
      /code/branches/spaceboundaries/src/modules/weapons8085-8457
      /code/branches/spaceboundaries2/src/modules/weapons8460-8613
      /code/branches/spacerace/src/modules/weapons8182-8630
      /code/branches/steering/src/modules/weapons5949-6091,​8140-8595
      /code/branches/tetris/src/modules/weapons8100-8563
      /code/branches/tutoriallevel/src/modules/weapons7827-8370
      /code/branches/tutoriallevel2/src/modules/weapons8370-8452
      /code/branches/tutoriallevel3/src/modules/weapons8453-8636
      /code/branches/unity_build/src/modules/weapons8440-8716
      /code/branches/weapon/src/modules/weapons1925-2094
      /code/branches/weapon2/src/modules/weapons2107-2488
      /code/branches/weapons/src/modules/weapons2897-3051,​8143-8591
      /code/branches/weaponsystem/src/modules/weapons2742-2890
Note: See TracChangeset for help on using the changeset viewer.