From a726af2dbdb599619253f46cbaa96e1ce3ba5e61 Mon Sep 17 00:00:00 2001 From: b3yond Date: Wed, 21 Dec 2016 14:36:34 +0100 Subject: [PATCH] merge --- README.md | 0 code/__init__.py | 0 code/augmentations.py | 0 code/editor.py | 0 code/enemies.py | 0 code/game.py | 0 code/items.py | 0 code/old_functions.py | 0 images/augmentations/artificial_leg.gif | Bin images/augmentations/blessed_by_luck.gif | Bin images/augmentations/cosmetic_surgery.gif | Bin images/augmentations/eye_processor.gif | Bin images/augmentations/fear_blocker.gif | Bin images/augmentations/genetic_surgery.gif | Bin images/augmentations/kevlar_implant.gif | Bin images/augmentations/learning_software.gif | Bin images/augmentations/reflex_chip.gif | Bin images/augmentations/wallhack.gif | Bin images/characters/1one.gif | Bin images/characters/2two.gif | Bin images/characters/3three.gif | Bin images/characters/4four.gif | Bin images/characters/5five.gif | Bin images/characters/6six.gif | Bin images/characters/7seven.gif | Bin images/characters/8eight.gif | Bin images/characters/9nine.gif | Bin images/characters/angel.gif | Bin images/characters/player.gif | Bin images/characters/vampire.gif | Bin images/characters/werewolf.gif | Bin images/charwinexample.gif | Bin images/charwinexample.xcf | Bin images/fields/0leer.gif | Bin images/fields/barricada.gif | Bin images/fields/door.gif | Bin images/fields/loot.gif | Bin images/fields/treasure.gif | Bin images/fields/wall.gif | Bin images/guns/glock.gif | Bin images/guns/kalaschnikow.gif | Bin images/guns/lmg.gif | Bin images/guns/m4carbine.gif | Bin images/guns/p90.gif | Bin images/guns/sawnoff.gif | Bin images/guns/shotgun.gif | Bin images/guns/sniper.gif | Bin images/guns/uzi.gif | Bin images/kreis.gif | Bin images/panels/charwinbackground.gif | Bin images/panels/consolebackground.gif | Bin images/panels/emptyfields.gif | Bin images/panels/inventorybackground.gif | Bin images/panels/midpanel.gif | Bin images/panels/sidepanel.gif | Bin images/panels/spellpanel.gif | Bin images/panels/textpanel.gif | Bin images/panels2/augframe.gif | Bin images/panels2/backbutton.gif | Bin images/panels2/charwinbackground.gif | Bin images/panels2/consolebackground.gif | Bin images/panels2/emptyfields.gif | Bin images/panels2/highpanel.gif | Bin images/panels2/inventorybackground.gif | Bin images/panels2/leftpanel.gif | Bin images/panels2/rightmidpanel.gif | Bin images/panels2/spellbutton.gif | Bin images/panels2/textpanel.gif | Bin images/races/Angel.gif | Bin images/races/Golem.gif | Bin images/races/Vampire.gif | Bin images/races/Werewolf.gif | Bin images/swords/baton.gif | Bin images/swords/claws.gif | Bin images/swords/claymore.gif | Bin images/swords/katana.gif | Bin images/swords/knife.gif | Bin images/swords/longsword.gif | Bin images/swords/mace.gif | Bin images/swords/nunchaku.gif | Bin images/swords/shortsword.gif | Bin images/swords/silverclaws.gif | Bin images/swords/silverdagger.gif | Bin images/swords/silversword.gif | Bin images/swords/whip.gif | Bin missions/H14 | 0 missions/Sewers | 0 missions/test | 0 notes/Magic.txt | 0 notes/Notizen.txt | 0 resources/enemies | 0 resources/guns | 0 resources/swords | 0 93 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 code/__init__.py mode change 100644 => 100755 code/augmentations.py mode change 100644 => 100755 code/editor.py mode change 100644 => 100755 code/enemies.py mode change 100644 => 100755 code/game.py mode change 100644 => 100755 code/items.py mode change 100644 => 100755 code/old_functions.py mode change 100644 => 100755 images/augmentations/artificial_leg.gif mode change 100644 => 100755 images/augmentations/blessed_by_luck.gif mode change 100644 => 100755 images/augmentations/cosmetic_surgery.gif mode change 100644 => 100755 images/augmentations/eye_processor.gif mode change 100644 => 100755 images/augmentations/fear_blocker.gif mode change 100644 => 100755 images/augmentations/genetic_surgery.gif mode change 100644 => 100755 images/augmentations/kevlar_implant.gif mode change 100644 => 100755 images/augmentations/learning_software.gif mode change 100644 => 100755 images/augmentations/reflex_chip.gif mode change 100644 => 100755 images/augmentations/wallhack.gif mode change 100644 => 100755 images/characters/1one.gif mode change 100644 => 100755 images/characters/2two.gif mode change 100644 => 100755 images/characters/3three.gif mode change 100644 => 100755 images/characters/4four.gif mode change 100644 => 100755 images/characters/5five.gif mode change 100644 => 100755 images/characters/6six.gif mode change 100644 => 100755 images/characters/7seven.gif mode change 100644 => 100755 images/characters/8eight.gif mode change 100644 => 100755 images/characters/9nine.gif mode change 100644 => 100755 images/characters/angel.gif mode change 100644 => 100755 images/characters/player.gif mode change 100644 => 100755 images/characters/vampire.gif mode change 100644 => 100755 images/characters/werewolf.gif mode change 100644 => 100755 images/charwinexample.gif mode change 100644 => 100755 images/charwinexample.xcf mode change 100644 => 100755 images/fields/0leer.gif mode change 100644 => 100755 images/fields/barricada.gif mode change 100644 => 100755 images/fields/door.gif mode change 100644 => 100755 images/fields/loot.gif mode change 100644 => 100755 images/fields/treasure.gif mode change 100644 => 100755 images/fields/wall.gif mode change 100644 => 100755 images/guns/glock.gif mode change 100644 => 100755 images/guns/kalaschnikow.gif mode change 100644 => 100755 images/guns/lmg.gif mode change 100644 => 100755 images/guns/m4carbine.gif mode change 100644 => 100755 images/guns/p90.gif mode change 100644 => 100755 images/guns/sawnoff.gif mode change 100644 => 100755 images/guns/shotgun.gif mode change 100644 => 100755 images/guns/sniper.gif mode change 100644 => 100755 images/guns/uzi.gif mode change 100644 => 100755 images/kreis.gif mode change 100644 => 100755 images/panels/charwinbackground.gif mode change 100644 => 100755 images/panels/consolebackground.gif mode change 100644 => 100755 images/panels/emptyfields.gif mode change 100644 => 100755 images/panels/inventorybackground.gif mode change 100644 => 100755 images/panels/midpanel.gif mode change 100644 => 100755 images/panels/sidepanel.gif mode change 100644 => 100755 images/panels/spellpanel.gif mode change 100644 => 100755 images/panels/textpanel.gif mode change 100644 => 100755 images/panels2/augframe.gif mode change 100644 => 100755 images/panels2/backbutton.gif mode change 100644 => 100755 images/panels2/charwinbackground.gif mode change 100644 => 100755 images/panels2/consolebackground.gif mode change 100644 => 100755 images/panels2/emptyfields.gif mode change 100644 => 100755 images/panels2/highpanel.gif mode change 100644 => 100755 images/panels2/inventorybackground.gif mode change 100644 => 100755 images/panels2/leftpanel.gif mode change 100644 => 100755 images/panels2/rightmidpanel.gif mode change 100644 => 100755 images/panels2/spellbutton.gif mode change 100644 => 100755 images/panels2/textpanel.gif mode change 100644 => 100755 images/races/Angel.gif mode change 100644 => 100755 images/races/Golem.gif mode change 100644 => 100755 images/races/Vampire.gif mode change 100644 => 100755 images/races/Werewolf.gif mode change 100644 => 100755 images/swords/baton.gif mode change 100644 => 100755 images/swords/claws.gif mode change 100644 => 100755 images/swords/claymore.gif mode change 100644 => 100755 images/swords/katana.gif mode change 100644 => 100755 images/swords/knife.gif mode change 100644 => 100755 images/swords/longsword.gif mode change 100644 => 100755 images/swords/mace.gif mode change 100644 => 100755 images/swords/nunchaku.gif mode change 100644 => 100755 images/swords/shortsword.gif mode change 100644 => 100755 images/swords/silverclaws.gif mode change 100644 => 100755 images/swords/silverdagger.gif mode change 100644 => 100755 images/swords/silversword.gif mode change 100644 => 100755 images/swords/whip.gif mode change 100644 => 100755 missions/H14 mode change 100644 => 100755 missions/Sewers mode change 100644 => 100755 missions/test mode change 100644 => 100755 notes/Magic.txt mode change 100644 => 100755 notes/Notizen.txt mode change 100644 => 100755 resources/enemies mode change 100644 => 100755 resources/guns mode change 100644 => 100755 resources/swords diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/code/__init__.py b/code/__init__.py old mode 100644 new mode 100755 diff --git a/code/augmentations.py b/code/augmentations.py old mode 100644 new mode 100755 diff --git a/code/editor.py b/code/editor.py old mode 100644 new mode 100755 diff --git a/code/enemies.py b/code/enemies.py old mode 100644 new mode 100755 diff --git a/code/game.py b/code/game.py old mode 100644 new mode 100755 diff --git a/code/items.py b/code/items.py old mode 100644 new mode 100755 diff --git a/code/old_functions.py b/code/old_functions.py old mode 100644 new mode 100755 diff --git a/images/augmentations/artificial_leg.gif b/images/augmentations/artificial_leg.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/blessed_by_luck.gif b/images/augmentations/blessed_by_luck.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/cosmetic_surgery.gif b/images/augmentations/cosmetic_surgery.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/eye_processor.gif b/images/augmentations/eye_processor.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/fear_blocker.gif b/images/augmentations/fear_blocker.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/genetic_surgery.gif b/images/augmentations/genetic_surgery.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/kevlar_implant.gif b/images/augmentations/kevlar_implant.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/learning_software.gif b/images/augmentations/learning_software.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/reflex_chip.gif b/images/augmentations/reflex_chip.gif old mode 100644 new mode 100755 diff --git a/images/augmentations/wallhack.gif b/images/augmentations/wallhack.gif old mode 100644 new mode 100755 diff --git a/images/characters/1one.gif b/images/characters/1one.gif old mode 100644 new mode 100755 diff --git a/images/characters/2two.gif b/images/characters/2two.gif old mode 100644 new mode 100755 diff --git a/images/characters/3three.gif b/images/characters/3three.gif old mode 100644 new mode 100755 diff --git a/images/characters/4four.gif b/images/characters/4four.gif old mode 100644 new mode 100755 diff --git a/images/characters/5five.gif b/images/characters/5five.gif old mode 100644 new mode 100755 diff --git a/images/characters/6six.gif b/images/characters/6six.gif old mode 100644 new mode 100755 diff --git a/images/characters/7seven.gif b/images/characters/7seven.gif old mode 100644 new mode 100755 diff --git a/images/characters/8eight.gif b/images/characters/8eight.gif old mode 100644 new mode 100755 diff --git a/images/characters/9nine.gif b/images/characters/9nine.gif old mode 100644 new mode 100755 diff --git a/images/characters/angel.gif b/images/characters/angel.gif old mode 100644 new mode 100755 diff --git a/images/characters/player.gif b/images/characters/player.gif old mode 100644 new mode 100755 diff --git a/images/characters/vampire.gif b/images/characters/vampire.gif old mode 100644 new mode 100755 diff --git a/images/characters/werewolf.gif b/images/characters/werewolf.gif old mode 100644 new mode 100755 diff --git a/images/charwinexample.gif b/images/charwinexample.gif old mode 100644 new mode 100755 diff --git a/images/charwinexample.xcf b/images/charwinexample.xcf old mode 100644 new mode 100755 diff --git a/images/fields/0leer.gif b/images/fields/0leer.gif old mode 100644 new mode 100755 diff --git a/images/fields/barricada.gif b/images/fields/barricada.gif old mode 100644 new mode 100755 diff --git a/images/fields/door.gif b/images/fields/door.gif old mode 100644 new mode 100755 diff --git a/images/fields/loot.gif b/images/fields/loot.gif old mode 100644 new mode 100755 diff --git a/images/fields/treasure.gif b/images/fields/treasure.gif old mode 100644 new mode 100755 diff --git a/images/fields/wall.gif b/images/fields/wall.gif old mode 100644 new mode 100755 diff --git a/images/guns/glock.gif b/images/guns/glock.gif old mode 100644 new mode 100755 diff --git a/images/guns/kalaschnikow.gif b/images/guns/kalaschnikow.gif old mode 100644 new mode 100755 diff --git a/images/guns/lmg.gif b/images/guns/lmg.gif old mode 100644 new mode 100755 diff --git a/images/guns/m4carbine.gif b/images/guns/m4carbine.gif old mode 100644 new mode 100755 diff --git a/images/guns/p90.gif b/images/guns/p90.gif old mode 100644 new mode 100755 diff --git a/images/guns/sawnoff.gif b/images/guns/sawnoff.gif old mode 100644 new mode 100755 diff --git a/images/guns/shotgun.gif b/images/guns/shotgun.gif old mode 100644 new mode 100755 diff --git a/images/guns/sniper.gif b/images/guns/sniper.gif old mode 100644 new mode 100755 diff --git a/images/guns/uzi.gif b/images/guns/uzi.gif old mode 100644 new mode 100755 diff --git a/images/kreis.gif b/images/kreis.gif old mode 100644 new mode 100755 diff --git a/images/panels/charwinbackground.gif b/images/panels/charwinbackground.gif old mode 100644 new mode 100755 diff --git a/images/panels/consolebackground.gif b/images/panels/consolebackground.gif old mode 100644 new mode 100755 diff --git a/images/panels/emptyfields.gif b/images/panels/emptyfields.gif old mode 100644 new mode 100755 diff --git a/images/panels/inventorybackground.gif b/images/panels/inventorybackground.gif old mode 100644 new mode 100755 diff --git a/images/panels/midpanel.gif b/images/panels/midpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels/sidepanel.gif b/images/panels/sidepanel.gif old mode 100644 new mode 100755 diff --git a/images/panels/spellpanel.gif b/images/panels/spellpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels/textpanel.gif b/images/panels/textpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels2/augframe.gif b/images/panels2/augframe.gif old mode 100644 new mode 100755 diff --git a/images/panels2/backbutton.gif b/images/panels2/backbutton.gif old mode 100644 new mode 100755 diff --git a/images/panels2/charwinbackground.gif b/images/panels2/charwinbackground.gif old mode 100644 new mode 100755 diff --git a/images/panels2/consolebackground.gif b/images/panels2/consolebackground.gif old mode 100644 new mode 100755 diff --git a/images/panels2/emptyfields.gif b/images/panels2/emptyfields.gif old mode 100644 new mode 100755 diff --git a/images/panels2/highpanel.gif b/images/panels2/highpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels2/inventorybackground.gif b/images/panels2/inventorybackground.gif old mode 100644 new mode 100755 diff --git a/images/panels2/leftpanel.gif b/images/panels2/leftpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels2/rightmidpanel.gif b/images/panels2/rightmidpanel.gif old mode 100644 new mode 100755 diff --git a/images/panels2/spellbutton.gif b/images/panels2/spellbutton.gif old mode 100644 new mode 100755 diff --git a/images/panels2/textpanel.gif b/images/panels2/textpanel.gif old mode 100644 new mode 100755 diff --git a/images/races/Angel.gif b/images/races/Angel.gif old mode 100644 new mode 100755 diff --git a/images/races/Golem.gif b/images/races/Golem.gif old mode 100644 new mode 100755 diff --git a/images/races/Vampire.gif b/images/races/Vampire.gif old mode 100644 new mode 100755 diff --git a/images/races/Werewolf.gif b/images/races/Werewolf.gif old mode 100644 new mode 100755 diff --git a/images/swords/baton.gif b/images/swords/baton.gif old mode 100644 new mode 100755 diff --git a/images/swords/claws.gif b/images/swords/claws.gif old mode 100644 new mode 100755 diff --git a/images/swords/claymore.gif b/images/swords/claymore.gif old mode 100644 new mode 100755 diff --git a/images/swords/katana.gif b/images/swords/katana.gif old mode 100644 new mode 100755 diff --git a/images/swords/knife.gif b/images/swords/knife.gif old mode 100644 new mode 100755 diff --git a/images/swords/longsword.gif b/images/swords/longsword.gif old mode 100644 new mode 100755 diff --git a/images/swords/mace.gif b/images/swords/mace.gif old mode 100644 new mode 100755 diff --git a/images/swords/nunchaku.gif b/images/swords/nunchaku.gif old mode 100644 new mode 100755 diff --git a/images/swords/shortsword.gif b/images/swords/shortsword.gif old mode 100644 new mode 100755 diff --git a/images/swords/silverclaws.gif b/images/swords/silverclaws.gif old mode 100644 new mode 100755 diff --git a/images/swords/silverdagger.gif b/images/swords/silverdagger.gif old mode 100644 new mode 100755 diff --git a/images/swords/silversword.gif b/images/swords/silversword.gif old mode 100644 new mode 100755 diff --git a/images/swords/whip.gif b/images/swords/whip.gif old mode 100644 new mode 100755 diff --git a/missions/H14 b/missions/H14 old mode 100644 new mode 100755 diff --git a/missions/Sewers b/missions/Sewers old mode 100644 new mode 100755 diff --git a/missions/test b/missions/test old mode 100644 new mode 100755 diff --git a/notes/Magic.txt b/notes/Magic.txt old mode 100644 new mode 100755 diff --git a/notes/Notizen.txt b/notes/Notizen.txt old mode 100644 new mode 100755 diff --git a/resources/enemies b/resources/enemies old mode 100644 new mode 100755 diff --git a/resources/guns b/resources/guns old mode 100644 new mode 100755 diff --git a/resources/swords b/resources/swords old mode 100644 new mode 100755