]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/history - gfx
projects / xonotic / xonotic-data.pk3dir.git / history
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Additional conflict merging
[xonotic/xonotic-data.pk3dir.git] / gfx /
2023-06-01 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2023-05-31 z411Merge branch 'terencehill/misc_stuff' into 'master' tree | commitdiff
2023-05-31 bones_was_hereMerge branch 'drjaska/sync-bal-wep-mario' into 'master' tree | commitdiff
2023-05-28 bones_was_hereMerge branch 'pending-release' into 'master' tree | commitdiff
2023-05-28 bones_was_hereMerge remote-tracking branch 'origin/master' into pendi... tree | commitdiff
2023-05-25 bones_was_hereMerge remote-tracking branch 'origin/master' into pendi... tree | commitdiff
2023-05-23 bones_was_hereMerge branch 'Mario/team_keepaway' into 'pending-release' tree | commitdiff
2023-05-23 MarioAdd Team Keepaway, a teamplay variant of Keepaway where... tree | commitdiff
2023-05-21 drjaska4 tga files gametype_sv -> gametype_surv tree | commitdiff
2023-05-21 bones_was_hereMerge remote-tracking branch 'origin/master' into pendi... tree | commitdiff
2023-05-09 bones_was_hereMerge remote-tracking branch 'origin/master' into pendi... tree | commitdiff
2023-05-09 bones_was_hereMerge branch 'Mario/survival' into 'pending-release' tree | commitdiff
2023-05-09 MarioAdd Survival, a gamemode where randomly selected hunter... tree | commitdiff
2023-01-25 bones_was_hereMerge branch 'bones_was_here/r_ambient' into 'master' tree | commitdiff
2023-01-04 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2023-01-01 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-12-02 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-10-30 z411Merge branch 'z411/ca-prevent-observer' into z411/bai... tree | commitdiff
2022-10-20 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-10-08 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-09-30 MarioMerge branch 'master' into Mario/q3compat_sanity tree | commitdiff
2022-09-28 z411Merge branch 'master' into z411/powerups_drop tree | commitdiff
2022-08-27 z411Merge branch 'Mario/survival' into z411/bai-server tree | commitdiff
2022-08-27 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-07-06 terencehillMerge branch 'master' into terencehill/lms_updates 808/head tree | commitdiff
2022-07-01 MarioMerge branch 'master' into Mario/survival tree | commitdiff
2022-07-01 JuhuMerge branch 'master' into Juhu/strafehud-fixes tree | commitdiff
2022-06-30 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-05-17 terencehillMerge branch 'master' into terencehill/scoreboard_ui tree | commitdiff
2022-04-29 MarioMerge branch 'master' into Mario/monsters tree | commitdiff
2022-04-23 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-04-13 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-04-12 terencehillMerge branch 'master' into terencehill/welcome_dialog_t... 1000/head tree | commitdiff
2022-04-12 terencehillMerge branch 'master' into develop tree | commitdiff
2022-04-10 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-04-09 terencehillMerge branch 'drjaska/mayhemicons' into 'master' tree | commitdiff
2022-04-08 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-03-31 drjaskaAdded gamemode icons for all 4 themes. 999/head tree | commitdiff
2022-03-28 bones_was_hereMerge branch 'z411/new_centerprint' into 'master' tree | commitdiff
2022-03-28 terencehillMerge branch 'master' into terencehill/menu_quit_game tree | commitdiff
2022-03-28 bones_was_hereMerge branch 'terencehill/welcome_dialog_simple' into... tree | commitdiff
2022-03-26 terencehillMerge branch 'master' into terencehill/welcome_dialog_s... tree | commitdiff
2022-03-13 terencehillMerge branch 'master' into terencehill/menu_quit_game tree | commitdiff
2022-03-10 terencehillShow a welcome window with MOTD on server connection tree | commitdiff
2022-02-26 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-02-22 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-02-03 z411Merge branch 'drjaska/mayhem' into z411/bai-server tree | commitdiff
2022-02-03 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-29 drjaskaMerge branch 'master' into drjaska/mayhem tree | commitdiff
2022-01-23 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-18 drjaskaMerge branch 'master' into drjaska/mayhem tree | commitdiff
2022-01-18 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-14 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-10 MarioMerge branch 'master' into Mario/q3compat_sanity tree | commitdiff
2022-01-10 MarioMerge branch 'master' into develop tree | commitdiff
2022-01-08 MarioMerge branch 'bones_was_here/walking_groundentity_fix... tree | commitdiff
2022-01-06 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-06 z411Merge branch 'LegendaryGuard/ttt' into z411/bai-server tree | commitdiff
2022-01-05 LegendaryGuardMerge branch 'master' into LegendaryGuard/ttt tree | commitdiff
2022-01-05 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2022-01-02 terencehillMerge branch 'z411/srestart' into 'master' tree | commitdiff
2021-12-26 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-12-22 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-12-09 MarioMerge branch 'Mario/lms_pickup_items' into 'master' tree | commitdiff
2021-12-05 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-12-04 terencehillMerge branch 'z411/powerups_dropondeath' into 'master' tree | commitdiff
2021-11-27 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-11-25 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-11-21 terencehillMerge branch 'terencehill/health_armor_icons' into... tree | commitdiff
2021-11-18 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-11-17 terencehillMerge branch 'bones_was_here/ft_start_armor' into ... tree | commitdiff
2021-11-17 terencehillMerge branch 'bones_was_here/strafehud_jumpheight'... tree | commitdiff
2021-11-17 terencehillMerge branch 'master' into terencehill/lms_updates tree | commitdiff
2021-11-17 terencehillAdd missing supercells icons in old hud themes (copy... tree | commitdiff
2021-11-10 terencehillAdd health / armor icons to other hud themes 941/head tree | commitdiff
2021-11-07 drjaskaMerge branch 'master' into drjaska/mayhem tree | commitdiff
2021-11-02 terencehillAdd proper health / armor icons (used by the ItemStats... tree | commitdiff
2021-10-20 z411Merge branch 'master' into z411/srestart tree | commitdiff
2021-10-18 JuhuMerge branch 'bones_was_here/strafehud_jumpheight'... tree | commitdiff
2021-10-12 z411Merge branch 'LegendaryGuard/ttt' into z411/bai-server tree | commitdiff
2021-10-12 LegendaryGuardMerge branch 'master' into LegendaryGuard/ttt tree | commitdiff
2021-10-12 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-09-13 terencehillMerge branch 'master' into terencehill/lms_updates tree | commitdiff
2021-09-10 MarioMerge branch 'master' into Mario/survival tree | commitdiff
2021-09-10 MarioMerge branch 'bones_was_here/q3compat' into 'master' tree | commitdiff
2021-08-29 MarioMerge branch 'bones_was_here/hlac_speed' into 'master' tree | commitdiff
2021-08-29 drjaskaMerge branch 'master' into drjaska/mayhem tree | commitdiff
2021-08-18 terencehillMerge branch 'Mario/electro_sticky_trail_fix' into... tree | commitdiff
2021-08-08 terencehillMerge branch 'master' into terencehill/scoreboard_ui tree | commitdiff
2021-07-31 MarioRemove the placeholder mod icon for Jeff's servers... tree | commitdiff
2021-06-17 terencehillMerge branch 'master' into terencehill/lms_updates tree | commitdiff
2021-05-14 z411Merge branch 'drjaska/mayhem' into z411/bai-server tree | commitdiff
2021-04-29 LegendaryGuardMerge branch 'LegendaryGuard/ttt' into LegendaryGuard... tree | commitdiff
2021-04-28 z411Merge branch 'drjaska/mayhem' into z411/bai-server tree | commitdiff
2021-04-27 LegendaryGuardMerge branch 'LegendaryGuard/ttt' into LegendaryGuard... tree | commitdiff
2021-04-26 LegendaryGuardMerge branch 'LegendaryGuard/ttt' into LegendaryGuard... tree | commitdiff
2021-04-26 LegendaryGuardMerge branch 'z411/bai-server' into LegendaryGuard... tree | commitdiff
2021-04-23 z411Merge branch 'drjaska/mayhem' into z411/bai-server z411/inventory tree | commitdiff
2021-04-23 z411Merge branch 'master' into z411/bai-server tree | commitdiff
2021-04-19 LegendaryGuardMerge branch 'z411/bai-server' into LegendaryGuard... tree | commitdiff
next