Changeset 9241 for code/branches/presentation2012/data/levels/waypoints.oxw
- Timestamp:
- May 24, 2012, 8:49:19 PM (12 years ago)
- Location:
- code/branches/presentation2012
- Files:
-
- 4 edited
-
code/branches/presentation2012
- Property svn:mergeinfo changed
/code/branches/newlevel2012 merged: 9236
- Property svn:mergeinfo changed
-
code/branches/presentation2012/data
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/data merged eligible /code/branches/environment3/data merged eligible /code/branches/formation/data merged eligible /code/branches/gamecontent/data merged eligible /code/branches/hud/data merged eligible /code/branches/masterserverfix/data merged eligible /code/branches/menue/data merged eligible /code/branches/newlevel2012/data merged eligible /code/branches/output/data merged eligible /code/branches/pickup2012/data merged eligible /code/branches/presentation/data merged eligible /code/branches/presentation2011/data merged eligible /code/branches/shipSelection/data merged eligible /code/branches/sound2012/data merged eligible /code/branches/spacegate/data merged eligible /code/branches/spaceraceTwo/data merged eligible /code/branches/surfaceRace/data merged eligible /code/branches/usability/data merged eligible /code/trunk/data merged eligible /code/branches/ai/data 6592-7033 /code/branches/ai2/data 8721-8880 /code/branches/bigships/data 8137-8588 /code/branches/buildsystem/data 1874-2276,2278-2400 /code/branches/buildsystem2/data 2506-2658 /code/branches/buildsystem3/data 2662-2708 /code/branches/ceguilua/data 1802-1808 /code/branches/chat/data 6527-6797 /code/branches/chat2/data 6836-6910 /code/branches/console/data 5941-6104 /code/branches/consolecommands2/data 6451-7178 /code/branches/consolecommands3/data 7178-7283 /code/branches/core3/data 1572-1739 /code/branches/core4/data 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/data 5768-5928,6009 /code/branches/data_cleanup/data 7537-7686 /code/branches/doc/data 7290-7400 /code/branches/dockingsystem/data 8101-8192 /code/branches/dynamicmatch/data 6584-7030 /code/branches/fps/data 6591-7072 /code/branches/gameimmersion/data 8102-8577 /code/branches/gamestate/data 6430-6572,6621-6661 /code/branches/gamestates2/data 6594-6745 /code/branches/gametypes/data 2826-3031 /code/branches/gcc43/data 1580 /code/branches/gui/data 1635-1723,2795-2894 /code/branches/hudelements/data 6584-6941 /code/branches/hudimprovements/data 7920-8672 /code/branches/ingamemenu/data 6000-6023 /code/branches/input/data 1629-1636 /code/branches/ipv6/data 7293-7458 /code/branches/kicklib/data 7940-8096,8098-8277 /code/branches/kicklib2/data 8282-8350 /code/branches/lastmanstanding/data 7479-7644 /code/branches/lastmanstanding3/data 7903-8175 /code/branches/libraries/data 5612-5692 /code/branches/libraries2/data 5703-5737 /code/branches/lod/data 6586-6911 /code/branches/lodfinal/data 2372-2411 /code/branches/mac_osx/data 7789-8128,8135 /code/branches/map/data 2801-3086,3089 /code/branches/masterserver/data 7502-7738 /code/branches/menu/data 5941-6146,6148,7536-7687 /code/branches/miniprojects/data 2754-2824 /code/branches/netp2/data 2835-2988 /code/branches/netp3/data 2988-3082 /code/branches/netp6/data 3214-3302 /code/branches/network/data 2356 /code/branches/network2/data 6434-6465 /code/branches/network3/data 7196-7344 /code/branches/network4/data 7497-7755 /code/branches/network5/data 7757-7781 /code/branches/network6/data 7823-8315 /code/branches/network64/data 2210-2355 /code/branches/notifications/data 7314-7401 /code/branches/objecthierarchy/data 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/data 2171-2479 /code/branches/ois_update/data 7506-7788 /code/branches/overlay/data 2117-2385 /code/branches/particles/data 2829-3085 /code/branches/particles2/data 6050-6106,6109 /code/branches/pch/data 3113-3194 /code/branches/physics/data 1912-2055,2107-2439 /code/branches/physics_merge/data 2436-2457 /code/branches/pickup/data 8145-8555 /code/branches/pickup2/data 5942-6405 /code/branches/pickup3/data 6418-6523 /code/branches/pickup4/data 6594-6710 /code/branches/pickups/data 1926-2086,2127,2827-2915 /code/branches/pickups2/data 2107-2497,2915-3071 /code/branches/png2/data 7262-7263 /code/branches/portals/data 8087-8455 /code/branches/portals2/data 8460-8602 /code/branches/ppspickups1/data 6552-6708 /code/branches/ppspickups2/data 6527-6532,6554-6709 /code/branches/ppspickups3/data 6757-6997 /code/branches/ppspickups4/data 7003-7089 /code/branches/presentation2/data 6106-6416,7787-7800 /code/branches/presentation3/data 6913-7162 /code/branches/questsystem/data 1894-2088 /code/branches/questsystem2/data 2107-2259 /code/branches/questsystem5/data 2776-2905 /code/branches/releasetodo/data 7614-7647 /code/branches/resource/data 3327-3366 /code/branches/resource2/data 3372-5694 /code/branches/rocket/data 6523-6950 /code/branches/rocket2/data 6953-6970 /code/branches/script_trigger/data 1295-1953,1955 /code/branches/skybox2/data 6559-6989 /code/branches/sound/data 2829-3010 /code/branches/sound3/data 5941-6102 /code/branches/spaceboundaries/data 8085-8457 /code/branches/spaceboundaries2/data 8460-8613 /code/branches/spacerace/data 8182-8630 /code/branches/steering/data 5949-6091,8140-8595 /code/branches/tetris/data 8100-8563 /code/branches/tutoriallevel/data 7827-8370 /code/branches/tutoriallevel2/data 8370-8452 /code/branches/tutoriallevel3/data 8453-8636 /code/branches/unity_build/data 8440-8716 /code/branches/weapon/data 1925-2094 /code/branches/weapon2/data 2107-2488 /code/branches/weapons/data 2897-3051,8143-8591 /code/branches/weaponsystem/data 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/data/levels
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/data/levels merged eligible /code/branches/environment3/data/levels merged eligible /code/branches/formation/data/levels merged eligible /code/branches/gamecontent/data/levels merged eligible /code/branches/hud/data/levels merged eligible /code/branches/masterserverfix/data/levels merged eligible /code/branches/menue/data/levels merged eligible /code/branches/newlevel2012/data/levels merged eligible /code/branches/output/data/levels merged eligible /code/branches/pickup2012/data/levels merged eligible /code/branches/presentation/data/levels merged eligible /code/branches/presentation2011/data/levels merged eligible /code/branches/shipSelection/data/levels merged eligible /code/branches/sound2012/data/levels merged non-inheritable eligible /code/branches/spacegate/data/levels merged eligible /code/branches/spaceraceTwo/data/levels merged eligible /code/branches/surfaceRace/data/levels merged eligible /code/branches/usability/data/levels merged eligible /code/trunk/data/levels merged eligible /code/branches/ai/data/levels 6592-7033 /code/branches/ai2/data/levels 8721-8880 /code/branches/bigships/data/levels 8137-8588 /code/branches/buildsystem/data/levels 1874-2276,2278-2400 /code/branches/buildsystem2/data/levels 2506-2658 /code/branches/buildsystem3/data/levels 2662-2708 /code/branches/ceguilua/data/levels 1802-1808 /code/branches/chat/data/levels 6527-6797 /code/branches/chat2/data/levels 6836-6910 /code/branches/console/data/levels 5941-6104 /code/branches/consolecommands2/data/levels 6451-7178 /code/branches/consolecommands3/data/levels 7178-7283 /code/branches/core3/data/levels 1572-1739 /code/branches/core4/data/levels 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/data/levels 5768-5928,6009 /code/branches/data_cleanup/data/levels 7537-7686 /code/branches/doc/data/levels 7290-7400 /code/branches/dockingsystem/data/levels 8101-8192 /code/branches/dynamicmatch/data/levels 6584-7030 /code/branches/fps/data/levels 6591-7072 /code/branches/gameimmersion/data/levels 8102-8577 /code/branches/gamestate/data/levels 6430-6572,6621-6661 /code/branches/gamestates2/data/levels 6594-6745 /code/branches/gametypes/data/levels 2826-3031 /code/branches/gcc43/data/levels 1580 /code/branches/gui/data/levels 1635-1723,2795-2894 /code/branches/hudelements/data/levels 6584-6941 /code/branches/hudimprovements/data/levels 7920-8672 /code/branches/ingamemenu/data/levels 6000-6023 /code/branches/input/data/levels 1629-1636 /code/branches/ipv6/data/levels 7293-7458 /code/branches/kicklib/data/levels 7940-8096,8098-8277 /code/branches/kicklib2/data/levels 8282-8350 /code/branches/lastmanstanding/data/levels 7479-7644 /code/branches/lastmanstanding3/data/levels 7903-8175 /code/branches/libraries/data/levels 5612-5692 /code/branches/libraries2/data/levels 5703-5737 /code/branches/lod/data/levels 6586-6911 /code/branches/lodfinal/data/levels 2372-2411 /code/branches/mac_osx/data/levels 7789-8128,8135 /code/branches/map/data/levels 2801-3086,3089 /code/branches/masterserver/data/levels 7502-7738 /code/branches/menu/data/levels 5941-6146,6148,7536-7687 /code/branches/miniprojects/data/levels 2754-2824 /code/branches/netp2/data/levels 2835-2988 /code/branches/netp3/data/levels 2988-3082 /code/branches/netp6/data/levels 3214-3302 /code/branches/network/data/levels 2356 /code/branches/network2/data/levels 6434-6465 /code/branches/network3/data/levels 7196-7344 /code/branches/network4/data/levels 7497-7755 /code/branches/network5/data/levels 7757-7781 /code/branches/network6/data/levels 7823-8315 /code/branches/network64/data/levels 2210-2355 /code/branches/notifications/data/levels 7314-7401 /code/branches/objecthierarchy/data/levels 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/data/levels 2171-2479 /code/branches/ois_update/data/levels 7506-7788 /code/branches/overlay/data/levels 2117-2385 /code/branches/particles/data/levels 2829-3085 /code/branches/particles2/data/levels 6050-6106,6109 /code/branches/pch/data/levels 3113-3194 /code/branches/physics/data/levels 1912-2055,2107-2439 /code/branches/physics_merge/data/levels 2436-2457 /code/branches/pickup/data/levels 8145-8555 /code/branches/pickup2/data/levels 5942-6405 /code/branches/pickup3/data/levels 6418-6523 /code/branches/pickup4/data/levels 6594-6710 /code/branches/pickups/data/levels 1926-2086,2127,2827-2915 /code/branches/pickups2/data/levels 2107-2497,2915-3071 /code/branches/png2/data/levels 7262-7263 /code/branches/portals/data/levels 8087-8455 /code/branches/portals2/data/levels 8460-8602 /code/branches/ppspickups1/data/levels 6552-6708 /code/branches/ppspickups2/data/levels 6527-6532,6554-6709 /code/branches/ppspickups3/data/levels 6757-6997 /code/branches/ppspickups4/data/levels 7003-7089 /code/branches/presentation2/data/levels 6106-6416,7787-7800 /code/branches/presentation3/data/levels 6913-7162 /code/branches/questsystem/data/levels 1894-2088 /code/branches/questsystem2/data/levels 2107-2259 /code/branches/questsystem5/data/levels 2776-2905 /code/branches/releasetodo/data/levels 7614-7647 /code/branches/resource/data/levels 3327-3366 /code/branches/resource2/data/levels 3372-5694 /code/branches/rocket/data/levels 6523-6950 /code/branches/rocket2/data/levels 6953-6970 /code/branches/script_trigger/data/levels 1295-1953,1955 /code/branches/skybox2/data/levels 6559-6989 /code/branches/sound/data/levels 2829-3010 /code/branches/sound3/data/levels 5941-6102 /code/branches/spaceboundaries/data/levels 8085-8457 /code/branches/spaceboundaries2/data/levels 8460-8613 /code/branches/spacerace/data/levels 8182-8630 /code/branches/steering/data/levels 5949-6091,8140-8595 /code/branches/tetris/data/levels 8100-8563 /code/branches/tutoriallevel/data/levels 7827-8370 /code/branches/tutoriallevel2/data/levels 8370-8452 /code/branches/tutoriallevel3/data/levels 8453-8636 /code/branches/unity_build/data/levels 8440-8716 /code/branches/weapon/data/levels 1925-2094 /code/branches/weapon2/data/levels 2107-2488 /code/branches/weapons/data/levels 2897-3051,8143-8591 /code/branches/weaponsystem/data/levels 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/presentation2012/data/levels/waypoints.oxw
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/dockingsystem2/data/levels/waypoints.oxw merged eligible /code/branches/environment3/data/levels/waypoints.oxw merged eligible /code/branches/formation/data/levels/waypoints.oxw merged eligible /code/branches/gamecontent/data/levels/waypoints.oxw merged eligible /code/branches/hud/data/levels/waypoints.oxw merged eligible /code/branches/masterserverfix/data/levels/waypoints.oxw merged eligible /code/branches/menue/data/levels/waypoints.oxw merged eligible /code/branches/newlevel2012/data/levels/waypoints.oxw merged eligible /code/branches/output/data/levels/waypoints.oxw merged eligible /code/branches/pickup2012/data/levels/waypoints.oxw merged eligible /code/branches/presentation/data/levels/waypoints.oxw merged eligible /code/branches/presentation2011/data/levels/waypoints.oxw merged eligible /code/branches/shipSelection/data/levels/waypoints.oxw merged eligible /code/branches/sound2012/data/levels/waypoints.oxw merged eligible /code/branches/spacegate/data/levels/waypoints.oxw merged eligible /code/branches/spaceraceTwo/data/levels/waypoints.oxw merged eligible /code/branches/surfaceRace/data/levels/waypoints.oxw merged eligible /code/branches/usability/data/levels/waypoints.oxw merged eligible /code/trunk/data/levels/waypoints.oxw merged eligible /code/branches/ai/data/levels/waypoints.oxw 6592-7033 /code/branches/ai2/data/levels/waypoints.oxw 8721-8880 /code/branches/bigships/data/levels/waypoints.oxw 8137-8588 /code/branches/buildsystem/data/levels/waypoints.oxw 1874-2276,2278-2400 /code/branches/buildsystem2/data/levels/waypoints.oxw 2506-2658 /code/branches/buildsystem3/data/levels/waypoints.oxw 2662-2708 /code/branches/ceguilua/data/levels/waypoints.oxw 1802-1808 /code/branches/chat/data/levels/waypoints.oxw 6527-6797 /code/branches/chat2/data/levels/waypoints.oxw 6836-6910 /code/branches/console/data/levels/waypoints.oxw 5941-6104 /code/branches/consolecommands2/data/levels/waypoints.oxw 6451-7178 /code/branches/consolecommands3/data/levels/waypoints.oxw 7178-7283 /code/branches/core3/data/levels/waypoints.oxw 1572-1739 /code/branches/core4/data/levels/waypoints.oxw 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/data/levels/waypoints.oxw 5768-5928,6009 /code/branches/data_cleanup/data/levels/waypoints.oxw 7537-7686 /code/branches/doc/data/levels/waypoints.oxw 7290-7400 /code/branches/dockingsystem/data/levels/waypoints.oxw 8101-8192 /code/branches/dynamicmatch/data/levels/waypoints.oxw 6584-7030 /code/branches/fps/data/levels/waypoints.oxw 6591-7072 /code/branches/gameimmersion/data/levels/waypoints.oxw 8102-8577 /code/branches/gamestate/data/levels/waypoints.oxw 6430-6572,6621-6661 /code/branches/gamestates2/data/levels/waypoints.oxw 6594-6745 /code/branches/gametypes/data/levels/waypoints.oxw 2826-3031 /code/branches/gcc43/data/levels/waypoints.oxw 1580 /code/branches/gui/data/levels/waypoints.oxw 1635-1723,2795-2894 /code/branches/hudelements/data/levels/waypoints.oxw 6584-6941 /code/branches/hudimprovements/data/levels/waypoints.oxw 7920-8672 /code/branches/ingamemenu/data/levels/waypoints.oxw 6000-6023 /code/branches/input/data/levels/waypoints.oxw 1629-1636 /code/branches/ipv6/data/levels/waypoints.oxw 7293-7458 /code/branches/kicklib/data/levels/waypoints.oxw 7940-8096,8098-8277 /code/branches/kicklib2/data/levels/waypoints.oxw 8282-8350 /code/branches/lastmanstanding/data/levels/waypoints.oxw 7479-7644 /code/branches/lastmanstanding3/data/levels/waypoints.oxw 7903-8175 /code/branches/libraries/data/levels/waypoints.oxw 5612-5692 /code/branches/libraries2/data/levels/waypoints.oxw 5703-5737 /code/branches/lod/data/levels/waypoints.oxw 6586-6911 /code/branches/lodfinal/data/levels/waypoints.oxw 2372-2411 /code/branches/mac_osx/data/levels/waypoints.oxw 7789-8128,8135 /code/branches/map/data/levels/waypoints.oxw 2801-3086,3089 /code/branches/masterserver/data/levels/waypoints.oxw 7502-7738 /code/branches/menu/data/levels/waypoints.oxw 5941-6146,6148,7536-7687 /code/branches/miniprojects/data/levels/waypoints.oxw 2754-2824 /code/branches/netp2/data/levels/waypoints.oxw 2835-2988 /code/branches/netp3/data/levels/waypoints.oxw 2988-3082 /code/branches/netp6/data/levels/waypoints.oxw 3214-3302 /code/branches/network/data/levels/waypoints.oxw 2356 /code/branches/network2/data/levels/waypoints.oxw 6434-6465 /code/branches/network3/data/levels/waypoints.oxw 7196-7344 /code/branches/network4/data/levels/waypoints.oxw 7497-7755 /code/branches/network5/data/levels/waypoints.oxw 7757-7781 /code/branches/network6/data/levels/waypoints.oxw 7823-8315 /code/branches/network64/data/levels/waypoints.oxw 2210-2355 /code/branches/notifications/data/levels/waypoints.oxw 7314-7401 /code/branches/objecthierarchy/data/levels/waypoints.oxw 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/data/levels/waypoints.oxw 2171-2479 /code/branches/ois_update/data/levels/waypoints.oxw 7506-7788 /code/branches/overlay/data/levels/waypoints.oxw 2117-2385 /code/branches/particles/data/levels/waypoints.oxw 2829-3085 /code/branches/particles2/data/levels/waypoints.oxw 6050-6106,6109 /code/branches/pch/data/levels/waypoints.oxw 3113-3194 /code/branches/physics/data/levels/waypoints.oxw 1912-2055,2107-2439 /code/branches/physics_merge/data/levels/waypoints.oxw 2436-2457 /code/branches/pickup/data/levels/waypoints.oxw 8145-8555 /code/branches/pickup2/data/levels/waypoints.oxw 5942-6405 /code/branches/pickup3/data/levels/waypoints.oxw 6418-6523 /code/branches/pickup4/data/levels/waypoints.oxw 6594-6710 /code/branches/pickups/data/levels/waypoints.oxw 1926-2086,2127,2827-2915 /code/branches/pickups2/data/levels/waypoints.oxw 2107-2497,2915-3071 /code/branches/png2/data/levels/waypoints.oxw 7262-7263 /code/branches/portals/data/levels/waypoints.oxw 8087-8455 /code/branches/portals2/data/levels/waypoints.oxw 8460-8602 /code/branches/ppspickups1/data/levels/waypoints.oxw 6552-6708 /code/branches/ppspickups2/data/levels/waypoints.oxw 6527-6532,6554-6709 /code/branches/ppspickups3/data/levels/waypoints.oxw 6757-6997 /code/branches/ppspickups4/data/levels/waypoints.oxw 7003-7089 /code/branches/presentation2/data/levels/waypoints.oxw 6106-6416,7787-7800 /code/branches/presentation3/data/levels/waypoints.oxw 6913-7162 /code/branches/questsystem/data/levels/waypoints.oxw 1894-2088 /code/branches/questsystem2/data/levels/waypoints.oxw 2107-2259 /code/branches/questsystem5/data/levels/waypoints.oxw 2776-2905 /code/branches/releasetodo/data/levels/waypoints.oxw 7614-7647 /code/branches/resource/data/levels/waypoints.oxw 3327-3366 /code/branches/resource2/data/levels/waypoints.oxw 3372-5694 /code/branches/rocket/data/levels/waypoints.oxw 6523-6950 /code/branches/rocket2/data/levels/waypoints.oxw 6953-6970 /code/branches/script_trigger/data/levels/waypoints.oxw 1295-1953,1955 /code/branches/skybox2/data/levels/waypoints.oxw 6559-6989 /code/branches/sound/data/levels/waypoints.oxw 2829-3010 /code/branches/sound3/data/levels/waypoints.oxw 5941-6102 /code/branches/spaceboundaries/data/levels/waypoints.oxw 8085-8457 /code/branches/spaceboundaries2/data/levels/waypoints.oxw 8460-8613 /code/branches/spacerace/data/levels/waypoints.oxw 8182-8630 /code/branches/steering/data/levels/waypoints.oxw 5949-6091,8140-8595 /code/branches/tetris/data/levels/waypoints.oxw 8100-8563 /code/branches/tutoriallevel/data/levels/waypoints.oxw 7827-8370 /code/branches/tutoriallevel2/data/levels/waypoints.oxw 8370-8452 /code/branches/tutoriallevel3/data/levels/waypoints.oxw 8453-8636 /code/branches/unity_build/data/levels/waypoints.oxw 8440-8716 /code/branches/weapon/data/levels/waypoints.oxw 1925-2094 /code/branches/weapon2/data/levels/waypoints.oxw 2107-2488 /code/branches/weapons/data/levels/waypoints.oxw 2897-3051,8143-8591 /code/branches/weaponsystem/data/levels/waypoints.oxw 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.