Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/presentation2012/src @ 9241

Name Size Rev Age Author Last Change
../
external 8729   13 years rgrieder Merged unity_build branch back to trunk. Features: - Implemented …
libraries 9208   12 years smerkli merged branch shipSelection
modules 9241   12 years decapitb tower defense update
orxonox 9229   12 years decapitb merged towerdefense
BuildUnitsConfigGCC.cmake 2.1 KB 8729   13 years rgrieder Merged unity_build branch back to trunk. Features: - Implemented …
BuildUnitsConfigMSVC.cmake 2.4 KB 8729   13 years rgrieder Merged unity_build branch back to trunk. Features: - Implemented …
CMakeLists.txt 8.7 KB 8729   13 years rgrieder Merged unity_build branch back to trunk. Features: - Implemented …
orxonox-main.vcproj.user.in 1.5 KB 8368   13 years rgrieder Added CMake configuration type "RelForDevs", which replaces …
orxonox-main.vcxproj.user.in 1.8 KB 8368   13 years rgrieder Added CMake configuration type "RelForDevs", which replaces …
Orxonox.cc 2.8 KB 8858   13 years landauf merged output branch back to trunk. Changes: - you have to include …
OrxonoxConfig.cmake 5.0 KB 8729   13 years rgrieder Merged unity_build branch back to trunk. Features: - Implemented …
OrxonoxConfig.h.in 7.1 KB 8858   13 years landauf merged output branch back to trunk. Changes: - you have to include …
OrxonoxMac.h 1.1 KB 8351   13 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
OrxonoxMac.mm 1.3 KB 8351   13 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
SpecialConfig.h.in 3.9 KB 8351   13 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/dockingsystem2/srcmergedeligible
    /code/branches/environment3/srcmergedeligible
    /code/branches/formation/srcmergedeligible
    /code/branches/gamecontent/srcmergedeligible
    /code/branches/hud/srcmergedeligible
    /code/branches/masterserverfix/srcmergedeligible
    /code/branches/menue/srcmergedeligible
    /code/branches/newlevel2012/srcmergedeligible
    /code/branches/output/srcmergedeligible
    /code/branches/pickup2012/srcmergedeligible
    /code/branches/presentation/srcmergedeligible
    /code/branches/presentation2011/srcmergedeligible
    /code/branches/shipSelection/srcmergedeligible
    /code/branches/sound2012/srcmergedeligible
    /code/branches/spacegate/srcmergedeligible
    /code/branches/spaceraceTwo/srcmergedeligible
    /code/branches/surfaceRace/srcmergedeligible
    /code/branches/usability/srcmergedeligible
    /code/trunk/srcmergedeligible
    /code/branches/ai/src6592-7033
    /code/branches/ai2/src8721-8880
    /code/branches/bigships/src8137-8588
    /code/branches/buildsystem/src1874-2276,​2278-2400
    /code/branches/buildsystem2/src2506-2658
    /code/branches/buildsystem3/src2662-2708
    /code/branches/ceguilua/src1802-1808
    /code/branches/chat/src6527-6797
    /code/branches/chat2/src6836-6910
    /code/branches/console/src5941-6104
    /code/branches/consolecommands2/src6451-7178
    /code/branches/consolecommands3/src7178-7283
    /code/branches/core3/src1572-1739
    /code/branches/core4/src3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
    /code/branches/core5/src5768-5928,​6009
    /code/branches/data_cleanup/src7537-7686
    /code/branches/doc/src7290-7400
    /code/branches/dockingsystem/src8101-8192
    /code/branches/dynamicmatch/src6584-7030
    /code/branches/fps/src6591-7072
    /code/branches/gameimmersion/src8102-8577
    /code/branches/gamestate/src6430-6572,​6621-6661
    /code/branches/gamestates2/src6594-6745
    /code/branches/gametypes/src2826-3031
    /code/branches/gcc43/src1580
    /code/branches/gui/src1635-1723,​2795-2894
    /code/branches/hudelements/src6584-6941
    /code/branches/hudimprovements/src7920-8672
    /code/branches/ingamemenu/src6000-6023
    /code/branches/input/src1629-1636
    /code/branches/ipv6/src7293-7458
    /code/branches/kicklib/src7940-8096,​8098-8277
    /code/branches/kicklib2/src8282-8350
    /code/branches/lastmanstanding/src7479-7644
    /code/branches/lastmanstanding3/src7903-8175
    /code/branches/libraries/src5612-5692
    /code/branches/libraries2/src5703-5737
    /code/branches/lod/src6586-6911
    /code/branches/lodfinal/src2372-2411
    /code/branches/mac_osx/src7789-8128,​8135
    /code/branches/map/src2801-3086,​3089
    /code/branches/masterserver/src7502-7738
    /code/branches/menu/src5941-6146,​6148,​7536-7687
    /code/branches/miniprojects/src2754-2824
    /code/branches/netp2/src2835-2988
    /code/branches/netp3/src2988-3082
    /code/branches/netp6/src3214-3302
    /code/branches/network/src2356
    /code/branches/network2/src6434-6465
    /code/branches/network3/src7196-7344
    /code/branches/network4/src7497-7755
    /code/branches/network5/src7757-7781
    /code/branches/network6/src7823-8315
    /code/branches/network64/src2210-2355
    /code/branches/notifications/src7314-7401
    /code/branches/objecthierarchy/src1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy2/src2171-2479
    /code/branches/ois_update/src7506-7788
    /code/branches/overlay/src2117-2385
    /code/branches/particles/src2829-3085
    /code/branches/particles2/src6050-6106,​6109
    /code/branches/pch/src3113-3194
    /code/branches/physics/src1912-2055,​2107-2439
    /code/branches/physics_merge/src2436-2457
    /code/branches/pickup/src8145-8555
    /code/branches/pickup2/src5942-6405
    /code/branches/pickup3/src6418-6523
    /code/branches/pickup4/src6594-6710
    /code/branches/pickups/src1926-2086,​2127,​2827-2915
    /code/branches/pickups2/src2107-2497,​2915-3071
    /code/branches/png2/src7262-7263
    /code/branches/portals/src8087-8455
    /code/branches/portals2/src8460-8602
    /code/branches/ppspickups1/src6552-6708
    /code/branches/ppspickups2/src6527-6532,​6554-6709
    /code/branches/ppspickups3/src6757-6997
    /code/branches/ppspickups4/src7003-7089
    /code/branches/presentation2/src6106-6416,​7787-7800
    /code/branches/presentation3/src6913-7162
    /code/branches/questsystem/src1894-2088
    /code/branches/questsystem2/src2107-2259
    /code/branches/questsystem5/src2776-2905
    /code/branches/releasetodo/src7614-7647
    /code/branches/resource/src3327-3366
    /code/branches/resource2/src3372-5694
    /code/branches/rocket/src6523-6950
    /code/branches/rocket2/src6953-6970
    /code/branches/script_trigger/src1295-1953,​1955
    /code/branches/skybox2/src6559-6989
    /code/branches/sound/src2829-3010
    /code/branches/sound3/src5941-6102
    /code/branches/spaceboundaries/src8085-8457
    /code/branches/spaceboundaries2/src8460-8613
    /code/branches/spacerace/src8182-8630
    /code/branches/steering/src5949-6091,​8140-8595
    /code/branches/tetris/src8100-8563
    /code/branches/tutoriallevel/src7827-8370
    /code/branches/tutoriallevel2/src8370-8452
    /code/branches/tutoriallevel3/src8453-8636
    /code/branches/unity_build/src8440-8716
    /code/branches/weapon/src1925-2094
    /code/branches/weapon2/src2107-2488
    /code/branches/weapons/src2897-3051,​8143-8591
    /code/branches/weaponsystem/src2742-2890
Note: See TracBrowser for help on using the repository browser.