Changeset 9241 for code/branches/presentation2012/src/modules
- Timestamp:
- May 24, 2012, 8:49:19 PM (13 years ago)
- Location:
- code/branches/presentation2012
- Files:
-
- 17 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2012
- Property svn:mergeinfo changed
/code/branches/newlevel2012 merged: 9236
- Property svn:mergeinfo changed
-
code/branches/presentation2012/src
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src merged eligible /code/branches/environment3/src merged eligible /code/branches/formation/src merged eligible /code/branches/gamecontent/src merged eligible /code/branches/hud/src merged eligible /code/branches/masterserverfix/src merged eligible /code/branches/menue/src merged eligible /code/branches/newlevel2012/src merged eligible /code/branches/output/src merged eligible /code/branches/pickup2012/src merged eligible /code/branches/presentation/src merged eligible /code/branches/presentation2011/src merged eligible /code/branches/shipSelection/src merged eligible /code/branches/sound2012/src merged eligible /code/branches/spacegate/src merged eligible /code/branches/spaceraceTwo/src merged eligible /code/branches/surfaceRace/src merged eligible /code/branches/usability/src merged eligible /code/trunk/src merged eligible /code/branches/ai/src 6592-7033 /code/branches/ai2/src 8721-8880 /code/branches/bigships/src 8137-8588 /code/branches/buildsystem/src 1874-2276,2278-2400 /code/branches/buildsystem2/src 2506-2658 /code/branches/buildsystem3/src 2662-2708 /code/branches/ceguilua/src 1802-1808 /code/branches/chat/src 6527-6797 /code/branches/chat2/src 6836-6910 /code/branches/console/src 5941-6104 /code/branches/consolecommands2/src 6451-7178 /code/branches/consolecommands3/src 7178-7283 /code/branches/core3/src 1572-1739 /code/branches/core4/src 3221-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 5768-5928,6009 /code/branches/data_cleanup/src 7537-7686 /code/branches/doc/src 7290-7400 /code/branches/dockingsystem/src 8101-8192 /code/branches/dynamicmatch/src 6584-7030 /code/branches/fps/src 6591-7072 /code/branches/gameimmersion/src 8102-8577 /code/branches/gamestate/src 6430-6572,6621-6661 /code/branches/gamestates2/src 6594-6745 /code/branches/gametypes/src 2826-3031 /code/branches/gcc43/src 1580 /code/branches/gui/src 1635-1723,2795-2894 /code/branches/hudelements/src 6584-6941 /code/branches/hudimprovements/src 7920-8672 /code/branches/ingamemenu/src 6000-6023 /code/branches/input/src 1629-1636 /code/branches/ipv6/src 7293-7458 /code/branches/kicklib/src 7940-8096,8098-8277 /code/branches/kicklib2/src 8282-8350 /code/branches/lastmanstanding/src 7479-7644 /code/branches/lastmanstanding3/src 7903-8175 /code/branches/libraries/src 5612-5692 /code/branches/libraries2/src 5703-5737 /code/branches/lod/src 6586-6911 /code/branches/lodfinal/src 2372-2411 /code/branches/mac_osx/src 7789-8128,8135 /code/branches/map/src 2801-3086,3089 /code/branches/masterserver/src 7502-7738 /code/branches/menu/src 5941-6146,6148,7536-7687 /code/branches/miniprojects/src 2754-2824 /code/branches/netp2/src 2835-2988 /code/branches/netp3/src 2988-3082 /code/branches/netp6/src 3214-3302 /code/branches/network/src 2356 /code/branches/network2/src 6434-6465 /code/branches/network3/src 7196-7344 /code/branches/network4/src 7497-7755 /code/branches/network5/src 7757-7781 /code/branches/network6/src 7823-8315 /code/branches/network64/src 2210-2355 /code/branches/notifications/src 7314-7401 /code/branches/objecthierarchy/src 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src 2171-2479 /code/branches/ois_update/src 7506-7788 /code/branches/overlay/src 2117-2385 /code/branches/particles/src 2829-3085 /code/branches/particles2/src 6050-6106,6109 /code/branches/pch/src 3113-3194 /code/branches/physics/src 1912-2055,2107-2439 /code/branches/physics_merge/src 2436-2457 /code/branches/pickup/src 8145-8555 /code/branches/pickup2/src 5942-6405 /code/branches/pickup3/src 6418-6523 /code/branches/pickup4/src 6594-6710 /code/branches/pickups/src 1926-2086,2127,2827-2915 /code/branches/pickups2/src 2107-2497,2915-3071 /code/branches/png2/src 7262-7263 /code/branches/portals/src 8087-8455 /code/branches/portals2/src 8460-8602 /code/branches/ppspickups1/src 6552-6708 /code/branches/ppspickups2/src 6527-6532,6554-6709 /code/branches/ppspickups3/src 6757-6997 /code/branches/ppspickups4/src 7003-7089 /code/branches/presentation2/src 6106-6416,7787-7800 /code/branches/presentation3/src 6913-7162 /code/branches/questsystem/src 1894-2088 /code/branches/questsystem2/src 2107-2259 /code/branches/questsystem5/src 2776-2905 /code/branches/releasetodo/src 7614-7647 /code/branches/resource/src 3327-3366 /code/branches/resource2/src 3372-5694 /code/branches/rocket/src 6523-6950 /code/branches/rocket2/src 6953-6970 /code/branches/script_trigger/src 1295-1953,1955 /code/branches/skybox2/src 6559-6989 /code/branches/sound/src 2829-3010 /code/branches/sound3/src 5941-6102 /code/branches/spaceboundaries/src 8085-8457 /code/branches/spaceboundaries2/src 8460-8613 /code/branches/spacerace/src 8182-8630 /code/branches/steering/src 5949-6091,8140-8595 /code/branches/tetris/src 8100-8563 /code/branches/tutoriallevel/src 7827-8370 /code/branches/tutoriallevel2/src 8370-8452 /code/branches/tutoriallevel3/src 8453-8636 /code/branches/unity_build/src 8440-8716 /code/branches/weapon/src 1925-2094 /code/branches/weapon2/src 2107-2488 /code/branches/weapons/src 2897-3051,8143-8591 /code/branches/weaponsystem/src 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules merged eligible /code/branches/environment3/src/modules merged eligible /code/branches/formation/src/modules merged eligible /code/branches/gamecontent/src/modules merged eligible /code/branches/hud/src/modules merged eligible /code/branches/masterserverfix/src/modules merged eligible /code/branches/menue/src/modules merged eligible /code/branches/newlevel2012/src/modules merged eligible /code/branches/output/src/modules merged eligible /code/branches/pickup2012/src/modules merged eligible /code/branches/presentation/src/modules merged eligible /code/branches/presentation2011/src/modules merged eligible /code/branches/shipSelection/src/modules merged eligible /code/branches/sound2012/src/modules merged non-inheritable eligible /code/branches/spacegate/src/modules merged eligible /code/branches/spaceraceTwo/src/modules merged eligible /code/branches/surfaceRace/src/modules merged eligible /code/branches/usability/src/modules merged eligible /code/trunk/src/modules merged eligible /code/branches/ai/src/modules 6592-7033 /code/branches/ai2/src/modules 8721-8880 /code/branches/bigships/src/modules 8137-8588 /code/branches/buildsystem/src/modules 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules 2506-2658 /code/branches/buildsystem3/src/modules 2662-2708 /code/branches/ceguilua/src/modules 1802-1808 /code/branches/chat/src/modules 6527-6797 /code/branches/chat2/src/modules 6836-6910 /code/branches/console/src/modules 5941-6104 /code/branches/consolecommands2/src/modules 6451-7178 /code/branches/consolecommands3/src/modules 7178-7283 /code/branches/core3/src/modules 1572-1739 /code/branches/core4/src/modules 3221-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 5768-5928,6009 /code/branches/data_cleanup/src/modules 7537-7686 /code/branches/doc/src/modules 7290-7400 /code/branches/dockingsystem/src/modules 8101-8192 /code/branches/dynamicmatch/src/modules 6584-7030 /code/branches/fps/src/modules 6591-7072 /code/branches/gameimmersion/src/modules 8102-8577 /code/branches/gamestate/src/modules 6430-6572,6621-6661 /code/branches/gamestates2/src/modules 6594-6745 /code/branches/gametypes/src/modules 2826-3031 /code/branches/gcc43/src/modules 1580 /code/branches/gui/src/modules 1635-1723,2795-2894 /code/branches/hudelements/src/modules 6584-6941 /code/branches/hudimprovements/src/modules 7920-8672 /code/branches/ingamemenu/src/modules 6000-6023 /code/branches/input/src/modules 1629-1636 /code/branches/ipv6/src/modules 7293-7458 /code/branches/kicklib/src/modules 7940-8096,8098-8277 /code/branches/kicklib2/src/modules 8282-8350 /code/branches/lastmanstanding/src/modules 7479-7644 /code/branches/lastmanstanding3/src/modules 7903-8175 /code/branches/libraries/src/modules 5612-5692 /code/branches/libraries2/src/modules 5703-5737 /code/branches/lod/src/modules 6586-6911 /code/branches/lodfinal/src/modules 2372-2411 /code/branches/mac_osx/src/modules 7789-8128,8135 /code/branches/map/src/modules 2801-3086,3089 /code/branches/masterserver/src/modules 7502-7738 /code/branches/menu/src/modules 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules 2754-2824 /code/branches/netp2/src/modules 2835-2988 /code/branches/netp3/src/modules 2988-3082 /code/branches/netp6/src/modules 3214-3302 /code/branches/network/src/modules 2356 /code/branches/network2/src/modules 6434-6465 /code/branches/network3/src/modules 7196-7344 /code/branches/network4/src/modules 7497-7755 /code/branches/network5/src/modules 7757-7781 /code/branches/network6/src/modules 7823-8315 /code/branches/network64/src/modules 2210-2355 /code/branches/notifications/src/modules 7314-7401 /code/branches/objecthierarchy/src/modules 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules 2171-2479 /code/branches/ois_update/src/modules 7506-7788 /code/branches/overlay/src/modules 2117-2385 /code/branches/particles/src/modules 2829-3085 /code/branches/particles2/src/modules 6050-6106,6109 /code/branches/pch/src/modules 3113-3194 /code/branches/physics/src/modules 1912-2055,2107-2439 /code/branches/physics_merge/src/modules 2436-2457 /code/branches/pickup/src/modules 8145-8555 /code/branches/pickup2/src/modules 5942-6405 /code/branches/pickup3/src/modules 6418-6523 /code/branches/pickup4/src/modules 6594-6710 /code/branches/pickups/src/modules 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules 2107-2497,2915-3071 /code/branches/png2/src/modules 7262-7263 /code/branches/portals/src/modules 8087-8455 /code/branches/portals2/src/modules 8460-8602 /code/branches/ppspickups1/src/modules 6552-6708 /code/branches/ppspickups2/src/modules 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules 6757-6997 /code/branches/ppspickups4/src/modules 7003-7089 /code/branches/presentation2/src/modules 6106-6416,7787-7800 /code/branches/presentation3/src/modules 6913-7162 /code/branches/questsystem/src/modules 1894-2088 /code/branches/questsystem2/src/modules 2107-2259 /code/branches/questsystem5/src/modules 2776-2905 /code/branches/releasetodo/src/modules 7614-7647 /code/branches/resource/src/modules 3327-3366 /code/branches/resource2/src/modules 3372-5694 /code/branches/rocket/src/modules 6523-6950 /code/branches/rocket2/src/modules 6953-6970 /code/branches/script_trigger/src/modules 1295-1953,1955 /code/branches/skybox2/src/modules 6559-6989 /code/branches/sound/src/modules 2829-3010 /code/branches/sound3/src/modules 5941-6102 /code/branches/spaceboundaries/src/modules 8085-8457 /code/branches/spaceboundaries2/src/modules 8460-8613 /code/branches/spacerace/src/modules 8182-8630 /code/branches/steering/src/modules 5949-6091,8140-8595 /code/branches/tetris/src/modules 8100-8563 /code/branches/tutoriallevel/src/modules 7827-8370 /code/branches/tutoriallevel2/src/modules 8370-8452 /code/branches/tutoriallevel3/src/modules 8453-8636 /code/branches/unity_build/src/modules 8440-8716 /code/branches/weapon/src/modules 1925-2094 /code/branches/weapon2/src/modules 2107-2488 /code/branches/weapons/src/modules 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/CMakeLists.txt
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/CMakeLists.txt merged eligible /code/branches/environment3/src/modules/CMakeLists.txt merged eligible /code/branches/formation/src/modules/CMakeLists.txt merged eligible /code/branches/gamecontent/src/modules/CMakeLists.txt merged eligible /code/branches/hud/src/modules/CMakeLists.txt merged eligible /code/branches/masterserverfix/src/modules/CMakeLists.txt merged eligible /code/branches/menue/src/modules/CMakeLists.txt merged eligible /code/branches/newlevel2012/src/modules/CMakeLists.txt merged eligible /code/branches/output/src/modules/CMakeLists.txt merged eligible /code/branches/pickup2012/src/modules/CMakeLists.txt merged eligible /code/branches/presentation/src/modules/CMakeLists.txt merged eligible /code/branches/presentation2011/src/modules/CMakeLists.txt merged eligible /code/branches/shipSelection/src/modules/CMakeLists.txt merged eligible /code/branches/sound2012/src/modules/CMakeLists.txt merged eligible /code/branches/spacegate/src/modules/CMakeLists.txt merged eligible /code/branches/spaceraceTwo/src/modules/CMakeLists.txt merged eligible /code/branches/surfaceRace/src/modules/CMakeLists.txt merged eligible /code/branches/usability/src/modules/CMakeLists.txt merged eligible /code/trunk/src/modules/CMakeLists.txt merged eligible /code/branches/ai/src/modules/CMakeLists.txt 6592-7033 /code/branches/ai2/src/modules/CMakeLists.txt 8721-8880 /code/branches/bigships/src/modules/CMakeLists.txt 8137-8588 /code/branches/buildsystem/src/modules/CMakeLists.txt 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/CMakeLists.txt 2506-2658 /code/branches/buildsystem3/src/modules/CMakeLists.txt 2662-2708 /code/branches/ceguilua/src/modules/CMakeLists.txt 1802-1808 /code/branches/chat/src/modules/CMakeLists.txt 6527-6797 /code/branches/chat2/src/modules/CMakeLists.txt 6836-6910 /code/branches/console/src/modules/CMakeLists.txt 5941-6104 /code/branches/consolecommands2/src/modules/CMakeLists.txt 6451-7178 /code/branches/consolecommands3/src/modules/CMakeLists.txt 7178-7283 /code/branches/core3/src/modules/CMakeLists.txt 1572-1739 /code/branches/core4/src/modules/CMakeLists.txt 3221-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.txt 5768-5928,6009 /code/branches/data_cleanup/src/modules/CMakeLists.txt 7537-7686 /code/branches/doc/src/modules/CMakeLists.txt 7290-7400 /code/branches/dockingsystem/src/modules/CMakeLists.txt 8101-8192 /code/branches/dynamicmatch/src/modules/CMakeLists.txt 6584-7030 /code/branches/fps/src/modules/CMakeLists.txt 6591-7072 /code/branches/gameimmersion/src/modules/CMakeLists.txt 8102-8577 /code/branches/gamestate/src/modules/CMakeLists.txt 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/CMakeLists.txt 6594-6745 /code/branches/gametypes/src/modules/CMakeLists.txt 2826-3031 /code/branches/gcc43/src/modules/CMakeLists.txt 1580 /code/branches/gui/src/modules/CMakeLists.txt 1635-1723,2795-2894 /code/branches/hudelements/src/modules/CMakeLists.txt 6584-6941 /code/branches/hudimprovements/src/modules/CMakeLists.txt 7920-8672 /code/branches/ingamemenu/src/modules/CMakeLists.txt 6000-6023 /code/branches/input/src/modules/CMakeLists.txt 1629-1636 /code/branches/ipv6/src/modules/CMakeLists.txt 7293-7458 /code/branches/kicklib/src/modules/CMakeLists.txt 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/CMakeLists.txt 8282-8350 /code/branches/lastmanstanding/src/modules/CMakeLists.txt 7479-7644 /code/branches/lastmanstanding3/src/modules/CMakeLists.txt 7903-8175 /code/branches/libraries/src/modules/CMakeLists.txt 5612-5692 /code/branches/libraries2/src/modules/CMakeLists.txt 5703-5737 /code/branches/lod/src/modules/CMakeLists.txt 6586-6911 /code/branches/lodfinal/src/modules/CMakeLists.txt 2372-2411 /code/branches/mac_osx/src/modules/CMakeLists.txt 7789-8128,8135 /code/branches/map/src/modules/CMakeLists.txt 2801-3086,3089 /code/branches/masterserver/src/modules/CMakeLists.txt 7502-7738 /code/branches/menu/src/modules/CMakeLists.txt 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/CMakeLists.txt 2754-2824 /code/branches/netp2/src/modules/CMakeLists.txt 2835-2988 /code/branches/netp3/src/modules/CMakeLists.txt 2988-3082 /code/branches/netp6/src/modules/CMakeLists.txt 3214-3302 /code/branches/network/src/modules/CMakeLists.txt 2356 /code/branches/network2/src/modules/CMakeLists.txt 6434-6465 /code/branches/network3/src/modules/CMakeLists.txt 7196-7344 /code/branches/network4/src/modules/CMakeLists.txt 7497-7755 /code/branches/network5/src/modules/CMakeLists.txt 7757-7781 /code/branches/network6/src/modules/CMakeLists.txt 7823-8315 /code/branches/network64/src/modules/CMakeLists.txt 2210-2355 /code/branches/notifications/src/modules/CMakeLists.txt 7314-7401 /code/branches/objecthierarchy/src/modules/CMakeLists.txt 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/CMakeLists.txt 2171-2479 /code/branches/ois_update/src/modules/CMakeLists.txt 7506-7788 /code/branches/overlay/src/modules/CMakeLists.txt 2117-2385 /code/branches/particles/src/modules/CMakeLists.txt 2829-3085 /code/branches/particles2/src/modules/CMakeLists.txt 6050-6106,6109 /code/branches/pch/src/modules/CMakeLists.txt 3113-3194 /code/branches/physics/src/modules/CMakeLists.txt 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/CMakeLists.txt 2436-2457 /code/branches/pickup/src/modules/CMakeLists.txt 8145-8555 /code/branches/pickup2/src/modules/CMakeLists.txt 5942-6405 /code/branches/pickup3/src/modules/CMakeLists.txt 6418-6523 /code/branches/pickup4/src/modules/CMakeLists.txt 6594-6710 /code/branches/pickups/src/modules/CMakeLists.txt 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/CMakeLists.txt 2107-2497,2915-3071 /code/branches/png2/src/modules/CMakeLists.txt 7262-7263 /code/branches/portals/src/modules/CMakeLists.txt 8087-8455 /code/branches/portals2/src/modules/CMakeLists.txt 8460-8602 /code/branches/ppspickups1/src/modules/CMakeLists.txt 6552-6708 /code/branches/ppspickups2/src/modules/CMakeLists.txt 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/CMakeLists.txt 6757-6997 /code/branches/ppspickups4/src/modules/CMakeLists.txt 7003-7089 /code/branches/presentation2/src/modules/CMakeLists.txt 6106-6416,7787-7800 /code/branches/presentation3/src/modules/CMakeLists.txt 6913-7162 /code/branches/questsystem/src/modules/CMakeLists.txt 1894-2088 /code/branches/questsystem2/src/modules/CMakeLists.txt 2107-2259 /code/branches/questsystem5/src/modules/CMakeLists.txt 2776-2905 /code/branches/releasetodo/src/modules/CMakeLists.txt 7614-7647 /code/branches/resource/src/modules/CMakeLists.txt 3327-3366 /code/branches/resource2/src/modules/CMakeLists.txt 3372-5694 /code/branches/rocket/src/modules/CMakeLists.txt 6523-6950 /code/branches/rocket2/src/modules/CMakeLists.txt 6953-6970 /code/branches/script_trigger/src/modules/CMakeLists.txt 1295-1953,1955 /code/branches/skybox2/src/modules/CMakeLists.txt 6559-6989 /code/branches/sound/src/modules/CMakeLists.txt 2829-3010 /code/branches/sound3/src/modules/CMakeLists.txt 5941-6102 /code/branches/spaceboundaries/src/modules/CMakeLists.txt 8085-8457 /code/branches/spaceboundaries2/src/modules/CMakeLists.txt 8460-8613 /code/branches/spacerace/src/modules/CMakeLists.txt 8182-8630 /code/branches/steering/src/modules/CMakeLists.txt 5949-6091,8140-8595 /code/branches/tetris/src/modules/CMakeLists.txt 8100-8563 /code/branches/tutoriallevel/src/modules/CMakeLists.txt 7827-8370 /code/branches/tutoriallevel2/src/modules/CMakeLists.txt 8370-8452 /code/branches/tutoriallevel3/src/modules/CMakeLists.txt 8453-8636 /code/branches/unity_build/src/modules/CMakeLists.txt 8440-8716 /code/branches/weapon/src/modules/CMakeLists.txt 1925-2094 /code/branches/weapon2/src/modules/CMakeLists.txt 2107-2488 /code/branches/weapons/src/modules/CMakeLists.txt 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/CMakeLists.txt 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/designtools
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/designtools merged eligible /code/branches/environment3/src/modules/designtools merged eligible /code/branches/formation/src/modules/designtools merged eligible /code/branches/gamecontent/src/modules/designtools merged eligible /code/branches/hud/src/modules/designtools merged eligible /code/branches/masterserverfix/src/modules/designtools merged eligible /code/branches/menue/src/modules/designtools merged eligible /code/branches/newlevel2012/src/modules/designtools merged eligible /code/branches/output/src/modules/designtools merged eligible /code/branches/pickup2012/src/modules/designtools merged eligible /code/branches/presentation/src/modules/designtools merged eligible /code/branches/presentation2011/src/modules/designtools merged eligible /code/branches/shipSelection/src/modules/designtools merged eligible /code/branches/sound2012/src/modules/designtools merged eligible /code/branches/spacegate/src/modules/designtools merged eligible /code/branches/spaceraceTwo/src/modules/designtools merged eligible /code/branches/surfaceRace/src/modules/designtools merged eligible /code/branches/usability/src/modules/designtools merged eligible /code/trunk/src/modules/designtools merged eligible /code/branches/ai/src/modules/designtools 6592-7033 /code/branches/ai2/src/modules/designtools 8721-8880 /code/branches/bigships/src/modules/designtools 8137-8588 /code/branches/buildsystem/src/modules/designtools 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/designtools 2506-2658 /code/branches/buildsystem3/src/modules/designtools 2662-2708 /code/branches/ceguilua/src/modules/designtools 1802-1808 /code/branches/chat/src/modules/designtools 6527-6797 /code/branches/chat2/src/modules/designtools 6836-6910 /code/branches/console/src/modules/designtools 5941-6104 /code/branches/consolecommands2/src/modules/designtools 6451-7178 /code/branches/consolecommands3/src/modules/designtools 7178-7283 /code/branches/core3/src/modules/designtools 1572-1739 /code/branches/core4/src/modules/designtools 3221-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/designtools 5768-5928,6009 /code/branches/data_cleanup/src/modules/designtools 7537-7686 /code/branches/doc/src/modules/designtools 7290-7400 /code/branches/dockingsystem/src/modules/designtools 8101-8192 /code/branches/dynamicmatch/src/modules/designtools 6584-7030 /code/branches/fps/src/modules/designtools 6591-7072 /code/branches/gameimmersion/src/modules/designtools 8102-8577 /code/branches/gamestate/src/modules/designtools 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/designtools 6594-6745 /code/branches/gametypes/src/modules/designtools 2826-3031 /code/branches/gcc43/src/modules/designtools 1580 /code/branches/gui/src/modules/designtools 1635-1723,2795-2894 /code/branches/hudelements/src/modules/designtools 6584-6941 /code/branches/hudimprovements/src/modules/designtools 7920-8672 /code/branches/ingamemenu/src/modules/designtools 6000-6023 /code/branches/input/src/modules/designtools 1629-1636 /code/branches/ipv6/src/modules/designtools 7293-7458 /code/branches/kicklib/src/modules/designtools 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/designtools 8282-8350 /code/branches/lastmanstanding/src/modules/designtools 7479-7644 /code/branches/lastmanstanding3/src/modules/designtools 7903-8175 /code/branches/libraries/src/modules/designtools 5612-5692 /code/branches/libraries2/src/modules/designtools 5703-5737 /code/branches/lod/src/modules/designtools 6586-6911 /code/branches/lodfinal/src/modules/designtools 2372-2411 /code/branches/mac_osx/src/modules/designtools 7789-8128,8135 /code/branches/map/src/modules/designtools 2801-3086,3089 /code/branches/masterserver/src/modules/designtools 7502-7738 /code/branches/menu/src/modules/designtools 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/designtools 2754-2824 /code/branches/netp2/src/modules/designtools 2835-2988 /code/branches/netp3/src/modules/designtools 2988-3082 /code/branches/netp6/src/modules/designtools 3214-3302 /code/branches/network/src/modules/designtools 2356 /code/branches/network2/src/modules/designtools 6434-6465 /code/branches/network3/src/modules/designtools 7196-7344 /code/branches/network4/src/modules/designtools 7497-7755 /code/branches/network5/src/modules/designtools 7757-7781 /code/branches/network6/src/modules/designtools 7823-8315 /code/branches/network64/src/modules/designtools 2210-2355 /code/branches/notifications/src/modules/designtools 7314-7401 /code/branches/objecthierarchy/src/modules/designtools 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/designtools 2171-2479 /code/branches/ois_update/src/modules/designtools 7506-7788 /code/branches/overlay/src/modules/designtools 2117-2385 /code/branches/particles/src/modules/designtools 2829-3085 /code/branches/particles2/src/modules/designtools 6050-6106,6109 /code/branches/pch/src/modules/designtools 3113-3194 /code/branches/physics/src/modules/designtools 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/designtools 2436-2457 /code/branches/pickup/src/modules/designtools 8145-8555 /code/branches/pickup2/src/modules/designtools 5942-6405 /code/branches/pickup3/src/modules/designtools 6418-6523 /code/branches/pickup4/src/modules/designtools 6594-6710 /code/branches/pickups/src/modules/designtools 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/designtools 2107-2497,2915-3071 /code/branches/png2/src/modules/designtools 7262-7263 /code/branches/portals/src/modules/designtools 8087-8455 /code/branches/portals2/src/modules/designtools 8460-8602 /code/branches/ppspickups1/src/modules/designtools 6552-6708 /code/branches/ppspickups2/src/modules/designtools 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/designtools 6757-6997 /code/branches/ppspickups4/src/modules/designtools 7003-7089 /code/branches/presentation2/src/modules/designtools 6106-6416,7787-7800 /code/branches/presentation3/src/modules/designtools 6913-7162 /code/branches/questsystem/src/modules/designtools 1894-2088 /code/branches/questsystem2/src/modules/designtools 2107-2259 /code/branches/questsystem5/src/modules/designtools 2776-2905 /code/branches/releasetodo/src/modules/designtools 7614-7647 /code/branches/resource/src/modules/designtools 3327-3366 /code/branches/resource2/src/modules/designtools 3372-5694 /code/branches/rocket/src/modules/designtools 6523-6950 /code/branches/rocket2/src/modules/designtools 6953-6970 /code/branches/script_trigger/src/modules/designtools 1295-1953,1955 /code/branches/skybox2/src/modules/designtools 6559-6989 /code/branches/sound/src/modules/designtools 2829-3010 /code/branches/sound3/src/modules/designtools 5941-6102 /code/branches/spaceboundaries/src/modules/designtools 8085-8457 /code/branches/spaceboundaries2/src/modules/designtools 8460-8613 /code/branches/spacerace/src/modules/designtools 8182-8630 /code/branches/steering/src/modules/designtools 5949-6091,8140-8595 /code/branches/tetris/src/modules/designtools 8100-8563 /code/branches/tutoriallevel/src/modules/designtools 7827-8370 /code/branches/tutoriallevel2/src/modules/designtools 8370-8452 /code/branches/tutoriallevel3/src/modules/designtools 8453-8636 /code/branches/unity_build/src/modules/designtools 8440-8716 /code/branches/weapon/src/modules/designtools 1925-2094 /code/branches/weapon2/src/modules/designtools 2107-2488 /code/branches/weapons/src/modules/designtools 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/designtools 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/docking
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/docking merged eligible /code/branches/environment3/src/modules/docking merged eligible /code/branches/formation/src/modules/docking merged eligible /code/branches/gamecontent/src/modules/docking merged eligible /code/branches/hud/src/modules/docking merged eligible /code/branches/masterserverfix/src/modules/docking merged eligible /code/branches/menue/src/modules/docking merged eligible /code/branches/newlevel2012/src/modules/docking merged eligible /code/branches/output/src/modules/docking merged eligible /code/branches/pickup2012/src/modules/docking merged eligible /code/branches/presentation/src/modules/docking merged eligible /code/branches/presentation2011/src/modules/docking merged eligible /code/branches/shipSelection/src/modules/docking merged eligible /code/branches/sound2012/src/modules/docking merged eligible /code/branches/spacegate/src/modules/docking merged eligible /code/branches/spaceraceTwo/src/modules/docking merged eligible /code/branches/surfaceRace/src/modules/docking merged eligible /code/trunk/src/modules/docking merged eligible /code/branches/ai/src/modules/docking 6592-7033 /code/branches/ai2/src/modules/docking 8721-8880 /code/branches/bigships/src/modules/docking 8137-8588 /code/branches/buildsystem/src/modules/docking 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/docking 2506-2658 /code/branches/buildsystem3/src/modules/docking 2662-2708 /code/branches/ceguilua/src/modules/docking 1802-1808 /code/branches/chat/src/modules/docking 6527-6797 /code/branches/chat2/src/modules/docking 6836-6910 /code/branches/console/src/modules/docking 5941-6104 /code/branches/consolecommands2/src/modules/docking 6451-7178 /code/branches/consolecommands3/src/modules/docking 7178-7283 /code/branches/core3/src/modules/docking 1572-1739 /code/branches/core4/src/modules/docking 3221-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/docking 5768-5928,6009 /code/branches/data_cleanup/src/modules/docking 7537-7686 /code/branches/doc/src/modules/docking 7290-7400 /code/branches/dockingsystem/src/modules/docking 8101-8192 /code/branches/dynamicmatch/src/modules/docking 6584-7030 /code/branches/fps/src/modules/docking 6591-7072 /code/branches/gameimmersion/src/modules/docking 8102-8577 /code/branches/gamestate/src/modules/docking 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/docking 6594-6745 /code/branches/gametypes/src/modules/docking 2826-3031 /code/branches/gcc43/src/modules/docking 1580 /code/branches/gui/src/modules/docking 1635-1723,2795-2894 /code/branches/hudelements/src/modules/docking 6584-6941 /code/branches/hudimprovements/src/modules/docking 7920-8672 /code/branches/ingamemenu/src/modules/docking 6000-6023 /code/branches/input/src/modules/docking 1629-1636 /code/branches/ipv6/src/modules/docking 7293-7458 /code/branches/kicklib/src/modules/docking 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/docking 8282-8350 /code/branches/lastmanstanding/src/modules/docking 7479-7644 /code/branches/lastmanstanding3/src/modules/docking 7903-8175 /code/branches/libraries/src/modules/docking 5612-5692 /code/branches/libraries2/src/modules/docking 5703-5737 /code/branches/lod/src/modules/docking 6586-6911 /code/branches/lodfinal/src/modules/docking 2372-2411 /code/branches/mac_osx/src/modules/docking 7789-8128,8135 /code/branches/map/src/modules/docking 2801-3086,3089 /code/branches/masterserver/src/modules/docking 7502-7738 /code/branches/menu/src/modules/docking 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/docking 2754-2824 /code/branches/netp2/src/modules/docking 2835-2988 /code/branches/netp3/src/modules/docking 2988-3082 /code/branches/netp6/src/modules/docking 3214-3302 /code/branches/network/src/modules/docking 2356 /code/branches/network2/src/modules/docking 6434-6465 /code/branches/network3/src/modules/docking 7196-7344 /code/branches/network4/src/modules/docking 7497-7755 /code/branches/network5/src/modules/docking 7757-7781 /code/branches/network6/src/modules/docking 7823-8315 /code/branches/network64/src/modules/docking 2210-2355 /code/branches/notifications/src/modules/docking 7314-7401 /code/branches/objecthierarchy/src/modules/docking 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/docking 2171-2479 /code/branches/ois_update/src/modules/docking 7506-7788 /code/branches/overlay/src/modules/docking 2117-2385 /code/branches/particles/src/modules/docking 2829-3085 /code/branches/particles2/src/modules/docking 6050-6106,6109 /code/branches/pch/src/modules/docking 3113-3194 /code/branches/physics/src/modules/docking 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/docking 2436-2457 /code/branches/pickup/src/modules/docking 8145-8555 /code/branches/pickup2/src/modules/docking 5942-6405 /code/branches/pickup3/src/modules/docking 6418-6523 /code/branches/pickup4/src/modules/docking 6594-6710 /code/branches/pickups/src/modules/docking 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/docking 2107-2497,2915-3071 /code/branches/png2/src/modules/docking 7262-7263 /code/branches/portals/src/modules/docking 8087-8455 /code/branches/portals2/src/modules/docking 8460-8602 /code/branches/ppspickups1/src/modules/docking 6552-6708 /code/branches/ppspickups2/src/modules/docking 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/docking 6757-6997 /code/branches/ppspickups4/src/modules/docking 7003-7089 /code/branches/presentation2/src/modules/docking 6106-6416,7787-7800 /code/branches/presentation3/src/modules/docking 6913-7162 /code/branches/questsystem/src/modules/docking 1894-2088 /code/branches/questsystem2/src/modules/docking 2107-2259 /code/branches/questsystem5/src/modules/docking 2776-2905 /code/branches/releasetodo/src/modules/docking 7614-7647 /code/branches/resource/src/modules/docking 3327-3366 /code/branches/resource2/src/modules/docking 3372-5694 /code/branches/rocket/src/modules/docking 6523-6950 /code/branches/rocket2/src/modules/docking 6953-6970 /code/branches/script_trigger/src/modules/docking 1295-1953,1955 /code/branches/skybox2/src/modules/docking 6559-6989 /code/branches/sound/src/modules/docking 2829-3010 /code/branches/sound3/src/modules/docking 5941-6102 /code/branches/spaceboundaries/src/modules/docking 8085-8457 /code/branches/spaceboundaries2/src/modules/docking 8460-8613 /code/branches/spacerace/src/modules/docking 8182-8630 /code/branches/steering/src/modules/docking 5949-6091,8140-8595 /code/branches/tetris/src/modules/docking 8100-8563 /code/branches/tutoriallevel/src/modules/docking 7827-8370 /code/branches/tutoriallevel2/src/modules/docking 8370-8452 /code/branches/tutoriallevel3/src/modules/docking 8453-8636 /code/branches/unity_build/src/modules/docking 8440-8716 /code/branches/usability/src/modules/docking 7915-8078 /code/branches/weapon/src/modules/docking 1925-2094 /code/branches/weapon2/src/modules/docking 2107-2488 /code/branches/weapons/src/modules/docking 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/docking 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/gametypes
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/environment3/src/modules/gametypes merged eligible /code/branches/formation/src/modules/gametypes merged eligible /code/branches/gamecontent/src/modules/gametypes merged eligible /code/branches/hud/src/modules/gametypes merged eligible /code/branches/masterserverfix/src/modules/gametypes merged eligible /code/branches/menue/src/modules/gametypes merged eligible /code/branches/newlevel2012/src/modules/gametypes merged eligible /code/branches/output/src/modules/gametypes merged eligible /code/branches/pickup2012/src/modules/gametypes merged eligible /code/branches/presentation/src/modules/gametypes merged eligible /code/branches/presentation2011/src/modules/gametypes merged eligible /code/branches/shipSelection/src/modules/gametypes merged eligible /code/branches/sound2012/src/modules/gametypes merged eligible /code/branches/spacegate/src/modules/gametypes merged eligible /code/branches/spaceraceTwo/src/modules/gametypes merged eligible /code/branches/surfaceRace/src/modules/gametypes merged eligible /code/trunk/src/modules/gametypes merged eligible /code/branches/ai/src/modules/gametypes 6592-7033 /code/branches/ai2/src/modules/gametypes 8721-8880 /code/branches/bigships/src/modules/gametypes 8137-8588 /code/branches/buildsystem/src/modules/gametypes 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/gametypes 2506-2658 /code/branches/buildsystem3/src/modules/gametypes 2662-2708 /code/branches/ceguilua/src/modules/gametypes 1802-1808 /code/branches/chat/src/modules/gametypes 6527-6797 /code/branches/chat2/src/modules/gametypes 6836-6910 /code/branches/console/src/modules/gametypes 5941-6104 /code/branches/consolecommands2/src/modules/gametypes 6451-7178 /code/branches/consolecommands3/src/modules/gametypes 7178-7283 /code/branches/core3/src/modules/gametypes 1572-1739 /code/branches/core4/src/modules/gametypes 3221-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/gametypes 5768-5928,6009 /code/branches/data_cleanup/src/modules/gametypes 7537-7686 /code/branches/doc/src/modules/gametypes 7290-7400 /code/branches/dockingsystem/src/modules/gametypes 8101-8192 /code/branches/dockingsystem2/src/modules/gametypes 8196-8560 /code/branches/dynamicmatch/src/modules/gametypes 6584-7030 /code/branches/fps/src/modules/gametypes 6591-7072 /code/branches/gameimmersion/src/modules/gametypes 8102-8577 /code/branches/gamestate/src/modules/gametypes 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/gametypes 6594-6745 /code/branches/gametypes/src/modules/gametypes 2826-3031 /code/branches/gcc43/src/modules/gametypes 1580 /code/branches/gui/src/modules/gametypes 1635-1723,2795-2894 /code/branches/hudelements/src/modules/gametypes 6584-6941 /code/branches/hudimprovements/src/modules/gametypes 7920-8672 /code/branches/ingamemenu/src/modules/gametypes 6000-6023 /code/branches/input/src/modules/gametypes 1629-1636 /code/branches/ipv6/src/modules/gametypes 7293-7458 /code/branches/kicklib/src/modules/gametypes 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/gametypes 8282-8350 /code/branches/lastmanstanding/src/modules/gametypes 7479-7644 /code/branches/lastmanstanding3/src/modules/gametypes 7903-8175 /code/branches/libraries/src/modules/gametypes 5612-5692 /code/branches/libraries2/src/modules/gametypes 5703-5737 /code/branches/lod/src/modules/gametypes 6586-6911 /code/branches/lodfinal/src/modules/gametypes 2372-2411 /code/branches/mac_osx/src/modules/gametypes 7789-8128,8135 /code/branches/map/src/modules/gametypes 2801-3086,3089 /code/branches/masterserver/src/modules/gametypes 7502-7738 /code/branches/menu/src/modules/gametypes 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/gametypes 2754-2824 /code/branches/netp2/src/modules/gametypes 2835-2988 /code/branches/netp3/src/modules/gametypes 2988-3082 /code/branches/netp6/src/modules/gametypes 3214-3302 /code/branches/network/src/modules/gametypes 2356 /code/branches/network2/src/modules/gametypes 6434-6465 /code/branches/network3/src/modules/gametypes 7196-7344 /code/branches/network4/src/modules/gametypes 7497-7755 /code/branches/network5/src/modules/gametypes 7757-7781 /code/branches/network6/src/modules/gametypes 7823-8315 /code/branches/network64/src/modules/gametypes 2210-2355 /code/branches/notifications/src/modules/gametypes 7314-7401 /code/branches/objecthierarchy/src/modules/gametypes 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/gametypes 2171-2479 /code/branches/ois_update/src/modules/gametypes 7506-7788 /code/branches/overlay/src/modules/gametypes 2117-2385 /code/branches/particles/src/modules/gametypes 2829-3085 /code/branches/particles2/src/modules/gametypes 6050-6106,6109 /code/branches/pch/src/modules/gametypes 3113-3194 /code/branches/physics/src/modules/gametypes 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/gametypes 2436-2457 /code/branches/pickup/src/modules/gametypes 8145-8555 /code/branches/pickup2/src/modules/gametypes 5942-6405 /code/branches/pickup3/src/modules/gametypes 6418-6523 /code/branches/pickup4/src/modules/gametypes 6594-6710 /code/branches/pickups/src/modules/gametypes 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/gametypes 2107-2497,2915-3071 /code/branches/png2/src/modules/gametypes 7262-7263 /code/branches/portals/src/modules/gametypes 8087-8455 /code/branches/portals2/src/modules/gametypes 8460-8602 /code/branches/ppspickups1/src/modules/gametypes 6552-6708 /code/branches/ppspickups2/src/modules/gametypes 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/gametypes 6757-6997 /code/branches/ppspickups4/src/modules/gametypes 7003-7089 /code/branches/presentation2/src/modules/gametypes 6106-6416,7787-7800 /code/branches/presentation3/src/modules/gametypes 6913-7162 /code/branches/questsystem/src/modules/gametypes 1894-2088 /code/branches/questsystem2/src/modules/gametypes 2107-2259 /code/branches/questsystem5/src/modules/gametypes 2776-2905 /code/branches/releasetodo/src/modules/gametypes 7614-7647 /code/branches/resource/src/modules/gametypes 3327-3366 /code/branches/resource2/src/modules/gametypes 3372-5694 /code/branches/rocket/src/modules/gametypes 6523-6950 /code/branches/rocket2/src/modules/gametypes 6953-6970 /code/branches/script_trigger/src/modules/gametypes 1295-1953,1955 /code/branches/skybox2/src/modules/gametypes 6559-6989 /code/branches/sound/src/modules/gametypes 2829-3010 /code/branches/sound3/src/modules/gametypes 5941-6102 /code/branches/spaceboundaries/src/modules/gametypes 8085-8457 /code/branches/spaceboundaries2/src/modules/gametypes 8460-8613 /code/branches/spacerace/src/modules/gametypes 8182-8630 /code/branches/steering/src/modules/gametypes 5949-6091,8140-8595 /code/branches/tetris/src/modules/gametypes 8100-8563 /code/branches/tutoriallevel/src/modules/gametypes 7827-8370 /code/branches/tutoriallevel2/src/modules/gametypes 8370-8452 /code/branches/tutoriallevel3/src/modules/gametypes 8453-8636 /code/branches/unity_build/src/modules/gametypes 8440-8716 /code/branches/usability/src/modules/gametypes 7915-8078 /code/branches/weapon/src/modules/gametypes 1925-2094 /code/branches/weapon2/src/modules/gametypes 2107-2488 /code/branches/weapons/src/modules/gametypes 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/gametypes 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.cc
r9240 r9241 28 28 #include "CaptureTheFlag.h" 29 29 30 #include "core/CoreIncludes.h"31 30 #include "core/ConfigValueIncludes.h" 32 31 #include "interfaces/TeamColourable.h" … … 39 38 { 40 39 CreateUnloadableFactory(CaptureTheFlag); 41 40 42 41 CaptureTheFlag::CaptureTheFlag(BaseObject* creator) : TeamBaseMatch(creator) 43 42 { … … 47 46 this->pointsTeam1_ = 0; 48 47 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 53 52 this->setConfigValues(); 54 53 } 55 54 56 55 void CaptureTheFlag::tick(float dt){ 56 57 SUPER(CaptureTheFlag, tick, dt); 58 57 59 if(this->flagTeamBlue->isPickedUp()){ 58 if(getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer()) == 1){ 60 teamnr = getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer()); 61 if(teamnr == 1){ 59 62 this->flagTeamBlue->ignorePickedUp(); 60 63 61 64 if(this->flagTeamBlue->pickedUpBy()->hasFlag()){ 62 pointsTeam1_ += 1000;65 this->addTeamPoints(teamnr, 1000); 63 66 this->flagTeamBlue->pickedUpBy()->setHasFlag(false); 64 67 } … … 70 73 } 71 74 if(this->flagTeamRed->isPickedUp()){ 72 if(getTeam(this->flagTeamRed->pickedUpBy()->getPlayer()) == 0){ 75 teamnr = getTeam(this->flagTeamBlue->pickedUpBy()->getPlayer()); 76 if(teamnr == 0){ 73 77 this->flagTeamRed->ignorePickedUp(); 74 78 75 79 if(this->flagTeamRed->pickedUpBy()->hasFlag()){ 76 pointsTeam1_ += 1000;80 this->addTeamPoints(teamnr, 1000); 77 81 this->flagTeamRed->pickedUpBy()->setHasFlag(false); 78 82 } … … 83 87 } 84 88 } 89 85 90 } 86 91 void CaptureTheFlag::setConfigValues() 87 92 { 88 93 SetConfigValue(teams_, 2); 89 94 90 95 static ColourValue colours[] = 91 96 { … … 96 101 }; 97 102 static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue)); 98 103 99 104 SetConfigValue(teamcolours_, defaultcolours); 100 105 } 101 106 102 107 void CaptureTheFlag::playerEntered(PlayerInfo* player) 103 108 { 104 Deathmatch::playerEntered(player);105 109 TeamBaseMatch::playerEntered(player); 110 106 111 std::vector<unsigned int> playersperteam(this->teams_, 0); 107 112 108 113 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it) 109 114 if (it->second < static_cast<int>(this->teams_) && it->second >= 0) 110 115 playersperteam[it->second]++; 111 116 112 117 unsigned int minplayers = static_cast<unsigned int>(-1); 113 118 size_t minplayersteam = 0; … … 120 125 } 121 126 } 122 127 123 128 this->teamnumbers_[player] = minplayersteam; 124 129 } 125 130 126 131 bool CaptureTheFlag::playerLeft(PlayerInfo* player) 127 132 { 128 133 bool valid_player = Deathmatch::playerLeft(player); 129 134 130 135 if (valid_player) 131 136 this->teamnumbers_.erase(player); 132 137 133 138 return valid_player; 134 139 } 135 140 136 141 bool CaptureTheFlag::allowPawnHit(Pawn* victim, Pawn* originator) 137 142 { 138 143 return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator); 139 144 } 140 145 141 146 bool CaptureTheFlag::allowPawnDamage(Pawn* victim, Pawn* originator) 142 147 { 143 148 return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator); 144 149 } 145 150 146 151 bool CaptureTheFlag::allowPawnDeath(Pawn* victim, Pawn* originator) 147 152 { 148 153 return (!this->pawnsAreInTheSameTeam(victim, originator) || !originator); 149 154 } 150 155 151 156 // 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()); 182 200 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 234 239 SpawnPoint* CaptureTheFlag::getBestSpawnPoint(PlayerInfo* player) const 235 240 { … … 238 243 if (it_player != this->teamnumbers_.end()) 239 244 desiredTeamNr = it_player->second; 240 245 241 246 // Only use spawnpoints of the own team (or non-team-spawnpoints) 242 247 std::set<SpawnPoint*> teamSpawnPoints = this->spawnpoints_; … … 252 257 } 253 258 } 254 259 255 260 ++it; 256 261 } 257 262 258 263 SpawnPoint* fallbackSpawnPoint = NULL; 259 264 if (teamSpawnPoints.size() > 0) … … 269 274 break; 270 275 } 271 276 272 277 ++index; 273 278 } 274 279 275 280 // Remove all inactive SpawnPoints from the list. 276 281 for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ) … … 281 286 continue; 282 287 } 283 288 284 289 ++it; 285 290 } 286 291 287 292 randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size()))); 288 293 index = 0; … … 291 296 if (index == randomspawn) 292 297 return (*it); 293 298 294 299 ++index; 295 300 } 296 301 297 302 return fallbackSpawnPoint; 298 303 } 299 304 300 305 return 0; 301 306 } 302 307 303 308 void CaptureTheFlag::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) 304 309 { 305 310 if (!player) 306 311 return; 307 312 308 313 // Set the team colour 309 314 std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player); … … 313 318 { 314 319 pawn->setRadarObjectColour(this->teamcolours_[it_player->second]); 315 320 316 321 std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects(); 317 322 for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it) … … 326 331 } 327 332 } 328 333 329 334 bool CaptureTheFlag::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2) 330 335 { … … 333 338 std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer()); 334 339 std::map<PlayerInfo*, int>::const_iterator it2 = this->teamnumbers_.find(pawn2->getPlayer()); 335 340 336 341 if (it1 != this->teamnumbers_.end() && it2 != this->teamnumbers_.end()) 337 342 return (it1->second == it2->second); … … 339 344 return false; 340 345 } 341 346 342 347 int CaptureTheFlag::getTeam(PlayerInfo* player) 343 348 { -
code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h
r9240 r9241 32 32 #include "OrxonoxPrereqs.h" 33 33 #include <set> 34 #include "core/CoreIncludes.h" 35 34 36 #include "tools/Timer.h" 35 37 #include "gametypes/TeamBaseMatch.h" 36 38 #include "infos/PlayerInfo.h" 37 39 #include "pickup/items/FlagPickup.h" 40 #include "pickup/PickupPrereqs.h" 38 41 39 42 namespace orxonox … … 42 45 { 43 46 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 85 90 }; 86 91 } -
code/branches/presentation2012/src/modules/notifications
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/notifications merged eligible /code/branches/environment3/src/modules/notifications merged eligible /code/branches/formation/src/modules/notifications merged eligible /code/branches/gamecontent/src/modules/notifications merged eligible /code/branches/hud/src/modules/notifications merged eligible /code/branches/masterserverfix/src/modules/notifications merged eligible /code/branches/menue/src/modules/notifications merged eligible /code/branches/newlevel2012/src/modules/notifications merged eligible /code/branches/output/src/modules/notifications merged eligible /code/branches/pickup2012/src/modules/notifications merged eligible /code/branches/presentation/src/modules/notifications merged eligible /code/branches/presentation2011/src/modules/notifications merged eligible /code/branches/shipSelection/src/modules/notifications merged eligible /code/branches/sound2012/src/modules/notifications merged eligible /code/branches/spacegate/src/modules/notifications merged eligible /code/branches/spaceraceTwo/src/modules/notifications merged eligible /code/branches/surfaceRace/src/modules/notifications merged eligible /code/branches/usability/src/modules/notifications merged eligible /code/trunk/src/modules/notifications merged eligible /code/branches/ai/src/modules/notifications 6592-7033 /code/branches/ai2/src/modules/notifications 8721-8880 /code/branches/bigships/src/modules/notifications 8137-8588 /code/branches/buildsystem/src/modules/notifications 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/notifications 2506-2658 /code/branches/buildsystem3/src/modules/notifications 2662-2708 /code/branches/ceguilua/src/modules/notifications 1802-1808 /code/branches/chat/src/modules/notifications 6527-6797 /code/branches/chat2/src/modules/notifications 6836-6910 /code/branches/console/src/modules/notifications 5941-6104 /code/branches/consolecommands2/src/modules/notifications 6451-7178 /code/branches/consolecommands3/src/modules/notifications 7178-7283 /code/branches/core3/src/modules/notifications 1572-1739 /code/branches/core4/src/modules/notifications 3221-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/notifications 5768-5928,6009 /code/branches/data_cleanup/src/modules/notifications 7537-7686 /code/branches/doc/src/modules/notifications 7290-7400 /code/branches/dockingsystem/src/modules/notifications 8101-8192 /code/branches/dynamicmatch/src/modules/notifications 6584-7030 /code/branches/fps/src/modules/notifications 6591-7072 /code/branches/gameimmersion/src/modules/notifications 8102-8577 /code/branches/gamestate/src/modules/notifications 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/notifications 6594-6745 /code/branches/gametypes/src/modules/notifications 2826-3031 /code/branches/gcc43/src/modules/notifications 1580 /code/branches/gui/src/modules/notifications 1635-1723,2795-2894 /code/branches/hudelements/src/modules/notifications 6584-6941 /code/branches/hudimprovements/src/modules/notifications 7920-8672 /code/branches/ingamemenu/src/modules/notifications 6000-6023 /code/branches/input/src/modules/notifications 1629-1636 /code/branches/ipv6/src/modules/notifications 7293-7458 /code/branches/kicklib/src/modules/notifications 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/notifications 8282-8350 /code/branches/lastmanstanding/src/modules/notifications 7479-7644 /code/branches/lastmanstanding3/src/modules/notifications 7903-8175 /code/branches/libraries/src/modules/notifications 5612-5692 /code/branches/libraries2/src/modules/notifications 5703-5737 /code/branches/lod/src/modules/notifications 6586-6911 /code/branches/lodfinal/src/modules/notifications 2372-2411 /code/branches/mac_osx/src/modules/notifications 7789-8128,8135 /code/branches/map/src/modules/notifications 2801-3086,3089 /code/branches/masterserver/src/modules/notifications 7502-7738 /code/branches/menu/src/modules/notifications 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/notifications 2754-2824 /code/branches/netp2/src/modules/notifications 2835-2988 /code/branches/netp3/src/modules/notifications 2988-3082 /code/branches/netp6/src/modules/notifications 3214-3302 /code/branches/network/src/modules/notifications 2356 /code/branches/network2/src/modules/notifications 6434-6465 /code/branches/network3/src/modules/notifications 7196-7344 /code/branches/network4/src/modules/notifications 7497-7755 /code/branches/network5/src/modules/notifications 7757-7781 /code/branches/network6/src/modules/notifications 7823-8315 /code/branches/network64/src/modules/notifications 2210-2355 /code/branches/notifications/src/modules/notifications 7314-7401 /code/branches/objecthierarchy/src/modules/notifications 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/notifications 2171-2479 /code/branches/ois_update/src/modules/notifications 7506-7788 /code/branches/overlay/src/modules/notifications 2117-2385 /code/branches/particles/src/modules/notifications 2829-3085 /code/branches/particles2/src/modules/notifications 6050-6106,6109 /code/branches/pch/src/modules/notifications 3113-3194 /code/branches/physics/src/modules/notifications 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/notifications 2436-2457 /code/branches/pickup/src/modules/notifications 8145-8555 /code/branches/pickup2/src/modules/notifications 5942-6405 /code/branches/pickup3/src/modules/notifications 6418-6523 /code/branches/pickup4/src/modules/notifications 6594-6710 /code/branches/pickups/src/modules/notifications 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/notifications 2107-2497,2915-3071 /code/branches/png2/src/modules/notifications 7262-7263 /code/branches/portals/src/modules/notifications 8087-8455 /code/branches/portals2/src/modules/notifications 8460-8602 /code/branches/ppspickups1/src/modules/notifications 6552-6708 /code/branches/ppspickups2/src/modules/notifications 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/notifications 6757-6997 /code/branches/ppspickups4/src/modules/notifications 7003-7089 /code/branches/presentation2/src/modules/notifications 6106-6416,7787-7800 /code/branches/presentation3/src/modules/notifications 6913-7162 /code/branches/questsystem/src/modules/notifications 1894-2088 /code/branches/questsystem2/src/modules/notifications 2107-2259 /code/branches/questsystem5/src/modules/notifications 2776-2905 /code/branches/releasetodo/src/modules/notifications 7614-7647 /code/branches/resource/src/modules/notifications 3327-3366 /code/branches/resource2/src/modules/notifications 3372-5694 /code/branches/rocket/src/modules/notifications 6523-6950 /code/branches/rocket2/src/modules/notifications 6953-6970 /code/branches/script_trigger/src/modules/notifications 1295-1953,1955 /code/branches/skybox2/src/modules/notifications 6559-6989 /code/branches/sound/src/modules/notifications 2829-3010 /code/branches/sound3/src/modules/notifications 5941-6102 /code/branches/spaceboundaries/src/modules/notifications 8085-8457 /code/branches/spaceboundaries2/src/modules/notifications 8460-8613 /code/branches/spacerace/src/modules/notifications 8182-8630 /code/branches/steering/src/modules/notifications 5949-6091,8140-8595 /code/branches/tetris/src/modules/notifications 8100-8563 /code/branches/tutoriallevel/src/modules/notifications 7827-8370 /code/branches/tutoriallevel2/src/modules/notifications 8370-8452 /code/branches/tutoriallevel3/src/modules/notifications 8453-8636 /code/branches/unity_build/src/modules/notifications 8440-8716 /code/branches/weapon/src/modules/notifications 1925-2094 /code/branches/weapon2/src/modules/notifications 2107-2488 /code/branches/weapons/src/modules/notifications 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/notifications 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/objects
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/objects merged eligible /code/branches/environment3/src/modules/objects merged eligible /code/branches/formation/src/modules/objects merged eligible /code/branches/gamecontent/src/modules/objects merged eligible /code/branches/hud/src/modules/objects merged eligible /code/branches/masterserverfix/src/modules/objects merged eligible /code/branches/menue/src/modules/objects merged eligible /code/branches/newlevel2012/src/modules/objects merged eligible /code/branches/output/src/modules/objects merged eligible /code/branches/pickup2012/src/modules/objects merged eligible /code/branches/presentation/src/modules/objects merged eligible /code/branches/presentation2011/src/modules/objects merged eligible /code/branches/shipSelection/src/modules/objects merged eligible /code/branches/sound2012/src/modules/objects merged eligible /code/branches/spacegate/src/modules/objects merged eligible /code/branches/spaceraceTwo/src/modules/objects merged eligible /code/branches/surfaceRace/src/modules/objects merged eligible /code/branches/usability/src/modules/objects merged eligible /code/trunk/src/modules/objects merged eligible /code/branches/ai/src/modules/objects 6592-7033 /code/branches/ai2/src/modules/objects 8721-8880 /code/branches/bigships/src/modules/objects 8137-8588 /code/branches/buildsystem/src/modules/objects 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/objects 2506-2658 /code/branches/buildsystem3/src/modules/objects 2662-2708 /code/branches/ceguilua/src/modules/objects 1802-1808 /code/branches/chat/src/modules/objects 6527-6797 /code/branches/chat2/src/modules/objects 6836-6910 /code/branches/console/src/modules/objects 5941-6104 /code/branches/consolecommands2/src/modules/objects 6451-7178 /code/branches/consolecommands3/src/modules/objects 7178-7283 /code/branches/core3/src/modules/objects 1572-1739 /code/branches/core4/src/modules/objects 3221-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/objects 5768-5928,6009 /code/branches/data_cleanup/src/modules/objects 7537-7686 /code/branches/doc/src/modules/objects 7290-7400 /code/branches/dockingsystem/src/modules/objects 8101-8192 /code/branches/dynamicmatch/src/modules/objects 6584-7030 /code/branches/fps/src/modules/objects 6591-7072 /code/branches/gameimmersion/src/modules/objects 8102-8577 /code/branches/gamestate/src/modules/objects 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/objects 6594-6745 /code/branches/gametypes/src/modules/objects 2826-3031 /code/branches/gcc43/src/modules/objects 1580 /code/branches/gui/src/modules/objects 1635-1723,2795-2894 /code/branches/hudelements/src/modules/objects 6584-6941 /code/branches/hudimprovements/src/modules/objects 7920-8672 /code/branches/ingamemenu/src/modules/objects 6000-6023 /code/branches/input/src/modules/objects 1629-1636 /code/branches/ipv6/src/modules/objects 7293-7458 /code/branches/kicklib/src/modules/objects 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/objects 8282-8350 /code/branches/lastmanstanding/src/modules/objects 7479-7644 /code/branches/lastmanstanding3/src/modules/objects 7903-8175 /code/branches/libraries/src/modules/objects 5612-5692 /code/branches/libraries2/src/modules/objects 5703-5737 /code/branches/lod/src/modules/objects 6586-6911 /code/branches/lodfinal/src/modules/objects 2372-2411 /code/branches/mac_osx/src/modules/objects 7789-8128,8135 /code/branches/map/src/modules/objects 2801-3086,3089 /code/branches/masterserver/src/modules/objects 7502-7738 /code/branches/menu/src/modules/objects 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/objects 2754-2824 /code/branches/netp2/src/modules/objects 2835-2988 /code/branches/netp3/src/modules/objects 2988-3082 /code/branches/netp6/src/modules/objects 3214-3302 /code/branches/network/src/modules/objects 2356 /code/branches/network2/src/modules/objects 6434-6465 /code/branches/network3/src/modules/objects 7196-7344 /code/branches/network4/src/modules/objects 7497-7755 /code/branches/network5/src/modules/objects 7757-7781 /code/branches/network6/src/modules/objects 7823-8315 /code/branches/network64/src/modules/objects 2210-2355 /code/branches/notifications/src/modules/objects 7314-7401 /code/branches/objecthierarchy/src/modules/objects 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/objects 2171-2479 /code/branches/ois_update/src/modules/objects 7506-7788 /code/branches/overlay/src/modules/objects 2117-2385 /code/branches/particles/src/modules/objects 2829-3085 /code/branches/particles2/src/modules/objects 6050-6106,6109 /code/branches/pch/src/modules/objects 3113-3194 /code/branches/physics/src/modules/objects 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/objects 2436-2457 /code/branches/pickup/src/modules/objects 8145-8555 /code/branches/pickup2/src/modules/objects 5942-6405 /code/branches/pickup3/src/modules/objects 6418-6523 /code/branches/pickup4/src/modules/objects 6594-6710 /code/branches/pickups/src/modules/objects 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/objects 2107-2497,2915-3071 /code/branches/png2/src/modules/objects 7262-7263 /code/branches/portals/src/modules/objects 8087-8455 /code/branches/portals2/src/modules/objects 8460-8602 /code/branches/ppspickups1/src/modules/objects 6552-6708 /code/branches/ppspickups2/src/modules/objects 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/objects 6757-6997 /code/branches/ppspickups4/src/modules/objects 7003-7089 /code/branches/presentation2/src/modules/objects 6106-6416,7787-7800 /code/branches/presentation3/src/modules/objects 6913-7162 /code/branches/questsystem/src/modules/objects 1894-2088 /code/branches/questsystem2/src/modules/objects 2107-2259 /code/branches/questsystem5/src/modules/objects 2776-2905 /code/branches/releasetodo/src/modules/objects 7614-7647 /code/branches/resource/src/modules/objects 3327-3366 /code/branches/resource2/src/modules/objects 3372-5694 /code/branches/rocket/src/modules/objects 6523-6950 /code/branches/rocket2/src/modules/objects 6953-6970 /code/branches/script_trigger/src/modules/objects 1295-1953,1955 /code/branches/skybox2/src/modules/objects 6559-6989 /code/branches/sound/src/modules/objects 2829-3010 /code/branches/sound3/src/modules/objects 5941-6102 /code/branches/spaceboundaries/src/modules/objects 8085-8457 /code/branches/spaceboundaries2/src/modules/objects 8460-8613 /code/branches/spacerace/src/modules/objects 8182-8630 /code/branches/steering/src/modules/objects 5949-6091,8140-8595 /code/branches/tetris/src/modules/objects 8100-8563 /code/branches/tutoriallevel/src/modules/objects 7827-8370 /code/branches/tutoriallevel2/src/modules/objects 8370-8452 /code/branches/tutoriallevel3/src/modules/objects 8453-8636 /code/branches/unity_build/src/modules/objects 8440-8716 /code/branches/weapon/src/modules/objects 1925-2094 /code/branches/weapon2/src/modules/objects 2107-2488 /code/branches/weapons/src/modules/objects 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/objects 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/overlays
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/overlays merged eligible /code/branches/environment3/src/modules/overlays merged eligible /code/branches/formation/src/modules/overlays merged eligible /code/branches/gamecontent/src/modules/overlays merged eligible /code/branches/hud/src/modules/overlays merged eligible /code/branches/masterserverfix/src/modules/overlays merged eligible /code/branches/menue/src/modules/overlays merged eligible /code/branches/newlevel2012/src/modules/overlays merged eligible /code/branches/output/src/modules/overlays merged eligible /code/branches/pickup2012/src/modules/overlays merged eligible /code/branches/presentation/src/modules/overlays merged eligible /code/branches/presentation2011/src/modules/overlays merged eligible /code/branches/shipSelection/src/modules/overlays merged eligible /code/branches/sound2012/src/modules/overlays merged eligible /code/branches/spacegate/src/modules/overlays merged eligible /code/branches/spaceraceTwo/src/modules/overlays merged eligible /code/branches/surfaceRace/src/modules/overlays merged eligible /code/branches/usability/src/modules/overlays merged eligible /code/trunk/src/modules/overlays merged eligible /code/branches/ai/src/modules/overlays 6592-7033 /code/branches/ai2/src/modules/overlays 8721-8880 /code/branches/bigships/src/modules/overlays 8137-8588 /code/branches/buildsystem/src/modules/overlays 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/overlays 2506-2658 /code/branches/buildsystem3/src/modules/overlays 2662-2708 /code/branches/ceguilua/src/modules/overlays 1802-1808 /code/branches/chat/src/modules/overlays 6527-6797 /code/branches/chat2/src/modules/overlays 6836-6910 /code/branches/console/src/modules/overlays 5941-6104 /code/branches/consolecommands2/src/modules/overlays 6451-7178 /code/branches/consolecommands3/src/modules/overlays 7178-7283 /code/branches/core3/src/modules/overlays 1572-1739 /code/branches/core4/src/modules/overlays 3221-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/overlays 5768-5928,6009 /code/branches/data_cleanup/src/modules/overlays 7537-7686 /code/branches/doc/src/modules/overlays 7290-7400 /code/branches/dockingsystem/src/modules/overlays 8101-8192 /code/branches/dynamicmatch/src/modules/overlays 6584-7030 /code/branches/fps/src/modules/overlays 6591-7072 /code/branches/gameimmersion/src/modules/overlays 8102-8577 /code/branches/gamestate/src/modules/overlays 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/overlays 6594-6745 /code/branches/gametypes/src/modules/overlays 2826-3031 /code/branches/gcc43/src/modules/overlays 1580 /code/branches/gui/src/modules/overlays 1635-1723,2795-2894 /code/branches/hudelements/src/modules/overlays 6584-6941 /code/branches/hudimprovements/src/modules/overlays 7920-8672 /code/branches/ingamemenu/src/modules/overlays 6000-6023 /code/branches/input/src/modules/overlays 1629-1636 /code/branches/ipv6/src/modules/overlays 7293-7458 /code/branches/kicklib/src/modules/overlays 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/overlays 8282-8350 /code/branches/lastmanstanding/src/modules/overlays 7479-7644 /code/branches/lastmanstanding3/src/modules/overlays 7903-8175 /code/branches/libraries/src/modules/overlays 5612-5692 /code/branches/libraries2/src/modules/overlays 5703-5737 /code/branches/lod/src/modules/overlays 6586-6911 /code/branches/lodfinal/src/modules/overlays 2372-2411 /code/branches/mac_osx/src/modules/overlays 7789-8128,8135 /code/branches/map/src/modules/overlays 2801-3086,3089 /code/branches/masterserver/src/modules/overlays 7502-7738 /code/branches/menu/src/modules/overlays 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/overlays 2754-2824 /code/branches/netp2/src/modules/overlays 2835-2988 /code/branches/netp3/src/modules/overlays 2988-3082 /code/branches/netp6/src/modules/overlays 3214-3302 /code/branches/network/src/modules/overlays 2356 /code/branches/network2/src/modules/overlays 6434-6465 /code/branches/network3/src/modules/overlays 7196-7344 /code/branches/network4/src/modules/overlays 7497-7755 /code/branches/network5/src/modules/overlays 7757-7781 /code/branches/network6/src/modules/overlays 7823-8315 /code/branches/network64/src/modules/overlays 2210-2355 /code/branches/notifications/src/modules/overlays 7314-7401 /code/branches/objecthierarchy/src/modules/overlays 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/overlays 2171-2479 /code/branches/ois_update/src/modules/overlays 7506-7788 /code/branches/overlay/src/modules/overlays 2117-2385 /code/branches/particles/src/modules/overlays 2829-3085 /code/branches/particles2/src/modules/overlays 6050-6106,6109 /code/branches/pch/src/modules/overlays 3113-3194 /code/branches/physics/src/modules/overlays 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/overlays 2436-2457 /code/branches/pickup/src/modules/overlays 8145-8555 /code/branches/pickup2/src/modules/overlays 5942-6405 /code/branches/pickup3/src/modules/overlays 6418-6523 /code/branches/pickup4/src/modules/overlays 6594-6710 /code/branches/pickups/src/modules/overlays 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/overlays 2107-2497,2915-3071 /code/branches/png2/src/modules/overlays 7262-7263 /code/branches/portals/src/modules/overlays 8087-8455 /code/branches/portals2/src/modules/overlays 8460-8602 /code/branches/ppspickups1/src/modules/overlays 6552-6708 /code/branches/ppspickups2/src/modules/overlays 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/overlays 6757-6997 /code/branches/ppspickups4/src/modules/overlays 7003-7089 /code/branches/presentation2/src/modules/overlays 6106-6416,7787-7800 /code/branches/presentation3/src/modules/overlays 6913-7162 /code/branches/questsystem/src/modules/overlays 1894-2088 /code/branches/questsystem2/src/modules/overlays 2107-2259 /code/branches/questsystem5/src/modules/overlays 2776-2905 /code/branches/releasetodo/src/modules/overlays 7614-7647 /code/branches/resource/src/modules/overlays 3327-3366 /code/branches/resource2/src/modules/overlays 3372-5694 /code/branches/rocket/src/modules/overlays 6523-6950 /code/branches/rocket2/src/modules/overlays 6953-6970 /code/branches/script_trigger/src/modules/overlays 1295-1953,1955 /code/branches/skybox2/src/modules/overlays 6559-6989 /code/branches/sound/src/modules/overlays 2829-3010 /code/branches/sound3/src/modules/overlays 5941-6102 /code/branches/spaceboundaries/src/modules/overlays 8085-8457 /code/branches/spaceboundaries2/src/modules/overlays 8460-8613 /code/branches/spacerace/src/modules/overlays 8182-8630 /code/branches/steering/src/modules/overlays 5949-6091,8140-8595 /code/branches/tetris/src/modules/overlays 8100-8563 /code/branches/tutoriallevel/src/modules/overlays 7827-8370 /code/branches/tutoriallevel2/src/modules/overlays 8370-8452 /code/branches/tutoriallevel3/src/modules/overlays 8453-8636 /code/branches/unity_build/src/modules/overlays 8440-8716 /code/branches/weapon/src/modules/overlays 1925-2094 /code/branches/weapon2/src/modules/overlays 2107-2488 /code/branches/weapons/src/modules/overlays 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/overlays 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/pickup
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/pickup merged eligible /code/branches/environment3/src/modules/pickup merged eligible /code/branches/formation/src/modules/pickup merged eligible /code/branches/gamecontent/src/modules/pickup merged eligible /code/branches/hud/src/modules/pickup merged eligible /code/branches/masterserverfix/src/modules/pickup merged eligible /code/branches/menue/src/modules/pickup merged eligible /code/branches/newlevel2012/src/modules/pickup merged eligible /code/branches/output/src/modules/pickup merged eligible /code/branches/pickup2012/src/modules/pickup merged eligible /code/branches/presentation/src/modules/pickup merged eligible /code/branches/presentation2011/src/modules/pickup merged eligible /code/branches/shipSelection/src/modules/pickup merged eligible /code/branches/sound2012/src/modules/pickup merged eligible /code/branches/spacegate/src/modules/pickup merged eligible /code/branches/spaceraceTwo/src/modules/pickup merged eligible /code/branches/surfaceRace/src/modules/pickup merged eligible /code/branches/usability/src/modules/pickup merged eligible /code/trunk/src/modules/pickup merged eligible /code/branches/ai/src/modules/pickup 6592-7033 /code/branches/ai2/src/modules/pickup 8721-8880 /code/branches/bigships/src/modules/pickup 8137-8588 /code/branches/buildsystem/src/modules/pickup 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/pickup 2506-2658 /code/branches/buildsystem3/src/modules/pickup 2662-2708 /code/branches/ceguilua/src/modules/pickup 1802-1808 /code/branches/chat/src/modules/pickup 6527-6797 /code/branches/chat2/src/modules/pickup 6836-6910 /code/branches/console/src/modules/pickup 5941-6104 /code/branches/consolecommands2/src/modules/pickup 6451-7178 /code/branches/consolecommands3/src/modules/pickup 7178-7283 /code/branches/core3/src/modules/pickup 1572-1739 /code/branches/core4/src/modules/pickup 3221-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/pickup 5768-5928,6009 /code/branches/data_cleanup/src/modules/pickup 7537-7686 /code/branches/doc/src/modules/pickup 7290-7400 /code/branches/dockingsystem/src/modules/pickup 8101-8192 /code/branches/dynamicmatch/src/modules/pickup 6584-7030 /code/branches/fps/src/modules/pickup 6591-7072 /code/branches/gameimmersion/src/modules/pickup 8102-8577 /code/branches/gamestate/src/modules/pickup 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/pickup 6594-6745 /code/branches/gametypes/src/modules/pickup 2826-3031 /code/branches/gcc43/src/modules/pickup 1580 /code/branches/gui/src/modules/pickup 1635-1723,2795-2894 /code/branches/hudelements/src/modules/pickup 6584-6941 /code/branches/hudimprovements/src/modules/pickup 7920-8672 /code/branches/ingamemenu/src/modules/pickup 6000-6023 /code/branches/input/src/modules/pickup 1629-1636 /code/branches/ipv6/src/modules/pickup 7293-7458 /code/branches/kicklib/src/modules/pickup 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/pickup 8282-8350 /code/branches/lastmanstanding/src/modules/pickup 7479-7644 /code/branches/lastmanstanding3/src/modules/pickup 7903-8175 /code/branches/libraries/src/modules/pickup 5612-5692 /code/branches/libraries2/src/modules/pickup 5703-5737 /code/branches/lod/src/modules/pickup 6586-6911 /code/branches/lodfinal/src/modules/pickup 2372-2411 /code/branches/mac_osx/src/modules/pickup 7789-8128,8135 /code/branches/map/src/modules/pickup 2801-3086,3089 /code/branches/masterserver/src/modules/pickup 7502-7738 /code/branches/menu/src/modules/pickup 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/pickup 2754-2824 /code/branches/netp2/src/modules/pickup 2835-2988 /code/branches/netp3/src/modules/pickup 2988-3082 /code/branches/netp6/src/modules/pickup 3214-3302 /code/branches/network/src/modules/pickup 2356 /code/branches/network2/src/modules/pickup 6434-6465 /code/branches/network3/src/modules/pickup 7196-7344 /code/branches/network4/src/modules/pickup 7497-7755 /code/branches/network5/src/modules/pickup 7757-7781 /code/branches/network6/src/modules/pickup 7823-8315 /code/branches/network64/src/modules/pickup 2210-2355 /code/branches/notifications/src/modules/pickup 7314-7401 /code/branches/objecthierarchy/src/modules/pickup 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/pickup 2171-2479 /code/branches/ois_update/src/modules/pickup 7506-7788 /code/branches/overlay/src/modules/pickup 2117-2385 /code/branches/particles/src/modules/pickup 2829-3085 /code/branches/particles2/src/modules/pickup 6050-6106,6109 /code/branches/pch/src/modules/pickup 3113-3194 /code/branches/physics/src/modules/pickup 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/pickup 2436-2457 /code/branches/pickup/src/modules/pickup 8145-8555 /code/branches/pickup2/src/modules/pickup 5942-6405 /code/branches/pickup3/src/modules/pickup 6418-6523 /code/branches/pickup4/src/modules/pickup 6594-6710 /code/branches/pickups/src/modules/pickup 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/pickup 2107-2497,2915-3071 /code/branches/png2/src/modules/pickup 7262-7263 /code/branches/portals/src/modules/pickup 8087-8455 /code/branches/portals2/src/modules/pickup 8460-8602 /code/branches/ppspickups1/src/modules/pickup 6552-6708 /code/branches/ppspickups2/src/modules/pickup 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/pickup 6757-6997 /code/branches/ppspickups4/src/modules/pickup 7003-7089 /code/branches/presentation2/src/modules/pickup 6106-6416,7787-7800 /code/branches/presentation3/src/modules/pickup 6913-7162 /code/branches/questsystem/src/modules/pickup 1894-2088 /code/branches/questsystem2/src/modules/pickup 2107-2259 /code/branches/questsystem5/src/modules/pickup 2776-2905 /code/branches/releasetodo/src/modules/pickup 7614-7647 /code/branches/resource/src/modules/pickup 3327-3366 /code/branches/resource2/src/modules/pickup 3372-5694 /code/branches/rocket/src/modules/pickup 6523-6950 /code/branches/rocket2/src/modules/pickup 6953-6970 /code/branches/script_trigger/src/modules/pickup 1295-1953,1955 /code/branches/skybox2/src/modules/pickup 6559-6989 /code/branches/sound/src/modules/pickup 2829-3010 /code/branches/sound3/src/modules/pickup 5941-6102 /code/branches/spaceboundaries/src/modules/pickup 8085-8457 /code/branches/spaceboundaries2/src/modules/pickup 8460-8613 /code/branches/spacerace/src/modules/pickup 8182-8630 /code/branches/steering/src/modules/pickup 5949-6091,8140-8595 /code/branches/tetris/src/modules/pickup 8100-8563 /code/branches/tutoriallevel/src/modules/pickup 7827-8370 /code/branches/tutoriallevel2/src/modules/pickup 8370-8452 /code/branches/tutoriallevel3/src/modules/pickup 8453-8636 /code/branches/unity_build/src/modules/pickup 8440-8716 /code/branches/weapon/src/modules/pickup 1925-2094 /code/branches/weapon2/src/modules/pickup 2107-2488 /code/branches/weapons/src/modules/pickup 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/pickup 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h
r9195 r9241 68 68 namespace orxonox 69 69 { 70 71 70 class CollectiblePickup; 72 71 class DroppedPickup; -
code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc
r9240 r9241 28 28 29 29 /** 30 31 32 */30 @file FlagPickup.cc 31 @brief Implementation of the FlagPickup class. 32 */ 33 33 34 34 #include "FlagPickup.h" … … 37 37 #include "core/CoreIncludes.h" 38 38 #include "core/XMLPort.h" 39 40 39 #include "pickup/PickupIdentifier.h" 41 40 42 41 namespace orxonox 43 42 { 44 43 45 44 CreateFactory(FlagPickup); 46 45 47 46 /** 48 @brief49 50 */47 @brief 48 Constructor. Registers the object and initializes the member variables. 49 */ 51 50 FlagPickup::FlagPickup(BaseObject* creator) : Pickup(creator) 52 51 { 53 52 RegisterObject(FlagPickup); 54 53 55 54 this->initialize(); 56 55 } 57 56 58 57 /** 59 @brief60 61 */58 @brief 59 Destructor. 60 */ 62 61 FlagPickup::~FlagPickup() 63 62 { 64 63 65 64 } 66 65 67 66 /** 68 @brief69 70 */67 @brief 68 Initializes the member variables. 69 */ 71 70 void FlagPickup::initialize(void) 72 71 { 73 72 this->flagType_ = 0; 74 73 75 74 this->addTarget(ClassIdentifier<Pawn>::getIdentifier()); 76 75 } 77 76 78 77 /** 79 @brief80 81 */78 @brief 79 Initializes the PickupIdentifier of this pickup. 80 */ 82 81 void FlagPickup::initializeIdentifier(void) 83 82 { … … 90 89 this->pickupIdentifier_->addParameter(type1, val); 91 90 } 92 91 93 92 /** 94 @brief95 96 */93 @brief 94 Method for creating a FlagPickup object through XML. 95 */ 97 96 void FlagPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode) 98 97 { 99 98 SUPER(FlagPickup, XMLPort, xmlelement, mode); 100 99 101 100 XMLPortParam(FlagPickup, "flagType", setFlagType, getFlagType, xmlelement, mode); 102 101 //XMLPortParam(FlagPickup, "teamNumber", setTeamNumber, getTeamNumber, xmlelement, mode); 103 102 104 103 this->initializeIdentifier(); 105 104 } 106 107 105 106 108 107 /** 109 @brief110 111 @return112 113 */108 @brief 109 Get the flag type of this pickup. 110 @return 111 Returns the falg type as a string. 112 */ 114 113 const int FlagPickup::getFlagType(void) const 115 114 { 116 115 return this->flagType_; 117 116 } 118 117 119 118 /** 120 @brief121 Set the type of the HealthPickup.122 @param type123 124 */119 @brief 120 Set the type of the FlagPickup. 121 @param type 122 The type as a string. 123 */ 125 124 void FlagPickup::setFlagType(int type) 126 125 { … … 133 132 } 134 133 } 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; 135 154 155 } 156 } 157 136 158 /** 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 176 177 void FlagPickup::tick(float dt) 177 178 179 180 181 182 183 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 } 187 188 } -
code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h
r9240 r9241 28 28 29 29 /** 30 31 32 33 */30 @file FlagPickup.h 31 @brief Declaration of the FlagPickup class. 32 @ingroup PickupItems 33 */ 34 34 35 35 #ifndef _FlagPickup_H__ … … 47 47 48 48 namespace orxonox { 49 /*50 @ingroup PickupItems51 52 53 @author54 55 56 @ingroup PickupItems57 */49 /* 50 @ingroup PickupItems 51 52 53 @author 54 Nino Weingart 55 56 @ingroup PickupItems 57 */ 58 58 class _PickupExport FlagPickup : public Pickup, public Tickable 59 59 { 60 61 62 63 virtual~FlagPickup(); //!< Destructor.64 65 66 67 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 69 69 const int getFlagType(void) const; //!< Get the flag type of this pickup. 70 70 71 71 inline bool isPickedUp() const 72 72 { return this->bPickedUp_; } 73 73 inline Pawn* pickedUpBy() const 74 75 74 { return this->pickedUpBy_; } 75 76 76 inline void setPickedUp(bool pickedUp) 77 77 { this->bPickedUp_ = pickedUp; } … … 79 79 inline void ignorePickedUp() 80 80 { this->Pickupable::destroy(); } 81 81 82 82 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 103 104 }; 104 105 } -
code/branches/presentation2012/src/modules/pong
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/pong merged eligible /code/branches/environment3/src/modules/pong merged eligible /code/branches/formation/src/modules/pong merged eligible /code/branches/gamecontent/src/modules/pong merged eligible /code/branches/hud/src/modules/pong merged eligible /code/branches/masterserverfix/src/modules/pong merged eligible /code/branches/menue/src/modules/pong merged eligible /code/branches/newlevel2012/src/modules/pong merged eligible /code/branches/output/src/modules/pong merged eligible /code/branches/pickup2012/src/modules/pong merged eligible /code/branches/presentation/src/modules/pong merged eligible /code/branches/presentation2011/src/modules/pong merged eligible /code/branches/shipSelection/src/modules/pong merged eligible /code/branches/sound2012/src/modules/pong merged eligible /code/branches/spacegate/src/modules/pong merged eligible /code/branches/spaceraceTwo/src/modules/pong merged eligible /code/branches/surfaceRace/src/modules/pong merged eligible /code/branches/usability/src/modules/pong merged eligible /code/trunk/src/modules/pong merged eligible /code/branches/ai/src/modules/pong 6592-7033 /code/branches/ai2/src/modules/pong 8721-8880 /code/branches/bigships/src/modules/pong 8137-8588 /code/branches/buildsystem/src/modules/pong 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/pong 2506-2658 /code/branches/buildsystem3/src/modules/pong 2662-2708 /code/branches/ceguilua/src/modules/pong 1802-1808 /code/branches/chat/src/modules/pong 6527-6797 /code/branches/chat2/src/modules/pong 6836-6910 /code/branches/console/src/modules/pong 5941-6104 /code/branches/consolecommands2/src/modules/pong 6451-7178 /code/branches/consolecommands3/src/modules/pong 7178-7283 /code/branches/core3/src/modules/pong 1572-1739 /code/branches/core4/src/modules/pong 3221-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/pong 5768-5928,6009 /code/branches/data_cleanup/src/modules/pong 7537-7686 /code/branches/doc/src/modules/pong 7290-7400 /code/branches/dockingsystem/src/modules/pong 8101-8192 /code/branches/dynamicmatch/src/modules/pong 6584-7030 /code/branches/fps/src/modules/pong 6591-7072 /code/branches/gameimmersion/src/modules/pong 8102-8577 /code/branches/gamestate/src/modules/pong 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/pong 6594-6745 /code/branches/gametypes/src/modules/pong 2826-3031 /code/branches/gcc43/src/modules/pong 1580 /code/branches/gui/src/modules/pong 1635-1723,2795-2894 /code/branches/hudelements/src/modules/pong 6584-6941 /code/branches/hudimprovements/src/modules/pong 7920-8672 /code/branches/ingamemenu/src/modules/pong 6000-6023 /code/branches/input/src/modules/pong 1629-1636 /code/branches/ipv6/src/modules/pong 7293-7458 /code/branches/kicklib/src/modules/pong 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/pong 8282-8350 /code/branches/lastmanstanding/src/modules/pong 7479-7644 /code/branches/lastmanstanding3/src/modules/pong 7903-8175 /code/branches/libraries/src/modules/pong 5612-5692 /code/branches/libraries2/src/modules/pong 5703-5737 /code/branches/lod/src/modules/pong 6586-6911 /code/branches/lodfinal/src/modules/pong 2372-2411 /code/branches/mac_osx/src/modules/pong 7789-8128,8135 /code/branches/map/src/modules/pong 2801-3086,3089 /code/branches/masterserver/src/modules/pong 7502-7738 /code/branches/menu/src/modules/pong 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/pong 2754-2824 /code/branches/netp2/src/modules/pong 2835-2988 /code/branches/netp3/src/modules/pong 2988-3082 /code/branches/netp6/src/modules/pong 3214-3302 /code/branches/network/src/modules/pong 2356 /code/branches/network2/src/modules/pong 6434-6465 /code/branches/network3/src/modules/pong 7196-7344 /code/branches/network4/src/modules/pong 7497-7755 /code/branches/network5/src/modules/pong 7757-7781 /code/branches/network6/src/modules/pong 7823-8315 /code/branches/network64/src/modules/pong 2210-2355 /code/branches/notifications/src/modules/pong 7314-7401 /code/branches/objecthierarchy/src/modules/pong 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/pong 2171-2479 /code/branches/ois_update/src/modules/pong 7506-7788 /code/branches/overlay/src/modules/pong 2117-2385 /code/branches/particles/src/modules/pong 2829-3085 /code/branches/particles2/src/modules/pong 6050-6106,6109 /code/branches/pch/src/modules/pong 3113-3194 /code/branches/physics/src/modules/pong 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/pong 2436-2457 /code/branches/pickup/src/modules/pong 8145-8555 /code/branches/pickup2/src/modules/pong 5942-6405 /code/branches/pickup3/src/modules/pong 6418-6523 /code/branches/pickup4/src/modules/pong 6594-6710 /code/branches/pickups/src/modules/pong 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/pong 2107-2497,2915-3071 /code/branches/png2/src/modules/pong 7262-7263 /code/branches/portals/src/modules/pong 8087-8455 /code/branches/portals2/src/modules/pong 8460-8602 /code/branches/ppspickups1/src/modules/pong 6552-6708 /code/branches/ppspickups2/src/modules/pong 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/pong 6757-6997 /code/branches/ppspickups4/src/modules/pong 7003-7089 /code/branches/presentation2/src/modules/pong 6106-6416,7787-7800 /code/branches/presentation3/src/modules/pong 6913-7162 /code/branches/questsystem/src/modules/pong 1894-2088 /code/branches/questsystem2/src/modules/pong 2107-2259 /code/branches/questsystem5/src/modules/pong 2776-2905 /code/branches/releasetodo/src/modules/pong 7614-7647 /code/branches/resource/src/modules/pong 3327-3366 /code/branches/resource2/src/modules/pong 3372-5694 /code/branches/rocket/src/modules/pong 6523-6950 /code/branches/rocket2/src/modules/pong 6953-6970 /code/branches/script_trigger/src/modules/pong 1295-1953,1955 /code/branches/skybox2/src/modules/pong 6559-6989 /code/branches/sound/src/modules/pong 2829-3010 /code/branches/sound3/src/modules/pong 5941-6102 /code/branches/spaceboundaries/src/modules/pong 8085-8457 /code/branches/spaceboundaries2/src/modules/pong 8460-8613 /code/branches/spacerace/src/modules/pong 8182-8630 /code/branches/steering/src/modules/pong 5949-6091,8140-8595 /code/branches/tetris/src/modules/pong 8100-8563 /code/branches/tutoriallevel/src/modules/pong 7827-8370 /code/branches/tutoriallevel2/src/modules/pong 8370-8452 /code/branches/tutoriallevel3/src/modules/pong 8453-8636 /code/branches/unity_build/src/modules/pong 8440-8716 /code/branches/weapon/src/modules/pong 1925-2094 /code/branches/weapon2/src/modules/pong 2107-2488 /code/branches/weapons/src/modules/pong 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/pong 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/portals
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/environment3/src/modules/portals merged eligible /code/branches/formation/src/modules/portals merged eligible /code/branches/gamecontent/src/modules/portals merged eligible /code/branches/hud/src/modules/portals merged eligible /code/branches/masterserverfix/src/modules/portals merged eligible /code/branches/menue/src/modules/portals merged eligible /code/branches/newlevel2012/src/modules/portals merged eligible /code/branches/output/src/modules/portals merged eligible /code/branches/pickup2012/src/modules/portals merged eligible /code/branches/presentation/src/modules/portals merged eligible /code/branches/presentation2011/src/modules/portals merged eligible /code/branches/shipSelection/src/modules/portals merged eligible /code/branches/sound2012/src/modules/portals merged eligible /code/branches/spacegate/src/modules/portals merged eligible /code/branches/spaceraceTwo/src/modules/portals merged eligible /code/branches/surfaceRace/src/modules/portals merged eligible /code/trunk/src/modules/portals merged eligible /code/branches/ai/src/modules/portals 6592-7033 /code/branches/ai2/src/modules/portals 8721-8880 /code/branches/bigships/src/modules/portals 8137-8588 /code/branches/buildsystem/src/modules/portals 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/portals 2506-2658 /code/branches/buildsystem3/src/modules/portals 2662-2708 /code/branches/ceguilua/src/modules/portals 1802-1808 /code/branches/chat/src/modules/portals 6527-6797 /code/branches/chat2/src/modules/portals 6836-6910 /code/branches/console/src/modules/portals 5941-6104 /code/branches/consolecommands2/src/modules/portals 6451-7178 /code/branches/consolecommands3/src/modules/portals 7178-7283 /code/branches/core3/src/modules/portals 1572-1739 /code/branches/core4/src/modules/portals 3221-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/portals 5768-5928,6009 /code/branches/data_cleanup/src/modules/portals 7537-7686 /code/branches/doc/src/modules/portals 7290-7400 /code/branches/dockingsystem/src/modules/portals 8101-8192 /code/branches/dockingsystem2/src/modules/portals 8196-8560 /code/branches/dynamicmatch/src/modules/portals 6584-7030 /code/branches/fps/src/modules/portals 6591-7072 /code/branches/gameimmersion/src/modules/portals 8102-8577 /code/branches/gamestate/src/modules/portals 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/portals 6594-6745 /code/branches/gametypes/src/modules/portals 2826-3031 /code/branches/gcc43/src/modules/portals 1580 /code/branches/gui/src/modules/portals 1635-1723,2795-2894 /code/branches/hudelements/src/modules/portals 6584-6941 /code/branches/hudimprovements/src/modules/portals 7920-8672 /code/branches/ingamemenu/src/modules/portals 6000-6023 /code/branches/input/src/modules/portals 1629-1636 /code/branches/ipv6/src/modules/portals 7293-7458 /code/branches/kicklib/src/modules/portals 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/portals 8282-8350 /code/branches/lastmanstanding/src/modules/portals 7479-7644 /code/branches/lastmanstanding3/src/modules/portals 7903-8175 /code/branches/libraries/src/modules/portals 5612-5692 /code/branches/libraries2/src/modules/portals 5703-5737 /code/branches/lod/src/modules/portals 6586-6911 /code/branches/lodfinal/src/modules/portals 2372-2411 /code/branches/mac_osx/src/modules/portals 7789-8128,8135 /code/branches/map/src/modules/portals 2801-3086,3089 /code/branches/masterserver/src/modules/portals 7502-7738 /code/branches/menu/src/modules/portals 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/portals 2754-2824 /code/branches/netp2/src/modules/portals 2835-2988 /code/branches/netp3/src/modules/portals 2988-3082 /code/branches/netp6/src/modules/portals 3214-3302 /code/branches/network/src/modules/portals 2356 /code/branches/network2/src/modules/portals 6434-6465 /code/branches/network3/src/modules/portals 7196-7344 /code/branches/network4/src/modules/portals 7497-7755 /code/branches/network5/src/modules/portals 7757-7781 /code/branches/network6/src/modules/portals 7823-8315 /code/branches/network64/src/modules/portals 2210-2355 /code/branches/notifications/src/modules/portals 7314-7401 /code/branches/objecthierarchy/src/modules/portals 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/portals 2171-2479 /code/branches/ois_update/src/modules/portals 7506-7788 /code/branches/overlay/src/modules/portals 2117-2385 /code/branches/particles/src/modules/portals 2829-3085 /code/branches/particles2/src/modules/portals 6050-6106,6109 /code/branches/pch/src/modules/portals 3113-3194 /code/branches/physics/src/modules/portals 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/portals 2436-2457 /code/branches/pickup/src/modules/portals 8145-8555 /code/branches/pickup2/src/modules/portals 5942-6405 /code/branches/pickup3/src/modules/portals 6418-6523 /code/branches/pickup4/src/modules/portals 6594-6710 /code/branches/pickups/src/modules/portals 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/portals 2107-2497,2915-3071 /code/branches/png2/src/modules/portals 7262-7263 /code/branches/portals/src/modules/portals 8087-8455 /code/branches/portals2/src/modules/portals 8460-8602 /code/branches/ppspickups1/src/modules/portals 6552-6708 /code/branches/ppspickups2/src/modules/portals 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/portals 6757-6997 /code/branches/ppspickups4/src/modules/portals 7003-7089 /code/branches/presentation2/src/modules/portals 6106-6416,7787-7800 /code/branches/presentation3/src/modules/portals 6913-7162 /code/branches/questsystem/src/modules/portals 1894-2088 /code/branches/questsystem2/src/modules/portals 2107-2259 /code/branches/questsystem5/src/modules/portals 2776-2905 /code/branches/releasetodo/src/modules/portals 7614-7647 /code/branches/resource/src/modules/portals 3327-3366 /code/branches/resource2/src/modules/portals 3372-5694 /code/branches/rocket/src/modules/portals 6523-6950 /code/branches/rocket2/src/modules/portals 6953-6970 /code/branches/script_trigger/src/modules/portals 1295-1953,1955 /code/branches/skybox2/src/modules/portals 6559-6989 /code/branches/sound/src/modules/portals 2829-3010 /code/branches/sound3/src/modules/portals 5941-6102 /code/branches/spaceboundaries/src/modules/portals 8085-8457 /code/branches/spaceboundaries2/src/modules/portals 8460-8613 /code/branches/spacerace/src/modules/portals 8182-8630 /code/branches/steering/src/modules/portals 5949-6091,8140-8595 /code/branches/tetris/src/modules/portals 8100-8563 /code/branches/tutoriallevel/src/modules/portals 7827-8370 /code/branches/tutoriallevel2/src/modules/portals 8370-8452 /code/branches/tutoriallevel3/src/modules/portals 8453-8636 /code/branches/unity_build/src/modules/portals 8440-8716 /code/branches/usability/src/modules/portals 7915-8078 /code/branches/weapon/src/modules/portals 1925-2094 /code/branches/weapon2/src/modules/portals 2107-2488 /code/branches/weapons/src/modules/portals 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/portals 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/questsystem
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/questsystem merged eligible /code/branches/environment3/src/modules/questsystem merged eligible /code/branches/formation/src/modules/questsystem merged eligible /code/branches/gamecontent/src/modules/questsystem merged eligible /code/branches/hud/src/modules/questsystem merged eligible /code/branches/masterserverfix/src/modules/questsystem merged eligible /code/branches/menue/src/modules/questsystem merged eligible /code/branches/newlevel2012/src/modules/questsystem merged eligible /code/branches/output/src/modules/questsystem merged eligible /code/branches/pickup2012/src/modules/questsystem merged eligible /code/branches/presentation/src/modules/questsystem merged eligible /code/branches/presentation2011/src/modules/questsystem merged eligible /code/branches/shipSelection/src/modules/questsystem merged eligible /code/branches/sound2012/src/modules/questsystem merged eligible /code/branches/spacegate/src/modules/questsystem merged eligible /code/branches/spaceraceTwo/src/modules/questsystem merged eligible /code/branches/surfaceRace/src/modules/questsystem merged eligible /code/branches/usability/src/modules/questsystem merged eligible /code/trunk/src/modules/questsystem merged eligible /code/branches/ai/src/modules/questsystem 6592-7033 /code/branches/ai2/src/modules/questsystem 8721-8880 /code/branches/bigships/src/modules/questsystem 8137-8588 /code/branches/buildsystem/src/modules/questsystem 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/questsystem 2506-2658 /code/branches/buildsystem3/src/modules/questsystem 2662-2708 /code/branches/ceguilua/src/modules/questsystem 1802-1808 /code/branches/chat/src/modules/questsystem 6527-6797 /code/branches/chat2/src/modules/questsystem 6836-6910 /code/branches/console/src/modules/questsystem 5941-6104 /code/branches/consolecommands2/src/modules/questsystem 6451-7178 /code/branches/consolecommands3/src/modules/questsystem 7178-7283 /code/branches/core3/src/modules/questsystem 1572-1739 /code/branches/core4/src/modules/questsystem 3221-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/questsystem 5768-5928,6009 /code/branches/data_cleanup/src/modules/questsystem 7537-7686 /code/branches/doc/src/modules/questsystem 7290-7400 /code/branches/dockingsystem/src/modules/questsystem 8101-8192 /code/branches/dynamicmatch/src/modules/questsystem 6584-7030 /code/branches/fps/src/modules/questsystem 6591-7072 /code/branches/gameimmersion/src/modules/questsystem 8102-8577 /code/branches/gamestate/src/modules/questsystem 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/questsystem 6594-6745 /code/branches/gametypes/src/modules/questsystem 2826-3031 /code/branches/gcc43/src/modules/questsystem 1580 /code/branches/gui/src/modules/questsystem 1635-1723,2795-2894 /code/branches/hudelements/src/modules/questsystem 6584-6941 /code/branches/hudimprovements/src/modules/questsystem 7920-8672 /code/branches/ingamemenu/src/modules/questsystem 6000-6023 /code/branches/input/src/modules/questsystem 1629-1636 /code/branches/ipv6/src/modules/questsystem 7293-7458 /code/branches/kicklib/src/modules/questsystem 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/questsystem 8282-8350 /code/branches/lastmanstanding/src/modules/questsystem 7479-7644 /code/branches/lastmanstanding3/src/modules/questsystem 7903-8175 /code/branches/libraries/src/modules/questsystem 5612-5692 /code/branches/libraries2/src/modules/questsystem 5703-5737 /code/branches/lod/src/modules/questsystem 6586-6911 /code/branches/lodfinal/src/modules/questsystem 2372-2411 /code/branches/mac_osx/src/modules/questsystem 7789-8128,8135 /code/branches/map/src/modules/questsystem 2801-3086,3089 /code/branches/masterserver/src/modules/questsystem 7502-7738 /code/branches/menu/src/modules/questsystem 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/questsystem 2754-2824 /code/branches/netp2/src/modules/questsystem 2835-2988 /code/branches/netp3/src/modules/questsystem 2988-3082 /code/branches/netp6/src/modules/questsystem 3214-3302 /code/branches/network/src/modules/questsystem 2356 /code/branches/network2/src/modules/questsystem 6434-6465 /code/branches/network3/src/modules/questsystem 7196-7344 /code/branches/network4/src/modules/questsystem 7497-7755 /code/branches/network5/src/modules/questsystem 7757-7781 /code/branches/network6/src/modules/questsystem 7823-8315 /code/branches/network64/src/modules/questsystem 2210-2355 /code/branches/notifications/src/modules/questsystem 7314-7401 /code/branches/objecthierarchy/src/modules/questsystem 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/questsystem 2171-2479 /code/branches/ois_update/src/modules/questsystem 7506-7788 /code/branches/overlay/src/modules/questsystem 2117-2385 /code/branches/particles/src/modules/questsystem 2829-3085 /code/branches/particles2/src/modules/questsystem 6050-6106,6109 /code/branches/pch/src/modules/questsystem 3113-3194 /code/branches/physics/src/modules/questsystem 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/questsystem 2436-2457 /code/branches/pickup/src/modules/questsystem 8145-8555 /code/branches/pickup2/src/modules/questsystem 5942-6405 /code/branches/pickup3/src/modules/questsystem 6418-6523 /code/branches/pickup4/src/modules/questsystem 6594-6710 /code/branches/pickups/src/modules/questsystem 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/questsystem 2107-2497,2915-3071 /code/branches/png2/src/modules/questsystem 7262-7263 /code/branches/portals/src/modules/questsystem 8087-8455 /code/branches/portals2/src/modules/questsystem 8460-8602 /code/branches/ppspickups1/src/modules/questsystem 6552-6708 /code/branches/ppspickups2/src/modules/questsystem 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/questsystem 6757-6997 /code/branches/ppspickups4/src/modules/questsystem 7003-7089 /code/branches/presentation2/src/modules/questsystem 6106-6416,7787-7800 /code/branches/presentation3/src/modules/questsystem 6913-7162 /code/branches/questsystem/src/modules/questsystem 1894-2088 /code/branches/questsystem2/src/modules/questsystem 2107-2259 /code/branches/questsystem5/src/modules/questsystem 2776-2905 /code/branches/releasetodo/src/modules/questsystem 7614-7647 /code/branches/resource/src/modules/questsystem 3327-3366 /code/branches/resource2/src/modules/questsystem 3372-5694 /code/branches/rocket/src/modules/questsystem 6523-6950 /code/branches/rocket2/src/modules/questsystem 6953-6970 /code/branches/script_trigger/src/modules/questsystem 1295-1953,1955 /code/branches/skybox2/src/modules/questsystem 6559-6989 /code/branches/sound/src/modules/questsystem 2829-3010 /code/branches/sound3/src/modules/questsystem 5941-6102 /code/branches/spaceboundaries/src/modules/questsystem 8085-8457 /code/branches/spaceboundaries2/src/modules/questsystem 8460-8613 /code/branches/spacerace/src/modules/questsystem 8182-8630 /code/branches/steering/src/modules/questsystem 5949-6091,8140-8595 /code/branches/tetris/src/modules/questsystem 8100-8563 /code/branches/tutoriallevel/src/modules/questsystem 7827-8370 /code/branches/tutoriallevel2/src/modules/questsystem 8370-8452 /code/branches/tutoriallevel3/src/modules/questsystem 8453-8636 /code/branches/unity_build/src/modules/questsystem 8440-8716 /code/branches/weapon/src/modules/questsystem 1925-2094 /code/branches/weapon2/src/modules/questsystem 2107-2488 /code/branches/weapons/src/modules/questsystem 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/questsystem 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/tetris
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/environment3/src/modules/tetris merged eligible /code/branches/formation/src/modules/tetris merged eligible /code/branches/gamecontent/src/modules/tetris merged eligible /code/branches/hud/src/modules/tetris merged eligible /code/branches/masterserverfix/src/modules/tetris merged eligible /code/branches/menue/src/modules/tetris merged eligible /code/branches/newlevel2012/src/modules/tetris merged eligible /code/branches/output/src/modules/tetris merged eligible /code/branches/pickup2012/src/modules/tetris merged eligible /code/branches/presentation/src/modules/tetris merged eligible /code/branches/presentation2011/src/modules/tetris merged eligible /code/branches/shipSelection/src/modules/tetris merged eligible /code/branches/sound2012/src/modules/tetris merged eligible /code/branches/spacegate/src/modules/tetris merged eligible /code/branches/spaceraceTwo/src/modules/tetris merged eligible /code/branches/surfaceRace/src/modules/tetris merged eligible /code/trunk/src/modules/tetris merged eligible /code/branches/ai/src/modules/tetris 6592-7033 /code/branches/ai2/src/modules/tetris 8721-8880 /code/branches/bigships/src/modules/tetris 8137-8588 /code/branches/buildsystem/src/modules/tetris 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/tetris 2506-2658 /code/branches/buildsystem3/src/modules/tetris 2662-2708 /code/branches/ceguilua/src/modules/tetris 1802-1808 /code/branches/chat/src/modules/tetris 6527-6797 /code/branches/chat2/src/modules/tetris 6836-6910 /code/branches/console/src/modules/tetris 5941-6104 /code/branches/consolecommands2/src/modules/tetris 6451-7178 /code/branches/consolecommands3/src/modules/tetris 7178-7283 /code/branches/core3/src/modules/tetris 1572-1739 /code/branches/core4/src/modules/tetris 3221-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/tetris 5768-5928,6009 /code/branches/data_cleanup/src/modules/tetris 7537-7686 /code/branches/doc/src/modules/tetris 7290-7400 /code/branches/dockingsystem/src/modules/tetris 8101-8192 /code/branches/dockingsystem2/src/modules/tetris 8196-8560 /code/branches/dynamicmatch/src/modules/tetris 6584-7030 /code/branches/fps/src/modules/tetris 6591-7072 /code/branches/gameimmersion/src/modules/tetris 8102-8577 /code/branches/gamestate/src/modules/tetris 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/tetris 6594-6745 /code/branches/gametypes/src/modules/tetris 2826-3031 /code/branches/gcc43/src/modules/tetris 1580 /code/branches/gui/src/modules/tetris 1635-1723,2795-2894 /code/branches/hudelements/src/modules/tetris 6584-6941 /code/branches/hudimprovements/src/modules/tetris 7920-8672 /code/branches/ingamemenu/src/modules/tetris 6000-6023 /code/branches/input/src/modules/tetris 1629-1636 /code/branches/ipv6/src/modules/tetris 7293-7458 /code/branches/kicklib/src/modules/tetris 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/tetris 8282-8350 /code/branches/lastmanstanding/src/modules/tetris 7479-7644 /code/branches/lastmanstanding3/src/modules/tetris 7903-8175 /code/branches/libraries/src/modules/tetris 5612-5692 /code/branches/libraries2/src/modules/tetris 5703-5737 /code/branches/lod/src/modules/tetris 6586-6911 /code/branches/lodfinal/src/modules/tetris 2372-2411 /code/branches/mac_osx/src/modules/tetris 7789-8128,8135 /code/branches/map/src/modules/tetris 2801-3086,3089 /code/branches/masterserver/src/modules/tetris 7502-7738 /code/branches/menu/src/modules/tetris 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/tetris 2754-2824 /code/branches/netp2/src/modules/tetris 2835-2988 /code/branches/netp3/src/modules/tetris 2988-3082 /code/branches/netp6/src/modules/tetris 3214-3302 /code/branches/network/src/modules/tetris 2356 /code/branches/network2/src/modules/tetris 6434-6465 /code/branches/network3/src/modules/tetris 7196-7344 /code/branches/network4/src/modules/tetris 7497-7755 /code/branches/network5/src/modules/tetris 7757-7781 /code/branches/network6/src/modules/tetris 7823-8315 /code/branches/network64/src/modules/tetris 2210-2355 /code/branches/notifications/src/modules/tetris 7314-7401 /code/branches/objecthierarchy/src/modules/tetris 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/tetris 2171-2479 /code/branches/ois_update/src/modules/tetris 7506-7788 /code/branches/overlay/src/modules/tetris 2117-2385 /code/branches/particles/src/modules/tetris 2829-3085 /code/branches/particles2/src/modules/tetris 6050-6106,6109 /code/branches/pch/src/modules/tetris 3113-3194 /code/branches/physics/src/modules/tetris 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/tetris 2436-2457 /code/branches/pickup/src/modules/tetris 8145-8555 /code/branches/pickup2/src/modules/tetris 5942-6405 /code/branches/pickup3/src/modules/tetris 6418-6523 /code/branches/pickup4/src/modules/tetris 6594-6710 /code/branches/pickups/src/modules/tetris 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/tetris 2107-2497,2915-3071 /code/branches/png2/src/modules/tetris 7262-7263 /code/branches/portals/src/modules/tetris 8087-8455 /code/branches/portals2/src/modules/tetris 8460-8602 /code/branches/ppspickups1/src/modules/tetris 6552-6708 /code/branches/ppspickups2/src/modules/tetris 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/tetris 6757-6997 /code/branches/ppspickups4/src/modules/tetris 7003-7089 /code/branches/presentation2/src/modules/tetris 6106-6416,7787-7800 /code/branches/presentation3/src/modules/tetris 6913-7162 /code/branches/questsystem/src/modules/tetris 1894-2088 /code/branches/questsystem2/src/modules/tetris 2107-2259 /code/branches/questsystem5/src/modules/tetris 2776-2905 /code/branches/releasetodo/src/modules/tetris 7614-7647 /code/branches/resource/src/modules/tetris 3327-3366 /code/branches/resource2/src/modules/tetris 3372-5694 /code/branches/rocket/src/modules/tetris 6523-6950 /code/branches/rocket2/src/modules/tetris 6953-6970 /code/branches/script_trigger/src/modules/tetris 1295-1953,1955 /code/branches/skybox2/src/modules/tetris 6559-6989 /code/branches/sound/src/modules/tetris 2829-3010 /code/branches/sound3/src/modules/tetris 5941-6102 /code/branches/spaceboundaries/src/modules/tetris 8085-8457 /code/branches/spaceboundaries2/src/modules/tetris 8460-8613 /code/branches/spacerace/src/modules/tetris 8182-8630 /code/branches/steering/src/modules/tetris 5949-6091,8140-8595 /code/branches/tetris/src/modules/tetris 8100-8563 /code/branches/tutoriallevel/src/modules/tetris 7827-8370 /code/branches/tutoriallevel2/src/modules/tetris 8370-8452 /code/branches/tutoriallevel3/src/modules/tetris 8453-8636 /code/branches/unity_build/src/modules/tetris 8440-8716 /code/branches/usability/src/modules/tetris 7915-8078 /code/branches/weapon/src/modules/tetris 1925-2094 /code/branches/weapon2/src/modules/tetris 2107-2488 /code/branches/weapons/src/modules/tetris 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/tetris 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/src/modules/weapons
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/src/modules/weapons merged eligible /code/branches/environment3/src/modules/weapons merged eligible /code/branches/formation/src/modules/weapons merged eligible /code/branches/gamecontent/src/modules/weapons merged eligible /code/branches/hud/src/modules/weapons merged eligible /code/branches/masterserverfix/src/modules/weapons merged eligible /code/branches/menue/src/modules/weapons merged eligible /code/branches/newlevel2012/src/modules/weapons merged eligible /code/branches/output/src/modules/weapons merged eligible /code/branches/pickup2012/src/modules/weapons merged eligible /code/branches/presentation/src/modules/weapons merged eligible /code/branches/presentation2011/src/modules/weapons merged eligible /code/branches/shipSelection/src/modules/weapons merged eligible /code/branches/sound2012/src/modules/weapons merged eligible /code/branches/spacegate/src/modules/weapons merged eligible /code/branches/spaceraceTwo/src/modules/weapons merged eligible /code/branches/surfaceRace/src/modules/weapons merged eligible /code/branches/usability/src/modules/weapons merged eligible /code/trunk/src/modules/weapons merged eligible /code/branches/ai/src/modules/weapons 6592-7033 /code/branches/ai2/src/modules/weapons 8721-8880 /code/branches/bigships/src/modules/weapons 8137-8588 /code/branches/buildsystem/src/modules/weapons 1874-2276,2278-2400 /code/branches/buildsystem2/src/modules/weapons 2506-2658 /code/branches/buildsystem3/src/modules/weapons 2662-2708 /code/branches/ceguilua/src/modules/weapons 1802-1808 /code/branches/chat/src/modules/weapons 6527-6797 /code/branches/chat2/src/modules/weapons 6836-6910 /code/branches/console/src/modules/weapons 5941-6104 /code/branches/consolecommands2/src/modules/weapons 6451-7178 /code/branches/consolecommands3/src/modules/weapons 7178-7283 /code/branches/core3/src/modules/weapons 1572-1739 /code/branches/core4/src/modules/weapons 3221-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/weapons 5768-5928,6009 /code/branches/data_cleanup/src/modules/weapons 7537-7686 /code/branches/doc/src/modules/weapons 7290-7400 /code/branches/dockingsystem/src/modules/weapons 8101-8192 /code/branches/dynamicmatch/src/modules/weapons 6584-7030 /code/branches/fps/src/modules/weapons 6591-7072 /code/branches/gameimmersion/src/modules/weapons 8102-8577 /code/branches/gamestate/src/modules/weapons 6430-6572,6621-6661 /code/branches/gamestates2/src/modules/weapons 6594-6745 /code/branches/gametypes/src/modules/weapons 2826-3031 /code/branches/gcc43/src/modules/weapons 1580 /code/branches/gui/src/modules/weapons 1635-1723,2795-2894 /code/branches/hudelements/src/modules/weapons 6584-6941 /code/branches/hudimprovements/src/modules/weapons 7920-8672 /code/branches/ingamemenu/src/modules/weapons 6000-6023 /code/branches/input/src/modules/weapons 1629-1636 /code/branches/ipv6/src/modules/weapons 7293-7458 /code/branches/kicklib/src/modules/weapons 7940-8096,8098-8277 /code/branches/kicklib2/src/modules/weapons 8282-8350 /code/branches/lastmanstanding/src/modules/weapons 7479-7644 /code/branches/lastmanstanding3/src/modules/weapons 7903-8175 /code/branches/libraries/src/modules/weapons 5612-5692 /code/branches/libraries2/src/modules/weapons 5703-5737 /code/branches/lod/src/modules/weapons 6586-6911 /code/branches/lodfinal/src/modules/weapons 2372-2411 /code/branches/mac_osx/src/modules/weapons 7789-8128,8135 /code/branches/map/src/modules/weapons 2801-3086,3089 /code/branches/masterserver/src/modules/weapons 7502-7738 /code/branches/menu/src/modules/weapons 5941-6146,6148,7536-7687 /code/branches/miniprojects/src/modules/weapons 2754-2824 /code/branches/netp2/src/modules/weapons 2835-2988 /code/branches/netp3/src/modules/weapons 2988-3082 /code/branches/netp6/src/modules/weapons 3214-3302 /code/branches/network/src/modules/weapons 2356 /code/branches/network2/src/modules/weapons 6434-6465 /code/branches/network3/src/modules/weapons 7196-7344 /code/branches/network4/src/modules/weapons 7497-7755 /code/branches/network5/src/modules/weapons 7757-7781 /code/branches/network6/src/modules/weapons 7823-8315 /code/branches/network64/src/modules/weapons 2210-2355 /code/branches/notifications/src/modules/weapons 7314-7401 /code/branches/objecthierarchy/src/modules/weapons 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/modules/weapons 2171-2479 /code/branches/ois_update/src/modules/weapons 7506-7788 /code/branches/overlay/src/modules/weapons 2117-2385 /code/branches/particles/src/modules/weapons 2829-3085 /code/branches/particles2/src/modules/weapons 6050-6106,6109 /code/branches/pch/src/modules/weapons 3113-3194 /code/branches/physics/src/modules/weapons 1912-2055,2107-2439 /code/branches/physics_merge/src/modules/weapons 2436-2457 /code/branches/pickup/src/modules/weapons 8145-8555 /code/branches/pickup2/src/modules/weapons 5942-6405 /code/branches/pickup3/src/modules/weapons 6418-6523 /code/branches/pickup4/src/modules/weapons 6594-6710 /code/branches/pickups/src/modules/weapons 1926-2086,2127,2827-2915 /code/branches/pickups2/src/modules/weapons 2107-2497,2915-3071 /code/branches/png2/src/modules/weapons 7262-7263 /code/branches/portals/src/modules/weapons 8087-8455 /code/branches/portals2/src/modules/weapons 8460-8602 /code/branches/ppspickups1/src/modules/weapons 6552-6708 /code/branches/ppspickups2/src/modules/weapons 6527-6532,6554-6709 /code/branches/ppspickups3/src/modules/weapons 6757-6997 /code/branches/ppspickups4/src/modules/weapons 7003-7089 /code/branches/presentation2/src/modules/weapons 6106-6416,7787-7800 /code/branches/presentation3/src/modules/weapons 6913-7162 /code/branches/questsystem/src/modules/weapons 1894-2088 /code/branches/questsystem2/src/modules/weapons 2107-2259 /code/branches/questsystem5/src/modules/weapons 2776-2905 /code/branches/releasetodo/src/modules/weapons 7614-7647 /code/branches/resource/src/modules/weapons 3327-3366 /code/branches/resource2/src/modules/weapons 3372-5694 /code/branches/rocket/src/modules/weapons 6523-6950 /code/branches/rocket2/src/modules/weapons 6953-6970 /code/branches/script_trigger/src/modules/weapons 1295-1953,1955 /code/branches/skybox2/src/modules/weapons 6559-6989 /code/branches/sound/src/modules/weapons 2829-3010 /code/branches/sound3/src/modules/weapons 5941-6102 /code/branches/spaceboundaries/src/modules/weapons 8085-8457 /code/branches/spaceboundaries2/src/modules/weapons 8460-8613 /code/branches/spacerace/src/modules/weapons 8182-8630 /code/branches/steering/src/modules/weapons 5949-6091,8140-8595 /code/branches/tetris/src/modules/weapons 8100-8563 /code/branches/tutoriallevel/src/modules/weapons 7827-8370 /code/branches/tutoriallevel2/src/modules/weapons 8370-8452 /code/branches/tutoriallevel3/src/modules/weapons 8453-8636 /code/branches/unity_build/src/modules/weapons 8440-8716 /code/branches/weapon/src/modules/weapons 1925-2094 /code/branches/weapon2/src/modules/weapons 2107-2488 /code/branches/weapons/src/modules/weapons 2897-3051,8143-8591 /code/branches/weaponsystem/src/modules/weapons 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.