summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.h
Commit message (Expand)AuthorAgeFilesLines
...
* Add some missing commits from UCC mergeRobert Burnham2011-11-221-2/+0
* Update foul stench effect and calling locationRobert Burnham2011-11-211-1/+1
* Merge branch 'master' into unified_combat_controlRobert Burnham2011-11-161-0/+2
|\
* | Add comments, fix player_stab_checkRobert Burnham2011-11-111-3/+1
* | Move some variables from melee_attack to attackRobert Burnham2011-11-041-8/+0
* | Remove extra_noise; replace last instances with noise_factorRobert Burnham2011-11-041-2/+0
* | Change player_weapon_affects god to player_weapon_upsets_godRobert Burnham2011-11-041-1/+1
* | Merge branch 'master' into unified_combat_control with help of -X patienceSamuel Bronson2011-11-041-4/+6
|\|
| * Re-retier some DS muts, add two new mutations: Foul Stench and Ignite BloodChris Campbell2011-10-311-0/+1
| * Use proper type declarations for brand_type.Adam Borowski2011-10-311-4/+5
* | Inline the cotents of the wasp_paralyse_defender functionRobert Burnham2011-11-021-3/+1
* | Remove another previously-removed methodRobert Burnham2011-11-021-1/+0
* | Remove prevoiusly-removed melee_attack method and some whitespaceRobert Burnham2011-11-021-1/+0
* | Rename player_check_weapon_effectsRobert Burnham2011-11-021-1/+1
* | Move move_stairs to misc.ccRobert Burnham2011-11-021-3/+0
* | Rename methods handling Spiny and Passive FreezeRobert Burnham2011-11-011-3/+6
* | Remove 2 deprecated functionsRobert Burnham2011-11-011-2/+0
* | Remove mons_announce_dud_hitRobert Burnham2011-11-011-1/+0
* | Unify announce_hit methodsRobert Burnham2011-11-011-2/+1
* | Move modify_blood_amount to attackRobert Burnham2011-11-011-1/+0
* | Fix build issues stemming from mergeRobert Burnham2011-10-261-20/+4
* | Merge master into unified_combat_controlRobert Burnham2011-10-261-2/+1
* | Merge branch 'master' into unified_combat_controlRobert Burnham2011-10-251-10/+25
|\|
| * Rewrite the melee reaping brand.Adam Borowski2011-09-131-1/+2
| * Clean up all the old mimic code.Raphael Langella2011-09-051-1/+0
* | Get basic melee combat working, fix monster energy usageRobert Burnham2011-10-251-1/+0
* | 4 month old local changes...they look good?Robert Burnham2011-10-211-1/+0
* | mon_attack_flavour => attack_flavourRobert Burnham2011-06-211-9/+9
* | Massive (partial) conversion to new combat systemRobert Burnham2011-06-151-6/+4
* | Begin to unify player_attack and monster_attackRobert Burnham2011-06-031-1/+1
* | Remove mons_perform_attackRobert Burnham2011-05-271-1/+0
* | Merge mons_attack_you and mons_attack_mons into monster_attackRobert Burnham2011-05-131-2/+1
* | Move stab-properties from attack class to melee_attack classRobert Burnham2011-05-121-0/+3
* | Collapse player_apply_attack_delay into calc_attack_delayRobert Burnham2011-05-121-3/+0
* | Group and organize melee_attack methodsRobert Burnham2011-04-291-2/+2
* | Merge player_calc_hit_damage and mons_calc_damageRobert Burnham2011-04-291-2/+0
* | Undo revert, fix a variable mistyping, misc changesRobert Burnham2011-04-291-2/+3
* | Externalize monster attack rounds to fight.ccRobert Burnham2011-04-271-2/+2
* | Merge several player/monster diverged methodsRobert Burnham2011-04-251-3/+5
* | Move _steal_item out of melee_classRobert Burnham2011-04-191-1/+0
* | Clean up removal of mons_self_destructsRobert Burnham2011-04-181-4/+0
* | Update TODOsRobert Burnham2011-04-141-0/+2
* | Remove mons_check_attack_percievedRobert Burnham2011-04-141-1/+0
* | Fix compile issuesRobert Burnham2011-04-131-1/+1
* | Crude merge of [player|monster]_apply_defender_acRobert Burnham2011-04-131-3/+2
* | Generalize mons_attack_warded_offRobert Burnham2011-04-131-1/+1
* | Will I ever stop with TODO's? Who knowsRobert Burnham2011-04-131-1/+0
* | Remove attack_number from melee_attack constructor parametersRobert Burnham2011-04-121-2/+1
* | do_trample => do_knockback(bool trample)Robert Burnham2011-04-121-1/+1
* | Move melee_combat::test_melee_hitRobert Burnham2011-04-121-1/+1