Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge with projecthamster #1

Merged
merged 3 commits into from
Jul 9, 2016
Merged

merge with projecthamster #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb03397
Merge pull request #11 from rapgro/master
Dec 25, 2015
51f8f3d
knits (2to3 rendered some bugs)
Dec 25, 2015
2e75f50
move apx icon to share/icons/hicolor/scalable/ closes #8
Dec 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apx/board.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import itertools

from . import board
from . import sprites

from .lib import game_utils
Expand Down
4 changes: 2 additions & 2 deletions apx/lib/graphics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,9 +680,9 @@ def log(self, *lines):
"""will print out the lines in console if debug is enabled for the
specific sprite"""
if getattr(self, "debug", False):
print(dt.datetime.now().time(), end=' ')
print(dt.datetime.now().time())
for line in lines:
print(line, end=' ')
print(line)
print()

def _add(self, sprite, index = None):
Expand Down
2 changes: 1 addition & 1 deletion data/apx.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Type=Application
Terminal=false
Name=APX
Comment=APX - a QIX clone
Icon=/usr/share/apx/icons/apx.svg
Icon=/usr/share/icons/hicolor/scalable/apx.svg
Exec=/usr/bin/apx
Categories=GNOME;GTK;Games;
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def build_module(self, module, module_file, package):
packages=['apx', 'apx.lib'],
scripts=['bin/apx'],
data_files= [
('share/apx/icons', ['data/apx.svg']),
('share/icons/hicolor/scalable', ['data/apx.svg']),
('share/fonts/04b03', ['data/04b03.ttf', 'data/04b03_LICENSE',]),
('share/apx', ['data/apx.sqlite']),
('share/appdata', ['data/apx.appdata.xml']),
Expand Down