Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/presentation2012/contrib @ 9241

Name Size Rev Age Author Last Change
../
CMakeLists.txt 1.2 KB 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
orxonox.desktop 163 bytes 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
orxonox.manpage.xml 10.0 KB 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
orxonox.png 93.5 KB 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
orxonox_old.svg 17.7 KB 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/dockingsystem2/contribmergedeligible
    /code/branches/environment3/contribmergedeligible
    /code/branches/formation/contribmergedeligible
    /code/branches/gamecontent/contribmergedeligible
    /code/branches/hud/contribmergedeligible
    /code/branches/masterserverfix/contribmergedeligible
    /code/branches/menue/contribmergedeligible
    /code/branches/newlevel2012/contribmergedeligible
    /code/branches/output/contribmergedeligible
    /code/branches/pickup2012/contribmergedeligible
    /code/branches/presentation/contribmergedeligible
    /code/branches/presentation2011/contribmergedeligible
    /code/branches/shipSelection/contribmergedeligible
    /code/branches/sound2012/contribmergedeligible
    /code/branches/spacegate/contribmergedeligible
    /code/branches/spaceraceTwo/contribmergedeligible
    /code/branches/surfaceRace/contribmergedeligible
    /code/trunk/contribmergedeligible
    /code/branches/ai/contrib6592-7033
    /code/branches/ai2/contrib8721-8880
    /code/branches/bigships/contrib8137-8588
    /code/branches/buildsystem/contrib1874-2276,​2278-2400
    /code/branches/buildsystem2/contrib2506-2658
    /code/branches/buildsystem3/contrib2662-2708
    /code/branches/ceguilua/contrib1802-1808
    /code/branches/chat/contrib6527-6797
    /code/branches/chat2/contrib6836-6910
    /code/branches/console/contrib5941-6104
    /code/branches/consolecommands2/contrib6451-7178
    /code/branches/consolecommands3/contrib7178-7283
    /code/branches/core3/contrib1572-1739
    /code/branches/core4/contrib3221-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/contrib5768-5928,​6009
    /code/branches/data_cleanup/contrib7537-7686
    /code/branches/doc/contrib7290-7400
    /code/branches/dockingsystem/contrib8101-8192
    /code/branches/dynamicmatch/contrib6584-7030
    /code/branches/fps/contrib6591-7072
    /code/branches/gameimmersion/contrib8102-8577
    /code/branches/gamestate/contrib6430-6572,​6621-6661
    /code/branches/gamestates2/contrib6594-6745
    /code/branches/gametypes/contrib2826-3031
    /code/branches/gcc43/contrib1580
    /code/branches/gui/contrib1635-1723,​2795-2894
    /code/branches/hudelements/contrib6584-6941
    /code/branches/hudimprovements/contrib7920-8672
    /code/branches/ingamemenu/contrib6000-6023
    /code/branches/input/contrib1629-1636
    /code/branches/ipv6/contrib7293-7458
    /code/branches/kicklib/contrib7940-8096,​8098-8277
    /code/branches/kicklib2/contrib8282-8350
    /code/branches/lastmanstanding/contrib7479-7644
    /code/branches/lastmanstanding3/contrib7903-8175
    /code/branches/libraries/contrib5612-5692
    /code/branches/libraries2/contrib5703-5737
    /code/branches/lod/contrib6586-6911
    /code/branches/lodfinal/contrib2372-2411
    /code/branches/mac_osx/contrib7789-8128,​8135
    /code/branches/map/contrib2801-3086,​3089
    /code/branches/masterserver/contrib7502-7738
    /code/branches/menu/contrib5941-6146,​6148,​7536-7687
    /code/branches/miniprojects/contrib2754-2824
    /code/branches/netp2/contrib2835-2988
    /code/branches/netp3/contrib2988-3082
    /code/branches/netp6/contrib3214-3302
    /code/branches/network/contrib2356
    /code/branches/network2/contrib6434-6465
    /code/branches/network3/contrib7196-7344
    /code/branches/network4/contrib7497-7755
    /code/branches/network5/contrib7757-7781
    /code/branches/network6/contrib7823-8315
    /code/branches/network64/contrib2210-2355
    /code/branches/notifications/contrib7314-7401
    /code/branches/objecthierarchy/contrib1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy2/contrib2171-2479
    /code/branches/ois_update/contrib7506-7788
    /code/branches/overlay/contrib2117-2385
    /code/branches/particles/contrib2829-3085
    /code/branches/particles2/contrib6050-6106,​6109
    /code/branches/pch/contrib3113-3194
    /code/branches/physics/contrib1912-2055,​2107-2439
    /code/branches/physics_merge/contrib2436-2457
    /code/branches/pickup/contrib8145-8555
    /code/branches/pickup2/contrib5942-6405
    /code/branches/pickup3/contrib6418-6523
    /code/branches/pickup4/contrib6594-6710
    /code/branches/pickups/contrib1926-2086,​2127,​2827-2915
    /code/branches/pickups2/contrib2107-2497,​2915-3071
    /code/branches/png2/contrib7262-7263
    /code/branches/portals/contrib8087-8455
    /code/branches/portals2/contrib8460-8602
    /code/branches/ppspickups1/contrib6552-6708
    /code/branches/ppspickups2/contrib6527-6532,​6554-6709
    /code/branches/ppspickups3/contrib6757-6997
    /code/branches/ppspickups4/contrib7003-7089
    /code/branches/presentation2/contrib6106-6416,​7787-7800
    /code/branches/presentation3/contrib6913-7162
    /code/branches/questsystem/contrib1894-2088
    /code/branches/questsystem2/contrib2107-2259
    /code/branches/questsystem5/contrib2776-2905
    /code/branches/releasetodo/contrib7614-7647
    /code/branches/resource/contrib3327-3366
    /code/branches/resource2/contrib3372-5694
    /code/branches/rocket/contrib6523-6950
    /code/branches/rocket2/contrib6953-6970
    /code/branches/script_trigger/contrib1295-1953,​1955
    /code/branches/skybox2/contrib6559-6989
    /code/branches/sound/contrib2829-3010
    /code/branches/sound3/contrib5941-6102
    /code/branches/spaceboundaries/contrib8085-8457
    /code/branches/spaceboundaries2/contrib8460-8613
    /code/branches/spacerace/contrib8182-8630
    /code/branches/steering/contrib5949-6091,​8140-8595
    /code/branches/tetris/contrib8100-8563
    /code/branches/tutoriallevel/contrib7827-8370
    /code/branches/tutoriallevel2/contrib8370-8452
    /code/branches/tutoriallevel3/contrib8453-8636
    /code/branches/unity_build/contrib8440-8716
    /code/branches/usability/contrib7915-8078
    /code/branches/weapon/contrib1925-2094
    /code/branches/weapon2/contrib2107-2488
    /code/branches/weapons/contrib2897-3051,​8143-8591
    /code/branches/weaponsystem/contrib2742-2890
Note: See TracBrowser for help on using the repository browser.