Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/presentation2012merge @ 9272

Name Size Rev Age Author Last Change
../
bin 8420   14 years rgrieder MSVC: use the user's vld.ini file for the Visual Leak Detector.
cmake 9271   12 years landauf svn:eol-style native (no changes in code)
contrib 8351   14 years rgrieder Merged kicklib2 branch back to trunk (includes former branches …
data 9272   12 years landauf replaced tabs with spaces (no code changed)
doc 9271   12 years landauf svn:eol-style native (no changes in code)
src 9272   12 years landauf replaced tabs with spaces (no code changed)
CMakeLists.txt 5.9 KB ​ 8858   13 years landauf merged output branch back to trunk. Changes: - you have to include …
INSTALL 1.2 KB ​ 8473   14 years rgrieder Corrected library version requirements.
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 ​ 7163   14 years dafrick Merged presentation3 branch into trunk.
  • Property svn:ignore set to
    .project
    build
    codeblocks
    dependencies
    vs
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/dockingsystem2mergedeligible
    /code/branches/newlevel2012mergedeligible
    /code/branches/outputmergedeligible
    /code/branches/pickup2012mergedeligible
    /code/branches/presentationmergedeligible
    /code/branches/presentation2011mergedeligible
    /code/branches/presentation2012mergedeligible
    /code/branches/shipSelectionmergedeligible
    /code/branches/sound2012mergedeligible
    /code/branches/surfaceRacemergedeligible
    /code/branches/usabilitymergedeligible
    /code/branches/ai6592-7033
    /code/branches/ai28721-8880
    /code/branches/bigships8137-8588
    /code/branches/buildsystem1874-2276,​2278-2400
    /code/branches/buildsystem22506-2658
    /code/branches/buildsystem32662-2708
    /code/branches/ceguilua1802-1808
    /code/branches/chat6527-6797
    /code/branches/chat26836-6910
    /code/branches/console5941-6104
    /code/branches/consolecommands26451-7178
    /code/branches/consolecommands37178-7283
    /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/data_cleanup7537-7686
    /code/branches/doc7290-7400
    /code/branches/dockingsystem8101-8192
    /code/branches/dynamicmatch6584-7030
    /code/branches/environment38887-8975
    /code/branches/formation8885-8991
    /code/branches/fps6591-7072
    /code/branches/gamecontent8893-8968
    /code/branches/gameimmersion8102-8577
    /code/branches/gamestate6430-6572,​6621-6661
    /code/branches/gamestates26594-6745
    /code/branches/gametypes2826-3031
    /code/branches/gcc431580
    /code/branches/gui1635-1723,​2795-2894
    /code/branches/hud8883-8986
    /code/branches/hudelements6584-6941
    /code/branches/hudimprovements7920-8672
    /code/branches/ingamemenu6000-6023
    /code/branches/input1629-1636
    /code/branches/ipv67293-7458
    /code/branches/kicklib7940-8096,​8098-8277
    /code/branches/kicklib28282-8350
    /code/branches/lastmanstanding7479-7644
    /code/branches/lastmanstanding37903-8175
    /code/branches/libraries5612-5692
    /code/branches/libraries25703-5737
    /code/branches/lod6586-6911
    /code/branches/lodfinal2372-2411
    /code/branches/mac_osx7789-8128,​8135
    /code/branches/map2801-3086,​3089
    /code/branches/masterserver7502-7738
    /code/branches/masterserverfix8933-8936
    /code/branches/menu5941-6146,​6148,​7536-7687
    /code/branches/menue8884-8976
    /code/branches/miniprojects2754-2824
    /code/branches/netp22835-2988
    /code/branches/netp32988-3082
    /code/branches/netp63214-3302
    /code/branches/network2356
    /code/branches/network26434-6465
    /code/branches/network37196-7344
    /code/branches/network47497-7755
    /code/branches/network57757-7781
    /code/branches/network67823-8315
    /code/branches/network642210-2355
    /code/branches/notifications7314-7401
    /code/branches/objecthierarchy1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy22171-2479
    /code/branches/ois_update7506-7788
    /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/pickup8145-8555
    /code/branches/pickup25942-6405
    /code/branches/pickup36418-6523
    /code/branches/pickup46594-6710
    /code/branches/pickups1926-2086,​2127,​2827-2915
    /code/branches/pickups22107-2497,​2915-3071
    /code/branches/png27262-7263
    /code/branches/portals8087-8455
    /code/branches/portals28460-8602
    /code/branches/ppspickups16552-6708
    /code/branches/ppspickups26527-6532,​6554-6709
    /code/branches/ppspickups36757-6997
    /code/branches/ppspickups47003-7089
    /code/branches/presentation26106-6416,​7787-7800
    /code/branches/presentation36913-7162
    /code/branches/questsystem1894-2088
    /code/branches/questsystem22107-2259
    /code/branches/questsystem52776-2905
    /code/branches/releasetodo7614-7647
    /code/branches/resource3327-3366
    /code/branches/resource23372-5694
    /code/branches/rocket6523-6950
    /code/branches/rocket26953-6970
    /code/branches/script_trigger1295-1953,​1955
    /code/branches/skybox26559-6989
    /code/branches/sound2829-3010
    /code/branches/sound35941-6102
    /code/branches/spaceboundaries8085-8457
    /code/branches/spaceboundaries28460-8613
    /code/branches/spacerace8182-8630
    /code/branches/spaceraceTwo8881-8996
    /code/branches/steering5949-6091,​8140-8595
    /code/branches/tetris8100-8563
    /code/branches/tutoriallevel7827-8370
    /code/branches/tutoriallevel28370-8452
    /code/branches/tutoriallevel38453-8636
    /code/branches/unity_build8440-8716
    /code/branches/weapon1925-2094
    /code/branches/weapon22107-2488
    /code/branches/weapons2897-3051,​8143-8591
    /code/branches/weaponsystem2742-2890
Note: See TracBrowser for help on using the repository browser.