]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/history - qcsrc/common/mutators/mutator/buffs/buffs.qh
Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / buffs / buffs.qh
2021-07-18 bones_was_hereResolve conflicts 2: Merge branch 'master' into bones_w...
2021-07-11 bones_was_hereResolve conflicts 1: Merge commit 'c58baab5' into bones...
2021-06-28 terencehillMerge branch 'bones_was_here/fc_auto_helpme' into ...
2021-06-23 terencehillMerge branch 'Mario/status_effects_extended' into ...
2021-06-23 MarioMerge branch 'master' into Mario/status_effects_extended
2021-06-22 MarioMerge branch 'master' into Mario/status_effects_extended
2021-06-15 MarioMerge branch 'master' into Mario/status_effects_extended
2021-06-15 terencehillMerge branch 'master' into 'Mario/status_effects'
2021-05-29 MarioNumerous enhancements to the new status effects system...
2021-05-23 MarioExperimental status effects system: general backend...
2021-03-10 terencehillMerge branch 'master' into terencehill/less_entities
2021-03-06 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-10-19 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-10-18 MarioMerge branch 'master' into terencehill/scoreboard_item_...
2020-10-18 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-10-02 bones_was_hereBuffs: make team field available for item teaming,...
2020-10-02 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-30 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-26 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-25 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-23 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-23 bones_was_hereMerge branch 'master' into bones_was_here/q3compat
2020-09-11 MarioMerge branch 'martin-t/jump' into 'master'
2020-09-05 bones_was_hereq3compat: support holdable_invulnerability, holdable_ka...
2020-07-17 MarioMerge branch 'master' into Mario/speed_var
2020-07-07 MarioMerge branch 'master' into Mario/csqc_muzzleflash
2020-06-20 JuhuMerge remote-tracking branch 'origin/master' into Juhu...
2020-06-12 terencehillMerge branch 'master' into terencehill/ft_autorevive_pr...
2020-05-29 MarioMerge branch 'terencehill/registry_API' into 'master'
2020-05-27 terencehillRegistry API: add REGISTRY_GET
2019-09-30 terencehillMerge branch 'master' into terencehill/ft_autorevive_pr...
2019-09-30 MarioMerge branch 'master' into Mario/weaponorder
2019-09-29 terencehillMerge branch 'master' into Mario/campaign_mapinfo_fix_v2
2019-09-27 MarioMerge branch 't0uYK8Ne/set_slick_friction' into 'master'
2019-09-27 MarioMerge branch 'master' into martin-t/echo
2019-09-26 MarioMerge branch 'AriosJentu/DisconnectDialog' into 'master'
2019-09-26 MarioMerge branch 'martin-t/tips' into 'master'
2019-09-24 MarioMerge branch 'martin-t/defaults' into 'master'
2019-09-18 Martin TaibrMerge branch 'master' into martin-t/vbots
2019-09-14 MarioMerge branch 'martin-t/qc2rust' into 'master'
2019-09-12 Martin TaibrMerge branch 'master' into cloudwalk9/mgburstfix
2019-08-29 Martin TaibrMerge branch 'master' into martin-t/mg-solidpen
2019-08-29 terencehillMerge branch 'terencehill/date_format' into 'master'
2019-08-29 MarioMerge branch 'master' into terencehill/less_fields 659/head
2019-08-29 MarioMerge branch 'master' into Mario/stats_eloranking
2019-08-28 MarioMerge branch 'master' into Mario/qc_camstuff
2019-08-25 Martin TaibrMerge branch 'master' into martin-t/available
2019-08-22 terencehillMerge branch 'master' into terencehill/bot_waypoints
2019-08-18 MarioMerge branch 'master' into martin-t/rulesets 688/head
2019-08-18 MarioMerge branch 'terencehill/casings' into 'master'
2019-08-17 Martin TaibrMerge branch 'master' into martin-t/globals
2019-08-17 Martin TaibrMerge branch 'master' into martin-t/ok-config and remov...
2019-08-17 Martin TaibrMerge branch 'Mario/force_zscale' into 'master'
2019-08-17 MarioMerge branch 'Mario/buff_timer' into 'master'
2019-08-11 terencehillMerge branch 'master' into terencehill/less_entities
2019-08-11 MarioMerge branch 'terencehill/shuffleteams_delay' into...
2019-08-11 MarioMerge branch 'master' into Mario/weaponarena_available
2019-08-11 MarioMerge branch 'terencehill/megaerebus_glow' into 'master'
2019-08-11 MarioMerge branch 'martin-t/whoosh' into 'master'
2019-08-11 MarioFix compilation unit test 676/head
2019-07-31 terencehillMerge branch 'master' into terencehill/bot_waypoints
2019-07-29 terencehillRemove useless line continuation chars
2019-04-21 terencehillMerge branch 'master' into terencehill/translated_keys
2018-11-01 terencehillMerge branch 'master' into martin-t/dmgtext
2018-10-20 Martin TaibrMerge branch 'master' into martin-t/effects
2018-09-30 MarioMerge branch 'master' into DefaultUser/func_button_relay
2018-09-26 Martin TaibrMerge branch 'master' into martin-t/bullet-trails
2018-09-18 terencehillMerge branch 'master' into Mario/cursor
2018-09-07 MarioMerge branch 'Mario/item_wepammo_fix' into 'master'
2018-09-05 MarioTranslate item names
2018-08-03 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/fullbright'
2018-07-02 Martin TaibrMerge branch 'master' into martin-t/bullet-trails
2018-06-19 MarioMerge branch 'Mario/playerdemo_removal'
2018-06-15 Martin TaibrMerge branch 'master' into martin-t/rpc-acc
2018-06-15 LybertaMerge branch 'master' into Lyberta/TeamplayOverhaul
2018-06-14 terencehillMerge branch 'master' into terencehill/bot_ai
2018-06-12 MarioClean up some dangling definitions from the server...
2018-06-11 MarioMerge branch 'master' into Mario/stats_eloranking
2018-04-06 terencehillMerge branch 'master' into terencehill/min_spec_time
2018-03-02 Martin TaibrMerge branch 'master' into martin-t/dmgtext
2018-02-22 LybertaMerge branch 'master' into Lyberta/StandaloneOverkillWe...
2018-02-22 LybertaMerge branch 'master' into Lyberta/KillSound
2018-02-18 terencehillMerge branch 'master' into TimePath/scrollpanel
2018-02-18 Martin TaibrMerge branch 'master' into martin-t/rpc-acc
2018-02-18 terencehillMerge branch 'master' into terencehill/accuracy_shotgun
2018-02-17 Martin TaibrMerge branch 'master' into martin-t/defaults
2018-02-17 MarioMerge branch 'martin-t/cfgs' into 'master'
2018-02-17 MarioTurn most cases of _STAT into STAT
2018-02-17 MarioMerge branch 't0uYK8Ne/target_init' into 'master'
2018-02-12 MarioMerge branch 'martin-t/warns' into 'master'
2018-02-11 LybertaMerge branch 'master' into Lyberta/StandaloneOverkillWe...
2018-02-11 LybertaMerge branch 'master' into Lyberta/KillSound
2018-02-11 MarioMerge branch 'DefaultUser/waypoint_icons'
2018-02-11 MarioMerge branch 'master' into DefaultUser/waypoint_icons 528/head
2018-02-07 MarioMerge branch 'master' into DefaultUser/waypoint_icons
2018-02-05 MarioApply some general fixes and add an icon parameter...
2017-03-12 MarioMerge branch 'master' into Mario/race_target_waypoint
2017-03-12 MarioMerge branch 'master' into Mario/killsound
2017-02-19 Martin TaibrMerge branch 'master' into martin-t/damagetext
2017-02-18 MarioMerge branch 'Mario/bd_tweak' into 'master'
next