Merge remote-tracking branch 'jl8e/attacks' into attacks
Start attacks branch.
Merge remote-tracking branch 'jl8e/attacks' into attacks
Updated attack logic from jl8e.
Merge remote-tracking branch 'jl8e/attacks' into attacks
Merging new changes to test commit.
Corrected unit test
- Changed BMAttack test cases to use BMGame instead of DummyGame
- Updated nomenclature in DummyGame to match BMGame
- Added shortcuts AttackerAttackDieArray to give direct access to attacking dice
Testing jl8e's updated changes
Merge remote-tracking branch 'upstream/master'
Update master to upstream/master.
Merged upstream/master so that the pull request back to buttonmen-dev/buttonmen will work.
Integrated BMGame into BMAttack->commit_attack()
Continued integration of BMGame into BMAttack. Added ownerObject property to BMContainer and BMDie objects.
Bring master branch up to date with attacks branch for testing on pagoda
Replaced any calls in BMAttack to the inner structure of BMGame->activeDieArrayArray with accessors
Removed one useless call to collect_helpers() in BMAttackPowerTest
Added two more accessors to attackerPlayerIdx and defenderPlayerIdx, and tidied up test code to use accessors
Added required file includes to test files
Reintroduced dummy tests for BMContainer
Reintroduced dummy tests for BMDie
Corrected file dependencies
Reintroduced dummy-dependent unit tests for BMSwingDie
Reintroduced dummy-dependent unit tests for BMAttack and BMAttackPower
Reintroduced a few more dummy-dependent unit tests for BMAttack and BMAttackPower