Merge branch 'master' into DefaultUser/armormega
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / health.qh
2016-12-10 MarioMerge branch 'master' into DefaultUser/armormega 387/head
2016-12-05 MarioMerge branch 'terencehill/item_models' into 'master'
2016-12-04 terencehillIncrease powerups and megas size. It fixes #192
2016-11-05 FreddyRename ITEM_HealthLarge to ITEM_HealthBig
2016-09-01 MarioMerge branch 'DefaultUser/gametype_votescreen' into...
2016-08-22 terencehillMerge branch 'master' into terencehill/hud_updates 353/head
2016-08-22 MarioMerge branch 'master' into terencehill/spectatee_status... 354/head
2016-08-21 MarioMerge branch 'master' into Mario/entcs
2016-08-21 TimePathMerge branch 'TimePath/modules'
2016-08-21 TimePaths/#ifndef MENUQC/#ifdef GAMEQC/g
2016-08-21 TimePathMerge branch 'master' into TimePath/modules
2016-08-21 TimePathRemove _all indirection
2016-08-18 MarioMerge branch 'master' into Mario/user_movetypes 356/head
2016-08-15 MarioMerge branch 'TimePath/globalforces' into 'master'
2016-08-14 terencehillMerge branch 'master' into terencehill/scoreboard_panel_2
2016-08-14 TimePathATTRIB: overload default value, require semicolon
2016-08-10 terencehillMerge branch 'master' into terencehill/scoreboard_panel_2
2016-08-07 TimePath#pragma once
2016-06-14 MarioMerge branch 'master' into Mario/balance
2016-06-12 MarioMerge branch 'master' into Mario/showspecs
2015-11-13 MarioMerge branch 'master' into Mario/bulldozer
2015-11-08 MarioMerge branch 'terencehill/quickmenu_file_example' into...
2015-11-08 MarioMerge branch 'terencehill/menu_languages' into 'master'
2015-10-31 MarioMerge branch 'terencehill/hide_motd' into 'master'
2015-10-29 TimePathMerge branch 'master' into TimePath/debug_draw
2015-10-29 TimePathMerge branch 'TimePath/items' into 'master'
2015-10-29 TimePathMerge branch 'master' into TimePath/items 245/head
2015-10-26 TimePathMerge branch 'master' into TimePath/items
2015-10-12 TimePathItems: source name and pickups from item and weapon...
2015-08-31 MarioMerge branch 'master' into Mario/vaporizer_damage 215/head
2015-08-26 terencehillMerge branch 'master' into terencehill/quickmenu
2015-08-23 TimePathMerge branch 'master' into Mario/turrets
2015-08-04 MarioMerge branch 'BuddyFriendGuy/mapStringFilter' into...
2015-08-02 MarioMerge branch 'master' into Mario/ons_updates
2015-07-31 MarioMerge branch 'master' into Mario/buff_updates
2015-07-27 terencehillMerge branch 'master' into terencehill/itemstime
2015-07-13 MarioMerge branch 'master' into Mario/vehicles
2015-07-12 MarioMerge branch 'master' into Penguinum/Antiwall
2015-07-09 MarioMerge branch 'terencehill/shuffleteams_fix' into 'master'
2015-07-09 MarioMerge branch 'master' into Mario/physics
2015-07-09 MarioMerge branch 'master' into Mario/ctf_updates
2015-07-09 MarioMerge branch 'packer-/impure_team_cvars' into 'master'
2015-07-09 MarioMerge branch 'terencehill/accelerometer_fix' into ...
2015-07-08 MarioMerge branch 'master' into Mario/minigames_merge
2015-07-08 MarioMerge master into qc_physics_prehax (blame TimePath...
2015-07-04 MarioMerge branch 'TimePath/itemsys' into 'master'
2015-07-03 TimePathMerge remote-tracking branch 'remotes/origin/master...
2015-05-12 TimePathAdd powerups
2015-05-10 TimePathUse the new item system for health and armor