]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/history - qcsrc/menu/xonotic/colorpicker_string.c
Merge branch 'master' into Mario/notifications
[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / colorpicker_string.c
2014-12-20 MarioMerge branch 'master' into Mario/notifications
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-01-28 MarioMerge branch 'master' into Mario/spawnsystem_mutator
2014-01-28 MarioMerge branch 'master' into Mario/overkill
2014-01-06 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2014-01-05 terencehillMerge branch 'master' into terencehill/ca_ft_fixes
2014-01-04 terencehillMerge branch 'master' into terencehill/vehicles_fixes
2013-12-29 Samual LenksMerge remote-tracking branch 'origin/terencehill/color_...
2013-12-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-12-06 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-11-26 Samual LenksMerge remote-tracking branch 'origin/zykure/playerstats...
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/samual/serverlist'
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/Mario/respawn_delays'
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/Mario/arena_nuke'
2013-11-24 MarioMerge branch 'master' into Mario/nade_drop
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-11-03 MarioMerge branch 'master' into Mario/monsters
2013-11-02 MarioMerge branch 'master' into Mario/csqc_models
2013-10-30 Rudolf PolzerGet rid of if not, step 1.
2013-06-10 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-22 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-03-14 terencehillMerge branch 'master' into terencehill/menu_focus_stuff
2012-03-09 nyovMerge tag 'xonotic-v0.6.0' into nyov/dedicated-startups...
2012-02-29 SamualMerge remote branch 'origin/terencehill/minstagib_outof...
2012-02-28 Jakob MGMerge remote-tracking branch 'origin/master' into tzork...
2012-02-27 terencehillMerge branch 'master' into terencehill/color_picker_carets
2012-02-26 SamualMerge remote branch 'origin/terencehill/powerups_respaw...
2012-02-26 SamualMerge remote branch 'origin/terencehill/arena_and_ca_fixes'
2012-02-26 SamualMerge remote branch 'origin/terencehill/physics_panel_u...
2012-02-18 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/new...
2012-02-08 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
2012-02-04 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2012-01-31 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2012-01-29 terencehillMerge branch 'master' into terencehill/cursormode
2012-01-26 SamualMerge remote branch 'origin/master' into terencehill...
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-21 Rudolf PolzerMerge branch 'master' into samual/menu_updates
2012-01-21 Rudolf Polzercvar color picker:
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
2011-02-02 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2010-12-15 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
2010-12-10 Rudolf PolzerMerge commit '7b4c329'
2010-12-10 Rudolf PolzerMerge remote branch 'origin/terencehill/WEP_constants_f...
2010-11-30 Rudolf PolzerMerge remote branch 'origin/morphed/flag'
2010-11-17 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-11-17 Rudolf PolzerMerge remote branch 'origin/fruitiex/fullbrightskin'
2010-11-17 FruitieXMerge branch 'master' into fruitiex/gamemode_freezetag
2010-11-16 Rudolf PolzerMerge branch 'master' into fruitiex/gamemode_freezetag
2010-11-16 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/race_nouid_norec'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/mirceakitsune_mapc...
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/branding_lagclock'
2010-11-15 Rudolf PolzerMerge remote branch 'origin/fruitiex/panelhud'
2010-11-12 FruitieXMerge branch 'terencehill/crosshair_colors' into fruiti...
2010-11-12 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
2010-11-12 FruitieXuse a default value on the colorpicker_string
2010-11-12 FruitieXMerge remote branch 'origin/terencehill/colorpicker_pos...
2010-11-08 terencehillColorpickers now load and remember (when they get re...
2010-08-13 terencehillMerge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600...
2010-08-09 FruitieXMerge branch 'master' into mirceakitsune/multijump
2010-08-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/fruit...
2010-08-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/divVerent...
2010-07-29 Rudolf PolzerMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
2010-07-29 Rudolf PolzerMerge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
2010-07-29 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/conback'
2010-07-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/fruitbalance'
2010-07-24 FruitieXMerge remote branch 'origin/divVerent/fruitbalance...
2010-07-24 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/fruit...
2010-07-23 FruitieXMerge remote branch 'origin/master' into fruitiex/newpa...
2010-07-23 FruitieXMerge remote branch 'origin/master' into fruitiex/newpa...
2010-07-22 FruitieXMerge branch 'master' into fruitiex/newpanelhud_stable
2010-07-22 FruitieXMerge branch 'master' into fruitiex/newpanelhud
2010-07-22 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-07-22 FruitieXfix the picker code
2010-07-21 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-07-18 Rudolf PolzerMerge branch 'master' into fruitiex/fruitbalance
2010-07-17 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-07-17 Mircea KitsuneMerge branch 'master' into mirceakitsune/death_unglow
2010-07-16 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-07-16 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mirceakitsune...
2010-07-16 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/sevch...
2010-07-16 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/newpa...
2010-07-16 terencehillMerge remote branch 'remotes/origin/terencehill/newpane...
2010-07-14 terencehillMerge remote branch 'remotes/origin/fruitiex/newpanelhu...
2010-07-14 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-07-13 FruitieXmake the two last dialogs work