ocadotechnology / aimmo / 292

Builds Branch Commit Type Ran Committer Via Coverage
292 joshuablake-multiple_games Merge branch 'master' into joshuablake-multiple_games # Conflicts: # players/urls.py push Spycho travis-ci pending completion   set done
291 joshuablake-multiple_games pass through settings to map generation push Spycho travis-ci pending completion   set done
290 joshuablake-multiple_games fixed tests push Spycho travis-ci pending completion   set done
289 master Merge pull request #191 from CelineBoudier/rm-staff-required Rm staff required push web-flow travis-ci pending completion   set done
288 master Non-admin login required for AIMMO (pages are protected) - fixes #190 Pull #191 web-flow travis-ci pending completion   set done
287 master Non-admin login required for AIMMO (pages are protected) - fixes #190 Pull #191 web-flow travis-ci pending completion   set done
284 master Merge pull request #184 from adstastic/aimmo-easy-fix Updated Socket.io source push web-flow travis-ci pending completion   set done
283 master cdn.socket.io no longer available - changed socket.io source to cdnjs Pull #184 web-flow travis-ci pending completion   set done
282 master Update README.md push web-flow travis-ci pending completion   set done
281 master Merge pull request #162 from ocadotechnology/pep8 Pep8 push web-flow travis-ci pending completion   set done
280 master fixed a couple of pep8 issues Pull #162 web-flow travis-ci pending completion   set done
279 pep8 fixed a couple of pep8 issues push Spycho travis-ci pending completion   set done
278 pep8 Merge branch 'pep8' of https://github.com/joshuablake/aimmo into joshuablake-pep8 Conflicts: aimmo-game-worker/simulation/world_map.py aimmo-game-worker/tests/simulation/test_world_map.py aimmo-game/simulation/avatar/fog_of_war.py example_pro... push Spycho travis-ci pending completion   set done
277 pep8 Merge branch 'pep8' of https://github.com/joshuablake/aimmo into joshuablake-pep8 Conflicts: aimmo-game-worker/simulation/world_map.py aimmo-game-worker/tests/simulation/test_world_map.py aimmo-game/simulation/avatar/fog_of_war.py example_pro... push Spycho travis-ci pending completion   set done
276 master Merge branch 'joshuablake-expansion' push Spycho travis-ci pending completion   set done