projects
/
xonotic
/
xonotic-data.pk3dir.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'master' into Mario/vaporizer_damage
[xonotic/xonotic-data.pk3dir.git]
/
.gitignore
2015-03-06
Matthias Krüger
Merge branch 'master' into matthiaskrgr/hudsetup
blob
|
commitdiff
2015-02-09
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/crypto...
blob
|
commitdiff
2015-01-20
terencehill
Merge branch 'master' into terencehill/itemstime
blob
|
commitdiff
2015-01-20
Mario
Merge branch 'master' into Mario/ons_updates
blob
|
commitdiff
2015-01-19
terencehill
Merge branch 'master' into terencehill/quickmenu
blob
|
commitdiff
2014-12-20
Mario
Merge branch 'master' into Mario/notifications
blob
|
commitdiff
2014-12-17
TimePath
Merge branch 'master' into terencehill/music_player
blob
|
commitdiff
2014-12-13
Mario
Merge branch 'master' into mirceakitsune/player_cubemaps
blob
|
commitdiff
2014-12-13
Mario
(Untested) Merge branch 'master' into Mario/overkill
blob
|
commitdiff
2014-12-07
Mario
Merge branch 'master' into Mario/physics
blob
|
commitdiff
2014-12-02
Mario
Merge branch 'master' into Mario/turrets
blob
|
commitdiff
2014-12-02
Mario
Merge branch 'master' into Mario/vehicles
blob
|
commitdiff
2014-11-27
Mario
Merge branch 'master' into Mario/ctf_updates
blob
|
commitdiff
2014-11-22
Mario
Merge branch 'master' into terencehill/verbose_notifica...
blob
|
commitdiff
2014-11-18
Mario
Merge branch 'master' into sev/luma
blob
|
commitdiff
2014-11-17
Mario
Merge branch 'master' into samual/combined_updates
blob
|
commitdiff
2014-11-15
Mario
Merge remote-tracking branch 'origin/sev/menu_maplist_c...
blob
|
commitdiff
2014-11-14
Mario
Merge branch 'master' into Mario/weapons
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'master' into Mario/vehicles
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'master' into terencehill/ca_fixes
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'master' into Mario/domination_roundbased
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'master' into Mario/nade_updates
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'Mario/race_cts_mutators'
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'Mario/config_updates'
blob
|
commitdiff
2014-11-13
Mario
Merge branch 'master' into Mario/race_cts_mutators
blob
|
commitdiff
|
diff to current
2014-11-13
Mario
Merge branch 'master' into Mario/mutators2
blob
|
commitdiff
2014-11-11
Mario
Add Mac .DS_Store files to gitignore
blob
|
commitdiff
2014-11-06
Mario
Merge branch 'samual/weapons' into Mario/weapons
blob
|
commitdiff
|
diff to current
2014-11-04
Mario
Merge branch 'master' into Mario/buffs
blob
|
commitdiff
|
diff to current
2014-11-04
Mario
Merge branch 'master' into Mario/gametype_votes
blob
|
commitdiff
|
diff to current
2014-10-19
terencehill
Merge branch 'master' into terencehill/ca_fixes
blob
|
commitdiff
|
diff to current
2014-09-25
Rudolf Polzer
Merge branch 'master' into samual/weapons
blob
|
commitdiff
|
diff to current
2014-09-18
Rudolf Polzer
Merge remote-tracking branch 'origin/Mario/ignore_files'
blob
|
commitdiff
|
diff to current
2014-06-20
Mario
Ignore some compiler files
blob
|
commitdiff
|
diff to current
2014-01-06
terencehill
Merge branch 'master' into terencehill/hud_code_cleanup
blob
|
commitdiff
|
diff to current
2013-12-29
Samual Lenks
Merge remote-tracking branch 'origin/terencehill/color_...
blob
|
commitdiff
|
diff to current
2013-10-11
Rudolf Polzer
Merge remote-tracking branch 'origin/mirceakitsune...
blob
|
commitdiff
|
diff to current
2013-09-16
terencehill
Merge branch 'master' into terencehill/ca_ft_fixes
blob
|
commitdiff
|
diff to current
2013-09-12
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/merged...
blob
|
commitdiff
|
diff to current
2013-09-10
Mario
Merge branch 'master' into Mario/quickmenu_merge
blob
|
commitdiff
|
diff to current
2013-09-04
Debugger
Merge branch 'master' into debugger/tdm_netscore
blob
|
commitdiff
|
diff to current
2013-08-31
terencehill
Merge branch 'master' into terencehill/vehicles_fixes
blob
|
commitdiff
|
diff to current
2013-08-19
Samual Lenks
Merge remote-tracking branch 'origin/terencehill/HUD_co...
blob
|
commitdiff
|
diff to current
2013-08-19
Samual Lenks
Merge remote-tracking branch 'origin/terencehill/mapvot...
blob
|
commitdiff
|
diff to current
2013-08-13
Debugger
Merge branch 'terencehill/superspec_fixes' into debugge...
blob
|
commitdiff
|
diff to current
2013-08-08
Samual Lenks
Merge remote-tracking branch 'origin/ablu/vehiclebalance'
blob
|
commitdiff
|
diff to current
2013-08-06
terencehill
Merge branch 'master' into terencehill/screenshot_viewer
blob
|
commitdiff
|
diff to current
2013-08-06
Mario
Merge branch 'master' into divVerent/4team_ctf
blob
|
commitdiff
|
diff to current
2013-08-06
terencehill
Merge remote-tracking branch 'origin/terencehill/music_...
blob
|
commitdiff
|
diff to current
2013-08-03
terencehill
Merge branch 'master' into terencehill/music_player
blob
|
commitdiff
|
diff to current
2013-07-26
Mario
Merge branch 'master' into Mario/respawn_delays
blob
|
commitdiff
|
diff to current
2013-06-28
Samual Lenks
Merge remote-tracking branch 'origin/master' into samua...
blob
|
commitdiff
|
diff to current
2013-06-25
Mario
Merge branch 'master' into Mario/mutators
blob
|
commitdiff
|
diff to current
2013-06-25
Mario
Merge branch 'master' into Mario/monsters
blob
|
commitdiff
|
diff to current
2013-06-23
Rudolf Polzer
hide qccversion files
blob
|
commitdiff
|
diff to current
2013-06-23
Rudolf Polzer
Merge branch 'divVerent/simplified-sound-sliders'
blob
|
commitdiff
|
diff to current
2013-06-18
terencehill
Merge branch 'master' into terencehill/ca_ft_fixes
blob
|
commitdiff
|
diff to current
2013-06-16
Matthias Krüger
Merge branch 'master' into matthiaskrgr/gitignore
blob
|
commitdiff
|
diff to current
2013-06-13
Matthias Krüger
Merge branch 'master' into matthiaskrgr/gitignore
blob
|
commitdiff
|
diff to current
2013-06-10
Samual Lenks
Merge remote-tracking branch 'origin/master' into samua...
blob
|
commitdiff
|
diff to current
2013-06-09
Matthias Krüger
Merge branch 'master' into matthiaskrgr/gitignore
blob
|
commitdiff
|
diff to current
2013-06-01
Matthias Krüger
gitignore: ignore .lno files.
blob
|
commitdiff
|
diff to current
2013-05-22
Samual Lenks
Merge remote-tracking branch 'origin/master' into samua...
blob
|
commitdiff
|
diff to current
2012-05-04
terencehill
Merge branch 'master' into terencehill/quickmenu
blob
|
commitdiff
|
diff to current
2012-02-29
Samual
Merge remote branch 'origin/terencehill/minstagib_outof...
blob
|
commitdiff
|
diff to current
2012-02-27
terencehill
Merge branch 'master' into terencehill/color_picker_carets
blob
|
commitdiff
|
diff to current
2012-02-26
Samual
Merge remote branch 'origin/terencehill/physics_panel_u...
blob
|
commitdiff
|
diff to current
2012-02-18
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/new...
blob
|
commitdiff
|
diff to current
2012-02-08
Samual
Merge remote branch 'origin/master' into samual/mutator_ctf
blob
|
commitdiff
|
diff to current
2012-02-04
terencehill
Merge branch 'master' into terencehill/screenshot_viewer
blob
|
commitdiff
|
diff to current
2012-01-29
terencehill
Merge branch 'master' into terencehill/cursormode
blob
|
commitdiff
|
diff to current
2012-01-25
terencehill
Merge branch 'master' into terencehill/clear_button
blob
|
commitdiff
|
diff to current
2012-01-09
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/allow...
blob
|
commitdiff
|
diff to current
2012-01-09
Rudolf Polzer
Merge remote-tracking branch 'origin/divVerent/waypoint...
blob
|
commitdiff
|
diff to current
2012-01-07
nyov
Merge branch 'master' into nyov/dedicated-startupscreen
blob
|
commitdiff
|
diff to current
2012-01-05
Rudolf Polzer
Merge remote-tracking branch 'origin/terencehill/hud_sk...
blob
|
commitdiff
|
diff to current
2012-01-05
Rudolf Polzer
Merge remote-tracking branch 'origin/nifrek/duckanims'
blob
|
commitdiff
|
diff to current
2012-01-03
Samual
Merge remote branch 'origin/master' into samual/menu_up...
blob
|
commitdiff
|
diff to current
2012-01-03
Mircea Kitsune
Merge branch 'master' into mirceakitsune/damage_effects
blob
|
commitdiff
|
diff to current
2012-01-02
Samual
Merge remote branch 'origin/master' into mirceakitsune...
blob
|
commitdiff
|
diff to current
2011-12-31
terencehill
Merge branch 'master' into terencehill/itemstime
blob
|
commitdiff
|
diff to current
2011-12-28
Jakob MG
Merge remote-tracking branch 'origin/master' into tzork...
blob
|
commitdiff
|
diff to current
2011-12-26
Rudolf Polzer
Merge branch 'master' of git://de.git.xonotic.org/xonot...
blob
|
commitdiff
|
diff to current
2011-12-26
Samual
Merge remote branch 'origin/master' into samual/updatec...
blob
|
commitdiff
|
diff to current
2011-12-25
Rudolf Polzer
done updating stuff :P
blob
|
commitdiff
|
diff to current
2010-06-06
mand1nga
Merge branch 'mand1nga/rebrand' of ssh://git.xonotic...
blob
|
commitdiff
|
diff to current
2010-04-26
Mircea Kitsune
Merge branch 'master' into mirceakitsune/multijump
blob
|
commitdiff
|
diff to current
2010-04-22
Rudolf Polzer
Merge commit 'origin/tzork/pathlib'
blob
|
commitdiff
|
diff to current
2010-04-22
Rudolf Polzer
Merge commit 'origin/tzork/pathlib' into divVerent...
blob
|
commitdiff
|
diff to current
2010-04-22
Rudolf Polzer
Merge commit '54e0ccd220df'
blob
|
commitdiff
|
diff to current
2010-04-22
Rudolf Polzer
Merge commit 'origin/tzork/pathlib' into divVerent...
blob
|
commitdiff
|
diff to current
2010-04-22
Rudolf Polzer
Merge commit 'origin/tzork/pathlib'
blob
|
commitdiff
|
diff to current
2010-04-14
Rudolf Polzer
Merge commit 'origin/tzork/vehicles'
blob
|
commitdiff
|
diff to current
2010-04-11
Rudolf Polzer
Merge commit 'origin/esteel/anim/framework'
blob
|
commitdiff
|
diff to current
2010-04-11
Rudolf Polzer
Merge commit 'origin/esteel/ignore'
blob
|
commitdiff
|
diff to current
2010-04-11
Stephan Stahl
ignore csprogs.dat, menu.dat, progs.dat and the fteqcc...
blob
|
commitdiff
|
diff to current