Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/pickup2 @ 6419

Name Size Rev Age Author Last Change
../
bin 6412   14 years dafrick Merged presentation2 branch into pickup2 branch.
cmake 6412   14 years dafrick Merged presentation2 branch into pickup2 branch.
data 6412   14 years dafrick Merged presentation2 branch into pickup2 branch.
doc 6412   14 years dafrick Merged presentation2 branch into pickup2 branch.
src 6414   14 years dafrick Added changes to presentation2 here as well.
CMakeLists.txt 4.3 KB ​ 5695   15 years rgrieder Merged resource2 branch back to trunk. IMPORTANT NOTE: Upon this …
INSTALL 1.2 KB ​ 2710   15 years rgrieder Merged buildsystem3 containing buildsystem2 containing Adi's …
LICENSE 17.6 KB ​ 1505   16 years rgrieder f* svn: It doesn't even inform you if you attempt to set a non …
README 1.4 KB ​ 6412   14 years dafrick Merged presentation2 branch into pickup2 branch.
  • Property svn:ignore set to
    build
    codeblocks
    dependencies
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/pickup2mergedeligible
    /code/branches/presentation2mergedeligible
    /code/trunkmergedeligible
    /code/branches/buildsystem1874-2276,​2278-2400
    /code/branches/buildsystem22506-2658
    /code/branches/buildsystem32662-2708
    /code/branches/ceguilua1802-1808
    /code/branches/console5941-6104
    /code/branches/core31572-1739
    /code/branches/core43221-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/core55768-5928,​6009
    /code/branches/gametypes2826-3031
    /code/branches/gcc431580
    /code/branches/gui1635-1723,​2795-2894
    /code/branches/ingamemenu6000-6023
    /code/branches/input1629-1636
    /code/branches/libraries5612-5692
    /code/branches/libraries25703-5737
    /code/branches/lodfinal2372-2411
    /code/branches/map2801-3086,​3089
    /code/branches/menu5941-6146,​6148
    /code/branches/miniprojects2754-2824
    /code/branches/netp22835-2988
    /code/branches/netp32988-3082
    /code/branches/netp63214-3302
    /code/branches/network2356
    /code/branches/network642210-2355
    /code/branches/objecthierarchy1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy22171-2479
    /code/branches/overlay2117-2385
    /code/branches/particles2829-3085
    /code/branches/particles26050-6106,​6109
    /code/branches/pch3113-3194
    /code/branches/physics1912-2055,​2107-2439
    /code/branches/physics_merge2436-2457
    /code/branches/pickups1926-2086,​2127,​2827-2915
    /code/branches/pickups22107-2497,​2915-3071
    /code/branches/presentation2369-2652,​2654-2660
    /code/branches/questsystem1894-2088
    /code/branches/questsystem22107-2259
    /code/branches/questsystem52776-2905
    /code/branches/resource3327-3366
    /code/branches/resource23372-5694
    /code/branches/script_trigger1295-1953,​1955
    /code/branches/sound2829-3010
    /code/branches/sound35941-6102
    /code/branches/steering5949-6091
    /code/branches/weapon1925-2094
    /code/branches/weapon22107-2488
    /code/branches/weapons2897-3051
    /code/branches/weaponsystem2742-2890
Note: See TracBrowser for help on using the repository browser.