Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/Merge_HS18 @ 12228

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 12099   6 years merholzl Merging changes for Flatpak building convenience into trunk
contrib 10267   10 years muemart Add program icon for Windows builds (MSVC only for now)
data 12185   6 years merholzl OrxoKart merge
doc 11099   9 years muemart Fix loads of doxygen warnings and other documentation issues
src 12185   6 years merholzl OrxoKart merge
test 11376   8 years landauf test: fixed unittest
CMakeLists.txt 6.5 KB ​ 10624   9 years landauf merged branch core7 back to trunk
INSTALL 1.2 KB ​ 8473   14 years rgrieder Corrected library version requirements.
LICENSE 17.6 KB ​ 1505   17 years rgrieder f* svn: It doesn't even inform you if you attempt to set a non …
README 1.4 KB ​ 11353   8 years patricwi merged HUD branch to trunk
svn-commit.tmp 485 bytes ​ 12180   6 years merholzl World Map merging
  • Property svn:ignore set to
    .project
    build*
    release*
    codeblocks*
    dependencies*
    vs*
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/3DPacman_FS18mergedeligible
    /code/branches/Flatpakmergedeligible
    /code/branches/Masterserver_FS18mergedeligible
    /code/branches/OrxoKart_HS18mergedeligible
    /code/branches/OrxyRoad_FS18mergedeligible
    /code/branches/RacingBots_FS18mergedeligible
    /code/branches/ScriptableController_FS18mergedeligible
    /code/branches/ScriptableController_HS17mergedeligible
    /code/branches/SuperOrxoBros_FS18mergedeligible
    /code/branches/TixyTaxyTorxy_HS18mergedeligible
    /code/branches/TowerDefense_HS18mergedeligible
    /code/branches/WorldMap_HS18mergedeligible
    /code/branches/wagnis_HS18mergedeligible
    /code/trunkmergedeligible
    /code/branches/AI_HS1510640-10832
    /code/branches/Alejandro_FS1711369-11447
    /code/branches/AsteroidMining_HS1711461-11729
    /code/branches/Asteroid_HS1711456-11724
    /code/branches/BigShip_HS1611213-11356
    /code/branches/CampaignMap_HS1711458-11742
    /code/branches/Dialog_HS1711455-11746
    /code/branches/Dialogue_FS1711360-11450
    /code/branches/FlappyOrx_HS1711460-11751
    /code/branches/HUD_HS1611212-11390,​11392-11699
    /code/branches/Highscore_HS1611226-11355
    /code/branches/ParticleEffectsFS1510309-10612
    /code/branches/Presentation_HS17_merge11723-11782
    /code/branches/ProtectBoss_HS1711457-11763
    /code/branches/Racingbot9388-9513
    /code/branches/SOBv2_HS1711459-11765
    /code/branches/SciptableControllerFS1510308-10613
    /code/branches/ScriptableController9999-10075
    /code/branches/SpaceRace_HS1611214-11357
    /code/branches/StoryModeMap_HS1611221-11358
    /code/branches/SuperOrxoBros_FS1711365-11448
    /code/branches/Waypoints_HS1711496-11773
    /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/campaignHS1510639-10973
    /code/branches/cegui0.811110-11210
    /code/branches/ceguilua1802-1808
    /code/branches/chat6527-6797
    /code/branches/chat26836-6910
    /code/branches/clangenb10385-10609
    /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/core69552-9666
    /code/branches/core710328-10623
    /code/branches/cpp1110439-10732
    /code/branches/cpp11_v210732-11067
    /code/branches/cpp11_v311053-11070
    /code/branches/data_cleanup7537-7686
    /code/branches/doc7290-7400
    /code/branches/dockingsystem8101-8192
    /code/branches/dockingsystem28196-8560
    /code/branches/dynamicmatch6584-7030
    /code/branches/environment38887-8975
    /code/branches/explosionChunksHS1510641-10961
    /code/branches/fabienHS1510685-11033
    /code/branches/formation8885-8991
    /code/branches/formationFS1510320-10610
    /code/branches/formationupdate9580-9624
    /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/hoverHS1510633-10959
    /code/branches/hud8883-8986
    /code/branches/hudHS1410083-10241
    /code/branches/hudelements6584-6941
    /code/branches/hudimprovements7920-8672
    /code/branches/ingamemenu6000-6023
    /code/branches/input1629-1636
    /code/branches/invaders9694-9896
    /code/branches/ipv67293-7458
    /code/branches/keckslevelHS1410082-10222
    /code/branches/kicklib7940-8096,​8098-8277
    /code/branches/kicklib28282-8350
    /code/branches/largeShip19384-9515
    /code/branches/lastmanstanding7479-7644
    /code/branches/lastmanstanding37903-8175
    /code/branches/levelElias9697-9921
    /code/branches/levelKaan9695-9921
    /code/branches/levelMichael9696-9921
    /code/branches/leveljoemeHS1410087-10223
    /code/branches/libraries5612-5692
    /code/branches/libraries25703-5737
    /code/branches/libs9668-9674
    /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/minigame4DHS1410081-10230
    /code/branches/miniprojects2754-2824
    /code/branches/modularships9994-10071
    /code/branches/multiplayerFS1510324-10611
    /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/newlevel20129033-9244
    /code/branches/notifications7314-7401
    /code/branches/objecthierarchy1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy22171-2479
    /code/branches/ogre1.911125-11793
    /code/branches/ois_update7506-7788
    /code/branches/output8739-8857
    /code/branches/overlay2117-2385
    /code/branches/pCuts9023-9284
    /code/branches/particleEffectsHS1510644-10962
    /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/pickup20129029-9189
    /code/branches/pickup36418-6523
    /code/branches/pickup46594-6710
    /code/branches/pickups1926-2086,​2127,​2827-2915
    /code/branches/pickups22107-2497,​2915-3071
    /code/branches/pickupsFS1410000-10259
    /code/branches/planetLevelHS1510637-10966
    /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/presentation2369-2652,​2654-2660,​7736-7786,​8500-8705
    /code/branches/presentation26106-6416,​7787-7800
    /code/branches/presentation20118974-9015
    /code/branches/presentation20129189-9268
    /code/branches/presentation2012merge9266-9347
    /code/branches/presentation36913-7162
    /code/branches/presentationFS1410069-10215
    /code/branches/presentationFS1510499
    /code/branches/presentationFS15merge10595-10621
    /code/branches/presentationHS129481-9525
    /code/branches/presentationHS139891-9938
    /code/branches/presentationHS14merge10222-10257
    /code/branches/presentationHS1510959-11055
    /code/branches/questsystem1894-2088
    /code/branches/questsystem22107-2259
    /code/branches/questsystem52776-2905
    /code/branches/radarDreiD9690-9901
    /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/sfxThilo9691-9917
    /code/branches/shader_HS1812034-12182
    /code/branches/shaders9379-11072
    /code/branches/shaders_merge11072-11079
    /code/branches/shipSelection9038-9206
    /code/branches/skybox26559-6989
    /code/branches/sound2829-3010
    /code/branches/sound20129205-9214
    /code/branches/sound35941-6102
    /code/branches/soundEffects9382-11020
    /code/branches/spaceNavigation9381-9497
    /code/branches/spaceboundaries8085-8457
    /code/branches/spaceboundaries28460-8613
    /code/branches/spacerace8182-8630
    /code/branches/spaceraceTwo8881-8996
    /code/branches/spacestationentry9699-9905
    /code/branches/steering5949-6091,​8140-8595
    /code/branches/storymodeHS1410085-10254
    /code/branches/surfaceRace9028-9199
    /code/branches/surfaceraceHS1410080-10236
    /code/branches/testing9015-9549
    /code/branches/tetris8100-8563
    /code/branches/towerdefenseFS1510283-10614
    /code/branches/towerdefenseHS1410086-10247
    /code/branches/turret9380-9501
    /code/branches/turretFS149998-10070
    /code/branches/tutoriallevel7827-8370
    /code/branches/tutoriallevel28370-8452
    /code/branches/tutoriallevel38453-8636
    /code/branches/unity_build8440-8716
    /code/branches/usability7915-8078
    /code/branches/weapon1925-2094
    /code/branches/weapon22107-2488
    /code/branches/weaponFS1510302-10615
    /code/branches/weapons2897-3051,​8143-8591
    /code/branches/weaponsystem2742-2890
    /code/branches/weaponupdateHS1410084-10237
Note: See TracBrowser for help on using the repository browser.