projects
/
xonotic
/
xonotic-data.pk3dir.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'master' into Mirio/balance
[xonotic/xonotic-data.pk3dir.git]
/
bal-wep-xonotic.cfg
2016-04-30
Mirio
Merge branch 'master' into Mirio/balance
blob
|
commitdiff
|
raw
2016-03-27
terencehill
Merge branch 'master' into terencehill/race_fix
blob
|
commitdiff
|
raw
|
diff to current
2016-03-26
terencehill
Merge branch 'master' into terencehill/hud_fixes
294/head
blob
|
commitdiff
|
raw
|
diff to current
2016-03-24
Mario
Merge branch 'master' into Mario/hagar_notfixed
blob
|
commitdiff
|
raw
|
diff to current
2016-03-24
Mario
Adjust the shotgun secondary animtime slightly in all...
blob
|
commitdiff
|
raw
|
diff to current
2016-03-05
Mirio
Merge branch 'master' into mirio/balance
blob
|
commitdiff
|
raw
|
diff to current
2016-03-02
Mirio
Merge branch 'master' into mirio/balance
blob
|
commitdiff
|
raw
|
diff to current
2016-02-28
Mario
Merge branch 'terencehill/weaponmodel_effects_tweaks...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-28
TimePath
Merge branch 'proraide/fix_fps' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Mario
Merge branch 'Mario/balance_v2' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2016-02-14
Mario
Merge branch 'master' into morphed/hagar
blob
|
commitdiff
|
raw
|
diff to current
2016-02-13
Mario
Merge branch 'terencehill/weaponmodel_effects_improveme...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-08
Mario
Merge branch 'terencehill/csqc_cursor' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2016-02-08
Mario
Merge branch 'terencehill/fuelregen_powerup' into ...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-07
Mario
Add another missed option from testing session
blob
|
commitdiff
|
raw
|
diff to current
2016-02-07
Mario
Arc beam: don't regenerate armour
blob
|
commitdiff
|
raw
|
diff to current
2016-02-07
Mirio
Increase Hagar and Crylink damage
blob
|
commitdiff
|
raw
|
diff to current
2016-02-06
Mario
Apply arc beam changes from last testing session
blob
|
commitdiff
|
raw
|
diff to current
2016-02-05
Mario
Merge branch 'master' into Mario/balance_v2
blob
|
commitdiff
|
raw
|
diff to current
2016-02-04
Mario
Increase Arc ammo consumption per second to 6 (from 4)
blob
|
commitdiff
|
raw
|
diff to current
2016-02-03
Mario
Add an option to allow re-fire right after releasing...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-03
Mario
Fix Arc slow weapon switching
blob
|
commitdiff
|
raw
|
diff to current
2016-02-03
Mario
Some more adjustments to balance
blob
|
commitdiff
|
raw
|
diff to current
2016-02-02
Mario
Add a new attack mode to Arc (disabled by default)
blob
|
commitdiff
|
raw
|
diff to current
2016-01-15
Mirio
Merge branch 'master' into Mirio/balance
blob
|
commitdiff
|
raw
|
diff to current
2016-01-13
Mirio
Hagar primary damage 25 -> 20
blob
|
commitdiff
|
raw
|
diff to current
2015-12-29
Mirio
Blaster: Reduce damage slightly. MG: Reduce force sligh...
blob
|
commitdiff
|
raw
|
diff to current
2015-12-28
Mirio
Crylink: Redude damage a bit and reduce secondary force
blob
|
commitdiff
|
raw
|
diff to current
2015-10-03
Mario
Merge branch 'terencehill/itemstime_checkmark2' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-03
Mario
Merge branch 'terencehill/bot_fixes' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-24
TimePath
Merge branch 'terencehill/obsolete_cvars_removal' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-02
terencehill
Merge branch 'master' into terencehill/slider_anim_impr...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-02
TimePath
Merge branch 'master' into TimePath/global_self
blob
|
commitdiff
|
raw
|
diff to current
2015-09-01
terencehill
Merge branch 'master' into terencehill/translation_syst...
blob
|
commitdiff
|
raw
|
diff to current
2015-08-31
Mario
Merge branch 'Mario/vaporizer_damage' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-31
Mario
Merge branch 'master' into Mario/vaporizer_damage
blob
|
commitdiff
|
raw
|
diff to current
2015-05-10
Mario
Merge branch 'master' into terencehill/itemstime
blob
|
commitdiff
|
raw
|
diff to current
2015-05-10
TimePath
Merge remote-tracking branch 'origin/master' into Buddy...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-18
Mario
Merge branch 'terencehill/unlimited_ammo_fixes' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-15
terencehill
Merge branch 'master' into terencehill/unlimited_ammo_fixes
blob
|
commitdiff
|
raw
|
diff to current
2015-04-15
Mario
Merge branch 'terencehill/preferred_focus' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Mario
Merge branch 'master' into Mario/vaporizer_damage
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Mario
Merge branch 'master' into Mario/physics
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Mario
Merge branch 'master' into Mario/turrets
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Mario
Revert changes to electro combos (too controversial...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-10
BuddyFriendGuy
Merge branch 'master' into BuddyFriendGuy/mapStringFilter
blob
|
commitdiff
|
raw
|
diff to current
2015-04-09
Mirio
Lower midair radius for Electro, cause you were hurting...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-05
terencehill
Merge branch 'master' into terencehill/unlimited_ammo_fixes
blob
|
commitdiff
|
raw
|
diff to current
2015-03-06
Matthias Krüger
Merge branch 'master' into matthiaskrgr/hudsetup
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
terencehill
Merge branch 'master' into terencehill/quickmenu
blob
|
commitdiff
|
raw
|
diff to current
2015-02-24
Mario
Merge branch 'master' into Mario/vehicles
blob
|
commitdiff
|
raw
|
diff to current
2015-02-18
Mattia Basaglia
Merge branch 'master' of ssh://gitlab.com/xonotic/xonot...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Mario
Merge branch 'TimePath/experiments/csqc_prediction...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Mario
Merge branch 'master' into TimePath/experiments/csqc_pr...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-15
terencehill
Merge branch 'master' into terencehill/weapon_panel_retry
blob
|
commitdiff
|
raw
|
diff to current
2015-02-14
Mario
Merge branch 'master' into Mario/buff_updates
blob
|
commitdiff
|
raw
|
diff to current
2015-02-14
Mario
Merge branch 'master' into Mario/ons_updates
blob
|
commitdiff
|
raw
|
diff to current
2015-02-14
Mario
Merge branch 'master' into sev/weapon_panel_retry
blob
|
commitdiff
|
raw
|
diff to current
2015-02-14
Mario
Merge branch 'master' into Mario/ctf_updates
blob
|
commitdiff
|
raw
|
diff to current
2015-02-12
Mirio
Forgot keep owner cvar in 0.8; buff SG; change back...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-09
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/crypto...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-21
Mario
Merge branch 'master' into Mario/ctf_updates
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
terencehill
Merge branch 'master' into terencehill/itemstime
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
Mario
Merge branch 'master' into Mario/ons_updates
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
Mario
Merge branch 'master' into Mario/turrets
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
Mario
Merge branch 'master' into Mario/vaporizer_damage
blob
|
commitdiff
|
raw
|
diff to current
2015-01-19
terencehill
Merge branch 'master' into terencehill/quickmenu
blob
|
commitdiff
|
raw
|
diff to current
2015-01-11
Rudolf Polzer
Merge remote-tracking branch 'origin/mrbougo/clonefixes'
blob
|
commitdiff
|
raw
|
diff to current
2015-01-07
Mario
Merge branch 'master' into Mario/vehicles
blob
|
commitdiff
|
raw
|
diff to current
2015-01-05
TimePath
Merge branch 'master' into TimePath/experiments/csqc_pr...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-02
Severin Meyer
Merge branch 'master' into sev/luma
blob
|
commitdiff
|
raw
|
diff to current
2014-12-25
Rudolf Polzer
Merge branch 'sev/menu_charmap' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-25
Mario
Merge branch 'master' into terencehill/music_player
blob
|
commitdiff
|
raw
|
diff to current
2014-12-25
Mario
Merge branch 'master' into Mario/physics
blob
|
commitdiff
|
raw
|
diff to current
2014-12-20
TimePath
Merge branch 'master' into TimePath/features/jetpack_jump
blob
|
commitdiff
|
raw
|
diff to current
2014-12-20
Mario
Merge branch 'master' into Mario/notifications
blob
|
commitdiff
|
raw
|
diff to current
2014-12-19
Mario
Merge branch 'master' into Mario/arc_sounds
blob
|
commitdiff
|
raw
|
diff to current
2014-12-18
Mario
Merge branch 'TimePath/issues/1421' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-17
Mario
Merge branch 'Mario/overkill' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-17
TimePath
Merge branch 'master' into terencehill/music_player
blob
|
commitdiff
|
raw
|
diff to current
2014-12-17
Mario
Make vaporizer deal 150 damage in most configs
blob
|
commitdiff
|
raw
|
diff to current
2014-12-16
Mario
Merge branch 'master' into Mario/overkill
blob
|
commitdiff
|
raw
|
diff to current
2014-12-14
TimePath
Merge remote-tracking branch 'origin/master' into TimeP...
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'master' into mirceakitsune/player_cubemaps
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Fix HMG
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'master' into Mario/overkill
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'Mario/ctf_leadlimit' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'master' into terencehill/insta_notifications
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'terencehill/centerprint_panel_fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
Merge branch 'terencehill/misc_cleanups' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
Mario
(Untested) Merge branch 'master' into Mario/overkill
blob
|
commitdiff
|
raw
|
diff to current
2014-12-13
TimePath
Merge branch 'master' into TimePath/issue-1170
blob
|
commitdiff
|
raw
|
diff to current
2014-12-12
TimePath
Merge branch 'master' into TimePath/experiments/csqc_pr...
blob
|
commitdiff
|
raw
|
diff to current
2014-12-11
Mario
Merge remote-tracking branch 'origin/Mirio/credits'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-11
Mario
Merge branch 'Mario/weapons_new'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-11
Mario
Make crylink force match master
blob
|
commitdiff
|
raw
|
diff to current
2014-12-09
Mario
Merge branch 'master' into Mario/weapons_new
blob
|
commitdiff
|
raw
|
diff to current
2014-12-05
Mario
Merge branch 'master' into Mario/weapons_new
blob
|
commitdiff
|
raw
|
diff to current
2014-12-04
Mario
Remove arc from machinegun weaponreplace
blob
|
commitdiff
|
raw
|
diff to current
2014-12-01
Mario
Make arc burst last a bit longer
blob
|
commitdiff
|
raw
|
diff to current
next