Merge remote-tracking branch 'origin/master' into Physics

Browse Source

Conflicts:
	src/game/Game/LevelSystem.cpp

...

This commit is contained in:

viktorljung

2015-10-13 17:32:07 +02:00

parent f86dc9a530 4857e387ad

commit 40054cb40f

62 changed files with 628 additions and 147 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/Textures/GUI/Numbers/Background.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

assets/Textures/GUI/Numbers/Blocky/N0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N8.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/Blocky/N9.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

assets/Textures/GUI/Numbers/N0.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N1.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N2.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N3.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N4.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.3 KiB

assets/Textures/GUI/Numbers/N5.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N6.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N7.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.1 KiB

assets/Textures/GUI/Numbers/N8.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/N9.png

Regular → Executable

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.2 KiB

assets/Textures/GUI/Numbers/Squid/N0.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/GUI/Numbers/Squid/N1.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

assets/Textures/GUI/Numbers/Squid/N2.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/GUI/Numbers/Squid/N3.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

assets/Textures/GUI/Numbers/Squid/N4.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

assets/Textures/GUI/Numbers/Squid/N5.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/GUI/Numbers/Squid/N6.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/GUI/Numbers/Squid/N7.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

assets/Textures/GUI/Numbers/Squid/N8.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/GUI/Numbers/Squid/N9.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

assets/Textures/PowerUps/Friends.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

assets/Textures/PowerUps/InkBlaster.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

assets/Textures/PowerUps/RealeaseTheKraken.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

assets/Textures/PowerUps/Saviour.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

assets/Textures/PowerUps/Sticky.png

Executable

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB