Merge branch 'martin-t/okc' into martin-t/okc2
[xonotic/xonotic-data.pk3dir.git] / scripts / weapons.shader
2017-04-07 MarioMerge branch 'Lyberta/PlayerDied' into 'master'
2017-04-07 MarioMerge branch 'amade/small-fixes' into 'master'
2017-04-04 MarioMerge branch 'master' into Mario/cts_respawn_clear 432/head
2017-04-02 LybertaMerge branch 'master' into Lyberta/DebugPrintToChat
2017-04-01 MarioAdd new mortar model by Morphed
2017-03-12 MarioMerge branch 'master' into Mario/race_target_waypoint
2017-03-12 MarioMerge branch 'master' into Mario/killsound
2017-02-24 Martin TaibrMerge branch 'master' into martin-t/damagetext 391/head
2017-02-21 MarioMerge branch 'morphed/newrl' into 'master'
2017-02-20 MarioInclude new devastator model by Morphed 410/head
2016-06-14 MarioMerge branch 'master' into Mario/balance
2016-06-12 MarioMerge branch 'master' into Mario/showspecs
2016-03-13 terencehillMerge branch 'master' into terencehill/translate_colors_2
2016-03-02 MirioMerge branch 'master' into mirio/balance
2016-02-28 MarioMerge branch 'terencehill/weaponmodel_effects_tweaks...
2016-02-28 TimePathMerge branch 'proraide/fix_fps' into 'master'
2016-02-21 MarioMerge branch 'Mario/balance_v2' into 'master'
2016-02-21 MarioMerge branch 'Mario/sniperrifle' into 'master'
2016-02-21 MarioMerge branch 'morphed/hagar' into 'master'
2016-02-20 MarioMerge branch 'master' into morphed/hagar 284/head
2016-02-15 MarioRemove old hagar textures
2016-02-15 MarioAdd sniper rifle by LJFHutch 285/head
2015-04-14 MarioMerge branch 'master' into Mario/showspecs
2015-03-06 Matthias Kr├╝gerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/crypto...
2015-01-21 MarioMerge branch 'master' into Mario/ctf_updates
2015-01-20 terencehillMerge branch 'master' into terencehill/itemstime
2015-01-20 MarioMerge branch 'master' into Mario/ons_updates
2015-01-20 MarioMerge branch 'master' into Mario/turrets
2015-01-19 terencehillMerge branch 'master' into terencehill/quickmenu
2015-01-11 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/clonefixes'
2015-01-07 MarioMerge branch 'master' into Mario/vehicles
2015-01-02 Severin MeyerMerge branch 'master' into sev/luma
2014-12-25 MarioMerge branch 'master' into Mario/physics
2014-12-20 MarioMerge branch 'master' into Mario/notifications
2014-12-17 TimePathMerge branch 'master' into terencehill/music_player
2014-12-14 TimePathMerge remote-tracking branch 'origin/master' into TimeP...
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-12-13 MarioMerge branch 'Mario/ctf_leadlimit' into 'master'
2014-12-13 MarioMerge branch 'master' into terencehill/insta_notifications
2014-12-13 MarioMerge branch 'terencehill/centerprint_panel_fix' into...
2014-12-13 MarioMerge branch 'terencehill/misc_cleanups' into 'master'
2014-12-13 Mario(Untested) Merge branch 'master' into Mario/overkill
2014-12-13 TimePathMerge branch 'master' into TimePath/issue-1170
2014-12-12 TimePathMerge branch 'master' into TimePath/experiments/csqc_pr...
2014-12-11 MarioMerge remote-tracking branch 'origin/Mirio/credits'
2014-12-11 MarioMerge branch 'Mario/weapons_new'
2014-12-09 MarioMerge branch 'master' into Mario/weapons_new
2014-12-05 MarioMerge branch 'master' into Mario/weapons_new
2014-11-28 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioMerge branch 'master' into Mario/weapons_new
2014-11-27 MarioMerge remote-tracking branch 'origin/master' into Mario...
2014-11-27 MarioMerge remote-tracking branch 'origin/master' into Mario...
2014-11-26 MarioMerge branch 'master' into Mario/weapons_new
2014-11-26 MarioWeapons branch reloaded
2014-11-14 MarioRevert "Merge branch 'Mario/despawn_effects'"
2014-11-14 MarioMerge branch 'Mario/despawn_effects'
2014-11-14 MarioMerge branch 'master' into Mario/despawn_effects
2014-11-14 MarioMerge branch 'master' into Mario/weapons
2014-11-06 MarioUse Taoki's shotgun cannon model (with dark skin) as...
2013-12-29 Samual LenksMerge remote-tracking branch 'origin/terencehill/color_...
2013-08-03 terencehillMerge branch 'master' into terencehill/music_player
2013-06-10 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-22 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-09 Samual LenksMerge remote-tracking branch 'origin/master' into divVe...
2013-05-08 Samual LenksMerge remote-tracking branch 'origin/master' into divVe...
2013-05-08 Samual LenksMerge remote-tracking branch 'origin/master' into teren...
2013-05-08 Samual LenksMerge remote-tracking branch 'origin/master' into teren...
2013-03-19 terencehillMerge branch 'master' into terencehill/quickmenu
2012-12-12 Samual LenksMerge remote-tracking branch 'origin/terencehill/cmd_fixes'
2012-12-12 Samual LenksMerge remote-tracking branch 'origin/terencehill/forced...
2012-12-04 Samual LenksMerge remote-tracking branch 'origin/master' into teren...
2012-09-10 Mircea KitsuneMerge branch 'master' into mirceakitsune/player_cubemaps
2012-08-29 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-08-28 Jakob MGMerge remote-tracking branch 'origin/mirceakitsune...
2012-08-23 Jakob MGMerge remote-tracking branch 'origin/terencehill/mutato...
2012-08-23 Jakob MGMerge remote-tracking branch 'origin/terencehill/no_dam...
2012-08-23 Jakob MGMerge remote-tracking branch 'origin/terencehill/freeze...
2012-08-23 Jakob MGMerge remote-tracking branch 'origin/mrbougo/killspree_...
2012-07-21 Rudolf PolzerMerge remote-tracking branch 'origin/master' into divVe...
2012-07-21 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-07-11 Mircea KitsuneMerge branch 'master' into mirceakitsune/physical_entities
2012-07-05 terencehillMerge branch 'master' into terencehill/itemstime
2012-06-13 terencehillMerge branch 'master' into terencehill/directmenu_options
2012-06-13 terencehillMerge branch 'master' into terencehill/clear_button
2012-06-11 Mircea KitsuneMerge branch 'master' into mirceakitsune/func_train_bei...
2012-06-02 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2012-06-01 Jakob MGMerge remote-tracking branch 'origin/master' into tzork...
2012-05-26 terencehillMerge branch 'master' into terencehill/itemstime
2012-05-22 Jakob MGMerge remote branch 'origin/master' into tzork/csqc...
2012-05-22 Jakob MGMerge remote branch 'origin/master' into tzork/csqc...
2012-05-20 Jakob MGMerge remote branch 'origin/master' into tzork/csqc...
2012-05-17 nifrekAdd shaders for all items, add placeholder models and...
2012-05-04 terencehillMerge branch 'master' into terencehill/quickmenu
2012-04-08 Jakob MGMerge remote branch 'origin/master' into tzork/csqc...
2012-04-03 Jakob MGMerge remote branch 'origin/master' into tzork/csqc...
2012-03-28 Jakob MGclient cvars to default, exampleXonotic.cfg _simple...
2012-03-27 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
next