merge

Browse source

...

This commit is contained in:

b3yond 2016-12-21 14:36:34 +01:00

parent d364df1911

commit a726af2dbd

93 changed files with 0 additions and 0 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

0

README.md Normal file → Executable file

Unescape Escape View file

0

code/__init__.py Normal file → Executable file

Unescape Escape View file

0

code/augmentations.py Normal file → Executable file

Unescape Escape View file

0

code/editor.py Normal file → Executable file

Unescape Escape View file

0

code/enemies.py Normal file → Executable file

Unescape Escape View file

0

code/game.py Normal file → Executable file

Unescape Escape View file

0

code/items.py Normal file → Executable file

Unescape Escape View file

0

code/old_functions.py Normal file → Executable file

Unescape Escape View file

0

images/augmentations/artificial_leg.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

images/augmentations/blessed_by_luck.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 741 B After Width:  |  Height:  |  Size: 741 B

0

images/augmentations/cosmetic_surgery.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

images/augmentations/eye_processor.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

images/augmentations/fear_blocker.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

images/augmentations/genetic_surgery.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

images/augmentations/kevlar_implant.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

images/augmentations/learning_software.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

images/augmentations/reflex_chip.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/augmentations/wallhack.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 189 B After Width:  |  Height:  |  Size: 189 B

0

images/characters/1one.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/2two.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/3three.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/4four.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/5five.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/6six.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/7seven.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/8eight.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/9nine.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/angel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/player.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/vampire.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/characters/werewolf.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/charwinexample.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 16 KiB

0

images/charwinexample.xcf Normal file → Executable file

Unescape Escape View file

0

images/fields/0leer.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 58 B After Width:  |  Height:  |  Size: 58 B

0

images/fields/barricada.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/fields/door.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/fields/loot.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/fields/treasure.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/fields/wall.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/glock.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 932 B After Width:  |  Height:  |  Size: 932 B

0

images/guns/kalaschnikow.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/lmg.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/m4carbine.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/p90.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 972 B After Width:  |  Height:  |  Size: 972 B

0

images/guns/sawnoff.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,020 B After Width:  |  Height:  |  Size: 1,020 B

0

images/guns/shotgun.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/sniper.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/guns/uzi.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 972 B After Width:  |  Height:  |  Size: 972 B

0

images/kreis.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1 KiB

0

images/panels/charwinbackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

0

images/panels/consolebackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 256 B

0

images/panels/emptyfields.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 585 B After Width:  |  Height:  |  Size: 585 B

0

images/panels/inventorybackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

0

images/panels/midpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 94 KiB After Width:  |  Height:  |  Size: 94 KiB

0

images/panels/sidepanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 41 KiB After Width:  |  Height:  |  Size: 41 KiB

0

images/panels/spellpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

0

images/panels/textpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4 KiB After Width:  |  Height:  |  Size: 4 KiB

0

images/panels2/augframe.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 691 B After Width:  |  Height:  |  Size: 691 B

0

images/panels2/backbutton.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

images/panels2/charwinbackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

images/panels2/consolebackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 252 B After Width:  |  Height:  |  Size: 252 B

0

images/panels2/emptyfields.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 998 B After Width:  |  Height:  |  Size: 998 B

0

images/panels2/highpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 208 KiB After Width:  |  Height:  |  Size: 208 KiB

0

images/panels2/inventorybackground.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 29 KiB

0

images/panels2/leftpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 26 KiB

0

images/panels2/rightmidpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 36 KiB

0

images/panels2/spellbutton.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

0

images/panels2/textpanel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4 KiB After Width:  |  Height:  |  Size: 4 KiB

0

images/races/Angel.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

images/races/Golem.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/races/Vampire.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/races/Werewolf.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/swords/baton.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 894 B After Width:  |  Height:  |  Size: 894 B

0

images/swords/claws.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 933 B After Width:  |  Height:  |  Size: 933 B

0

images/swords/claymore.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 951 B After Width:  |  Height:  |  Size: 951 B

0

images/swords/katana.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 972 B After Width:  |  Height:  |  Size: 972 B

0

images/swords/knife.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/swords/longsword.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 982 B After Width:  |  Height:  |  Size: 982 B

0

images/swords/mace.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 950 B After Width:  |  Height:  |  Size: 950 B

0

images/swords/nunchaku.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/swords/shortsword.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 987 B After Width:  |  Height:  |  Size: 987 B

0

images/swords/silverclaws.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 907 B After Width:  |  Height:  |  Size: 907 B

0

images/swords/silverdagger.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

images/swords/silversword.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 958 B After Width:  |  Height:  |  Size: 958 B

0

images/swords/whip.gif Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 897 B After Width:  |  Height:  |  Size: 897 B

0

missions/H14 Normal file → Executable file

Unescape Escape View file

0

missions/Sewers Normal file → Executable file

Unescape Escape View file

0

missions/test Normal file → Executable file

Unescape Escape View file

0

notes/Magic.txt Normal file → Executable file

Unescape Escape View file

0

notes/Notizen.txt Normal file → Executable file

Unescape Escape View file

0

resources/enemies Normal file → Executable file

Unescape Escape View file

0

resources/guns Normal file → Executable file

Unescape Escape View file

0

resources/swords Normal file → Executable file

Unescape Escape View file