librelist archives

« back to archive

[boubateam/PyWeek-12] c12221: Merge branch 'refs/heads/master' of git@github.com...

[boubateam/PyWeek-12] c12221: Merge branch 'refs/heads/master' of git@github.com...

From:
Date:
2011-04-08 @ 19:39
Branch: refs/heads/master
Home:   https://github.com/boubateam/PyWeek-12

Commit: c122215f39562920ffb8c3171a0f2504af187e9e
    
https://github.com/boubateam/PyWeek-12/commit/c122215f39562920ffb8c3171a0f2504af187e9e
Author: TOTOleHero <thomas.lecarpentier@gmail.com>
Date:   2011-04-08 (Fri, 08 Apr 2011)

Changed paths:
  A COPYING.txt
  M README.txt
  M data/credits.png
  R data/fonts/DIGITALDREAM.ttf
  A data/fonts/DejaVuSans.ttf
  R data/fonts/LiberationSans-Regular.ttf
  R data/fonts/ace.ttf
  R data/fonts/acmesa.ttf
  A data/fonts/digitaldream.ttf
  R data/fonts/genotype.ttf
  M gamelib/credits.py
  M gamelib/data.py
  M gamelib/director.py
  M gamelib/game.py
  M gamelib/gameover.py
  M gamelib/howto.py
  M gamelib/intro.py
  M gamelib/level.py
  M gamelib/menu.py

Log Message:
-----------
Merge branch 'refs/heads/master' of git@github.com:boubateam/PyWeek-12.git


Commit: 110e7609b7521d3cb68625658f69f2ca1f60f8b1
    
https://github.com/boubateam/PyWeek-12/commit/110e7609b7521d3cb68625658f69f2ca1f60f8b1
Author: TOTOleHero <thomas.lecarpentier@gmail.com>
Date:   2011-04-08 (Fri, 08 Apr 2011)

Changed paths:
  M gamelib/level.py

Log Message:
-----------
Merge branch 'refs/heads/master' of git@github.com:boubateam/PyWeek-12.git


Commit: 0b9c50d36e0f09b874d4778c1bff0e56c73b3c52
    
https://github.com/boubateam/PyWeek-12/commit/0b9c50d36e0f09b874d4778c1bff0e56c73b3c52
Author: TOTOleHero <thomas.lecarpentier@gmail.com>
Date:   2011-04-08 (Fri, 08 Apr 2011)

Changed paths:
  A data/themes/alien-chat/background.ogg
  A data/themes/alien-chat/boss.png
  A data/themes/alien-chat/button-playable-1.ogg
  A data/themes/alien-chat/button-playable-2.ogg
  A data/themes/alien-chat/button-playable-3.ogg
  A data/themes/alien-chat/button-playable-4.ogg
  A data/themes/alien-chat/button-playable-5.ogg
  A data/themes/alien-chat/button-playable-6.ogg
  A data/themes/alien-chat/button-playable-7.ogg
  A data/themes/alien-chat/button-playable-8.ogg
  A data/themes/alien-chat/button-playable-9.ogg
  A data/themes/alien-chat/button-sequence-1.ogg
  A data/themes/alien-chat/button-sequence-2.ogg
  A data/themes/alien-chat/button-sequence-3.ogg
  A data/themes/alien-chat/button-sequence-4.ogg
  A data/themes/alien-chat/button-sequence-5.ogg
  A data/themes/alien-chat/button-sequence-6.ogg
  A data/themes/alien-chat/button-sequence-7.ogg
  A data/themes/alien-chat/button-sequence-8.ogg
  A data/themes/alien-chat/button-sequence-9.ogg
  A data/themes/alien-chat/pre-background.ogg

Log Message:
-----------
Add new sounds for level 2


Commit: 1faf1215eab6fb9e12fcbe3d06291bcb12dc3d85
    
https://github.com/boubateam/PyWeek-12/commit/1faf1215eab6fb9e12fcbe3d06291bcb12dc3d85
Author: TOTOleHero <thomas.lecarpentier@gmail.com>
Date:   2011-04-08 (Fri, 08 Apr 2011)

Changed paths:
  A data/fonts/digitaldream pizzadude.dk License.txt

Log Message:
-----------
Add font license for digitaldrean.ttf


Compare: https://github.com/boubateam/PyWeek-12/compare/21e1917...1faf121