This is an automated email from the git hooks/post-receive script. detiste-guest pushed a commit to branch master in repository mrrescue.
commit ca211e08ecba68695d6c15e26d9074a126bddccc Author: Alexandre Detiste <[email protected]> Date: Sat Jan 21 11:45:29 2017 +0100 New upstream version 1.02e --- mrrescue/AnAL.lua => AnAL.lua | 0 README.md | 50 ++++++++++++++++ README.txt | 16 ----- mrrescue/TSerial.lua => TSerial.lua | 0 mrrescue/boss.lua => boss.lua | 0 mrrescue/charcoal.lua => charcoal.lua | 0 mrrescue/coalball.lua => coalball.lua | 0 conf.lua | 65 +++++++++++++++++++++ mrrescue/config.lua => config.lua | 0 {mrrescue/data => data}/ashes.png | Bin {mrrescue/data => data}/awards.png | Bin {mrrescue/data => data}/backgrounds/mountains.png | Bin {mrrescue/data => data}/backgrounds/night.png | Bin {mrrescue/data => data}/black_smoke.png | Bin {mrrescue/data => data}/black_smoke_small.png | Bin {mrrescue/data => data}/boldfont.png | Bin {mrrescue/data => data}/border.png | Bin {mrrescue/data => data}/boss_health.png | Bin {mrrescue/data => data}/captain_dialog.png | Bin {mrrescue/data => data}/captain_dialog_sad.png | Bin {mrrescue/data => data}/charcoal_bump.png | Bin {mrrescue/data => data}/charcoal_daze.png | Bin {mrrescue/data => data}/charcoal_daze_hit.png | Bin {mrrescue/data => data}/charcoal_daze_rage.png | Bin {mrrescue/data => data}/charcoal_idle.png | Bin {mrrescue/data => data}/charcoal_portrait.png | Bin {mrrescue/data => data}/charcoal_projectile.png | Bin {mrrescue/data => data}/charcoal_roll.png | Bin {mrrescue/data => data}/charcoal_roll_rage.png | Bin {mrrescue/data => data}/charcoal_shards.png | Bin {mrrescue/data => data}/charcoal_transform.png | Bin {mrrescue/data => data}/charcoal_transform_hit.png | Bin .../data => data}/charcoal_transform_rage.png | Bin {mrrescue/data => data}/charcoal_transition.png | Bin {mrrescue/data => data}/circles.png | Bin {mrrescue/data => data}/countdown.png | Bin {mrrescue/data => data}/door.png | Bin {mrrescue/data => data}/enemy_angryjumper_hit.png | Bin {mrrescue/data => data}/enemy_angryjumper_jump.png | Bin {mrrescue/data => data}/enemy_angrynormal_hit.png | Bin .../data => data}/enemy_angrynormal_recover.png | Bin {mrrescue/data => data}/enemy_angrynormal_run.png | Bin {mrrescue/data => data}/enemy_angryvolcano_hit.png | Bin {mrrescue/data => data}/enemy_angryvolcano_run.png | Bin .../data => data}/enemy_angryvolcano_shoot.png | Bin {mrrescue/data => data}/enemy_fireball.png | Bin {mrrescue/data => data}/enemy_healthbar.png | Bin {mrrescue/data => data}/enemy_jumper_hit.png | Bin {mrrescue/data => data}/enemy_jumper_jump.png | Bin {mrrescue/data => data}/enemy_jumper_recover.png | Bin {mrrescue/data => data}/enemy_normal_hit.png | Bin {mrrescue/data => data}/enemy_normal_recover.png | Bin {mrrescue/data => data}/enemy_normal_run.png | Bin {mrrescue/data => data}/enemy_thief_hit.png | Bin {mrrescue/data => data}/enemy_thief_recover.png | Bin {mrrescue/data => data}/enemy_thief_run.png | Bin {mrrescue/data => data}/enemy_volcano_hit.png | Bin {mrrescue/data => data}/enemy_volcano_run.png | Bin {mrrescue/data => data}/enemy_volcano_shoot.png | Bin {mrrescue/data => data}/exclamation.png | Bin {mrrescue/data => data}/fire_floor.png | Bin {mrrescue/data => data}/fire_wall.png | Bin {mrrescue/data => data}/fire_wall_small.png | Bin {mrrescue/data => data}/gasghost.png | Bin {mrrescue/data => data}/gasghost_hit.png | Bin .../data => data}/gasleak_angry_idle_shot.png | Bin {mrrescue/data => data}/gasleak_hit.png | Bin {mrrescue/data => data}/gasleak_idle.png | Bin {mrrescue/data => data}/gasleak_idle_shot.png | Bin {mrrescue/data => data}/gasleak_portrait.png | Bin {mrrescue/data => data}/gasleak_rage_idle.png | Bin {mrrescue/data => data}/gasleak_rage_idle_shot.png | Bin {mrrescue/data => data}/gasleak_rage_shot_walk.png | Bin {mrrescue/data => data}/gasleak_rage_walk.png | Bin {mrrescue/data => data}/gasleak_shot_walk.png | Bin {mrrescue/data => data}/gasleak_transition.png | Bin {mrrescue/data => data}/gasleak_walk.png | Bin {mrrescue/data => data}/highscore_panes.png | Bin {mrrescue/data => data}/howto.png | Bin {mrrescue/data => data}/hud.png | Bin {mrrescue/data => data}/hud2.png | Bin {mrrescue/data => data}/hud_people.png | Bin {mrrescue/data => data}/human_1_burn.png | Bin {mrrescue/data => data}/human_1_carry_left.png | Bin {mrrescue/data => data}/human_1_carry_right.png | Bin {mrrescue/data => data}/human_1_fly.png | Bin {mrrescue/data => data}/human_1_panic.png | Bin {mrrescue/data => data}/human_1_run.png | Bin {mrrescue/data => data}/human_2_burn.png | Bin {mrrescue/data => data}/human_2_carry_left.png | Bin {mrrescue/data => data}/human_2_carry_right.png | Bin {mrrescue/data => data}/human_2_fly.png | Bin {mrrescue/data => data}/human_2_panic.png | Bin {mrrescue/data => data}/human_2_run.png | Bin {mrrescue/data => data}/human_3_burn.png | Bin {mrrescue/data => data}/human_3_carry_left.png | Bin {mrrescue/data => data}/human_3_carry_right.png | Bin {mrrescue/data => data}/human_3_fly.png | Bin {mrrescue/data => data}/human_3_panic.png | Bin {mrrescue/data => data}/human_3_run.png | Bin {mrrescue/data => data}/human_4_burn.png | Bin {mrrescue/data => data}/human_4_carry_left.png | Bin {mrrescue/data => data}/human_4_carry_right.png | Bin {mrrescue/data => data}/human_4_fly.png | Bin {mrrescue/data => data}/human_4_panic.png | Bin {mrrescue/data => data}/human_4_run.png | Bin {mrrescue/data => data}/item_coolant.png | Bin {mrrescue/data => data}/item_regen.png | Bin {mrrescue/data => data}/item_reserve.png | Bin {mrrescue/data => data}/item_slots.png | Bin {mrrescue/data => data}/item_suit.png | Bin {mrrescue/data => data}/item_tank.png | Bin {mrrescue/data => data}/level_buildings.png | Bin {mrrescue/data => data}/light_fire.png | Bin {mrrescue/data => data}/light_fireball.png | Bin {mrrescue/data => data}/light_player.png | Bin {mrrescue/data => data}/lovesplashpixel.png | Bin {mrrescue/data => data}/magmahulk_jump.png | Bin {mrrescue/data => data}/magmahulk_jump_hit.png | Bin {mrrescue/data => data}/magmahulk_land.png | Bin {mrrescue/data => data}/magmahulk_land_hit.png | Bin {mrrescue/data => data}/magmahulk_portrait.png | Bin {mrrescue/data => data}/magmahulk_rage_jump.png | Bin {mrrescue/data => data}/magmahulk_rage_land.png | Bin {mrrescue/data => data}/menu_box.png | Bin {mrrescue/data => data}/overloaded_bar.png | Bin {mrrescue/data => data}/player_climb_down.png | Bin {mrrescue/data => data}/player_climb_up.png | Bin {mrrescue/data => data}/player_death.png | Bin {mrrescue/data => data}/player_gun.png | Bin {mrrescue/data => data}/player_running.png | Bin {mrrescue/data => data}/player_throw.png | Bin {mrrescue/data => data}/popup_text.png | Bin {mrrescue/data => data}/red_screen.png | Bin {mrrescue/data => data}/reserve_bar.png | Bin {mrrescue/data => data}/sfx/blip.wav | Bin {mrrescue/data => data}/sfx/bossjump.wav | Bin {mrrescue/data => data}/sfx/bundesliga.ogg | Bin {mrrescue/data => data}/sfx/confirm.wav | Bin {mrrescue/data => data}/sfx/countdown.wav | Bin {mrrescue/data => data}/sfx/crash.wav | Bin {mrrescue/data => data}/sfx/door.wav | Bin {mrrescue/data => data}/sfx/empty.wav | Bin {mrrescue/data => data}/sfx/endexplosion.wav | Bin {mrrescue/data => data}/sfx/enemydie.wav | Bin {mrrescue/data => data}/sfx/glass.wav | Bin {mrrescue/data => data}/sfx/happyfeerings.ogg | Bin {mrrescue/data => data}/sfx/jump.wav | Bin {mrrescue/data => data}/sfx/menujazz.ogg | Bin {mrrescue/data => data}/sfx/opening.ogg | Bin {mrrescue/data => data}/sfx/powerup.wav | Bin {mrrescue/data => data}/sfx/pss.wav | Bin {mrrescue/data => data}/sfx/rescue.wav | Bin {mrrescue/data => data}/sfx/rockerronni.ogg | Bin {mrrescue/data => data}/sfx/roof.ogg | Bin {mrrescue/data => data}/sfx/scooterfest.ogg | Bin {mrrescue/data => data}/sfx/shoot.wav | Bin {mrrescue/data => data}/sfx/throw.wav | Bin {mrrescue/data => data}/sfx/transform.wav | Bin {mrrescue/data => data}/sfx/victory.ogg | Bin {mrrescue/data => data}/shards.png | Bin {mrrescue/data => data}/shockwave.png | Bin {mrrescue/data => data}/sparkles.png | Bin {mrrescue/data => data}/splash.png | Bin {mrrescue/data => data}/stats_screen.png | Bin {mrrescue/data => data}/stream.png | Bin {mrrescue/data => data}/tangram.png | Bin {mrrescue/data => data}/temperature_bar.png | Bin {mrrescue/data => data}/temperature_bar_blink.png | Bin {mrrescue/data => data}/tiles.png | Bin {mrrescue/data => data}/warning_icons.png | Bin {mrrescue/data => data}/water.png | Bin {mrrescue/data => data}/water_bar.png | Bin mrrescue/door.lua => door.lua | 0 mrrescue/enemy.lua => enemy.lua | 0 mrrescue/fire.lua => fire.lua | 0 mrrescue/gasghost.lua => gasghost.lua | 0 mrrescue/gasleak.lua => gasleak.lua | 0 .../highscore_entry.lua => highscore_entry.lua | 0 mrrescue/highscore_list.lua => highscore_list.lua | 0 mrrescue/history.lua => history.lua | 0 mrrescue/howto.lua => howto.lua | 0 mrrescue/human.lua => human.lua | 0 mrrescue/ingame.lua => ingame.lua | 7 ++- mrrescue/ingame_menu.lua => ingame_menu.lua | 0 mrrescue/item.lua => item.lua | 0 mrrescue/joystick.lua => joystick.lua | 0 mrrescue/keyboard.lua => keyboard.lua | 0 mrrescue/levelselection.lua => levelselection.lua | 0 mrrescue/magmahulk.lua => magmahulk.lua | 0 mrrescue/main.lua => main.lua | 0 mrrescue/mainmenu.lua => mainmenu.lua | 0 mrrescue/map.lua => map.lua | 0 {mrrescue/maps => maps}/base.lua | 0 {mrrescue/maps => maps}/base.tmx | 0 {mrrescue/maps => maps}/floors/1-1-1.lua | 0 {mrrescue/maps => maps}/floors/1-1-1.tmx | 0 {mrrescue/maps => maps}/floors/1-2.lua | 0 {mrrescue/maps => maps}/floors/1-2.tmx | 0 {mrrescue/maps => maps}/floors/2-1.lua | 0 {mrrescue/maps => maps}/floors/2-1.tmx | 0 {mrrescue/maps => maps}/floors/2-2.lua | 0 {mrrescue/maps => maps}/floors/2-2.tmx | 0 {mrrescue/maps => maps}/room/10/1.lua | 0 {mrrescue/maps => maps}/room/10/1.tmx | 0 {mrrescue/maps => maps}/room/10/2.lua | 0 {mrrescue/maps => maps}/room/10/2.tmx | 0 {mrrescue/maps => maps}/room/10/3.lua | 0 {mrrescue/maps => maps}/room/10/3.tmx | 0 {mrrescue/maps => maps}/room/10/4.lua | 0 {mrrescue/maps => maps}/room/10/4.tmx | 0 {mrrescue/maps => maps}/room/10/5.lua | 0 {mrrescue/maps => maps}/room/10/5.tmx | 0 {mrrescue/maps => maps}/room/10/6.lua | 0 {mrrescue/maps => maps}/room/10/6.tmx | 0 {mrrescue/maps => maps}/room/11/1.lua | 0 {mrrescue/maps => maps}/room/11/1.tmx | 0 {mrrescue/maps => maps}/room/11/2.lua | 0 {mrrescue/maps => maps}/room/11/2.tmx | 0 {mrrescue/maps => maps}/room/11/3.lua | 0 {mrrescue/maps => maps}/room/11/3.tmx | 0 {mrrescue/maps => maps}/room/11/4.lua | 0 {mrrescue/maps => maps}/room/11/4.tmx | 0 {mrrescue/maps => maps}/room/11/5.lua | 0 {mrrescue/maps => maps}/room/11/5.tmx | 0 {mrrescue/maps => maps}/room/11/6.lua | 0 {mrrescue/maps => maps}/room/11/6.tmx | 0 {mrrescue/maps => maps}/room/17/1.lua | 0 {mrrescue/maps => maps}/room/17/1.tmx | 0 {mrrescue/maps => maps}/room/17/2.lua | 0 {mrrescue/maps => maps}/room/17/2.tmx | 0 {mrrescue/maps => maps}/room/17/3.lua | 0 {mrrescue/maps => maps}/room/17/3.tmx | 0 {mrrescue/maps => maps}/room/17/4.lua | 0 {mrrescue/maps => maps}/room/17/4.tmx | 0 {mrrescue/maps => maps}/room/17/5.lua | 0 {mrrescue/maps => maps}/room/17/5.tmx | 0 {mrrescue/maps => maps}/room/17/6.lua | 0 {mrrescue/maps => maps}/room/17/6.tmx | 0 {mrrescue/maps => maps}/room/24/1.lua | 0 {mrrescue/maps => maps}/room/24/1.tmx | 0 {mrrescue/maps => maps}/room/24/2.lua | 0 {mrrescue/maps => maps}/room/24/2.tmx | 0 {mrrescue/maps => maps}/room/24/3.lua | 0 {mrrescue/maps => maps}/room/24/3.tmx | 0 {mrrescue/maps => maps}/room/24/4.lua | 0 {mrrescue/maps => maps}/room/24/4.tmx | 0 {mrrescue/maps => maps}/room/24/5.lua | 0 {mrrescue/maps => maps}/room/24/5.tmx | 0 {mrrescue/maps => maps}/room/24/6.lua | 0 {mrrescue/maps => maps}/room/24/6.tmx | 0 {mrrescue/maps => maps}/top_base.lua | 0 {mrrescue/maps => maps}/top_base.tmx | 0 mrrescue/conf.lua | 22 ------- mrrescue/options.lua => options.lua | 3 +- mrrescue/particles.lua => particles.lua | 0 mrrescue/player.lua => player.lua | 0 mrrescue/resources.lua => resources.lua | 2 +- mrrescue/slam.lua => slam.lua | 0 mrrescue/splash.lua => splash.lua | 0 mrrescue/summary.lua => summary.lua | 0 mrrescue/util.lua => util.lua | 0 262 files changed, 122 insertions(+), 43 deletions(-) diff --git a/mrrescue/AnAL.lua b/AnAL.lua similarity index 100% rename from mrrescue/AnAL.lua rename to AnAL.lua diff --git a/README.md b/README.md new file mode 100644 index 0000000..d005b2f --- /dev/null +++ b/README.md @@ -0,0 +1,50 @@ +Mr. Rescue +========== + +Firefighting game made with LÖVE, developed by Tangram Games. + +About Mr. Rescue +---------------- + +Mr. Rescue is an arcade styled 2d action game centered around evacuating civilians from burning buildings. + +The game features fast paced fire extinguishing action, intense boss battles, a catchy soundtrack and lots of throwing people around in pseudo-randomly generated buildings. + +As of version 1.02 we have added XBox 360 controller support and fullscreen modes. + +How to run the game +------------------- + +To run Mr. Rescue you will need the awesome LÖVE framework. + +You can download LÖVE for free at http://love2d.org +It only takes a minute. + +Most Linux distributions also have LÖVE in their software repository. +Search for "love" or "love2d". + +If you have LÖVE installed simply double-click the .love file to run the game. +If you retrieved the source code directly, just zip the whole folder and change the extension to .love. + +How to play +----------- + +We highly recommend checking out the ingame how-to but here’s the basics: +* Your job is to rescue civilians from a burning building. +* You rescue people by picking them up and throwing them out the window. +* Equipped with a water gun you must fight your way through flames and fire sprites but remember: your job is to rescue people! +* When being near fire your suit will accumulate heat. Collect coolants to keep it from overheating. +* You water tank only has limited capacity. Emptying it will make you water gun overheat so watch your water usage. + +Links +----- + +Source code is hosted on GitHub: https://github.com/SimonLarsen/mrrescue + +Licence +------- + +All assets (graphics, music, text) are licensed under a Creative Commons BY-SA 3.0 Unported License. +See http://creativecommons.org/licenses/by-sa/3.0/deed.en_US for more info. + +All source code for Mr. Rescue with the exception of the modules slam, AnAL and TSerial, is licensed under the zlib license. Check the LICENSE file for more info. diff --git a/README.txt b/README.txt deleted file mode 100644 index fa0a70d..0000000 --- a/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -To run Mr. Rescue you will need the awesome LÖVE framework. - -You can download LÖVE for free at http://love2d.org/ -It only takes a minute. - -Most Linux distributions also have LÖVE in their software repository. -Search for "love" or "love2d". - -If you have LÖVE installed simply double-click the .love file to run the game. - -------------- - -We hope you enjoy the game! -Tangram Games - -tangramgames.dk / [email protected] diff --git a/mrrescue/TSerial.lua b/TSerial.lua similarity index 100% rename from mrrescue/TSerial.lua rename to TSerial.lua diff --git a/mrrescue/boss.lua b/boss.lua similarity index 100% rename from mrrescue/boss.lua rename to boss.lua diff --git a/mrrescue/charcoal.lua b/charcoal.lua similarity index 100% rename from mrrescue/charcoal.lua rename to charcoal.lua diff --git a/mrrescue/coalball.lua b/coalball.lua similarity index 100% rename from mrrescue/coalball.lua rename to coalball.lua diff --git a/conf.lua b/conf.lua new file mode 100644 index 0000000..db46228 --- /dev/null +++ b/conf.lua @@ -0,0 +1,65 @@ +function love.conf(t) + t.identity = "mrrescue" + t.version = "0.10.0" + t.console = false + + t.window.title = "Mr. Rescue" + t.window.icon = nil + t.window.width = 256*3 + t.window.height = 200*3 + t.window.borderless = false + t.window.resizable = false + t.window.fullscreen = false + t.window.fullscreentype = "exclusive" + t.window.vsync = true + t.window.fsaa = 0 + t.window.display = 1 + t.window.highdpi = false + t.window.srgb = false + + t.modules.physics = false + t.modules.mouse = false +end + +function love.conf(t) + t.identity = "mrrescue" + t.version = "0.10.0" + t.console = false + t.accelerometerjoystick = true + t.gammacorrect = false + + t.window.title = "Mr. Rescue" + t.window.icon = nil + t.window.width = 256*3 + t.window.height = 200*3 + t.window.borderless = false + t.window.resizable = false + t.window.minwidth = 1 + t.window.minheight = 1 + t.window.fullscreen = false + t.window.fullscreentype = "desktop" + t.window.vsync = true + t.window.msaa = 0 + t.window.display = 1 + t.window.highdpi = false + t.window.x = nil + t.window.y = nil + + t.modules.audio = true + t.modules.event = true + t.modules.graphics = true + t.modules.image = true + t.modules.joystick = true + t.modules.keyboard = true + t.modules.math = true + t.modules.sound = true + t.modules.system = true + t.modules.timer = true + t.modules.window = true + t.modules.thread = true + + t.modules.mouse = false + t.modules.physics = false + t.modules.touch = false + t.modules.video = false +end diff --git a/mrrescue/config.lua b/config.lua similarity index 100% rename from mrrescue/config.lua rename to config.lua diff --git a/mrrescue/data/ashes.png b/data/ashes.png similarity index 100% rename from mrrescue/data/ashes.png rename to data/ashes.png diff --git a/mrrescue/data/awards.png b/data/awards.png similarity index 100% rename from mrrescue/data/awards.png rename to data/awards.png diff --git a/mrrescue/data/backgrounds/mountains.png b/data/backgrounds/mountains.png similarity index 100% rename from mrrescue/data/backgrounds/mountains.png rename to data/backgrounds/mountains.png diff --git a/mrrescue/data/backgrounds/night.png b/data/backgrounds/night.png similarity index 100% rename from mrrescue/data/backgrounds/night.png rename to data/backgrounds/night.png diff --git a/mrrescue/data/black_smoke.png b/data/black_smoke.png similarity index 100% rename from mrrescue/data/black_smoke.png rename to data/black_smoke.png diff --git a/mrrescue/data/black_smoke_small.png b/data/black_smoke_small.png similarity index 100% rename from mrrescue/data/black_smoke_small.png rename to data/black_smoke_small.png diff --git a/mrrescue/data/boldfont.png b/data/boldfont.png similarity index 100% rename from mrrescue/data/boldfont.png rename to data/boldfont.png diff --git a/mrrescue/data/border.png b/data/border.png similarity index 100% rename from mrrescue/data/border.png rename to data/border.png diff --git a/mrrescue/data/boss_health.png b/data/boss_health.png similarity index 100% rename from mrrescue/data/boss_health.png rename to data/boss_health.png diff --git a/mrrescue/data/captain_dialog.png b/data/captain_dialog.png similarity index 100% rename from mrrescue/data/captain_dialog.png rename to data/captain_dialog.png diff --git a/mrrescue/data/captain_dialog_sad.png b/data/captain_dialog_sad.png similarity index 100% rename from mrrescue/data/captain_dialog_sad.png rename to data/captain_dialog_sad.png diff --git a/mrrescue/data/charcoal_bump.png b/data/charcoal_bump.png similarity index 100% rename from mrrescue/data/charcoal_bump.png rename to data/charcoal_bump.png diff --git a/mrrescue/data/charcoal_daze.png b/data/charcoal_daze.png similarity index 100% rename from mrrescue/data/charcoal_daze.png rename to data/charcoal_daze.png diff --git a/mrrescue/data/charcoal_daze_hit.png b/data/charcoal_daze_hit.png similarity index 100% rename from mrrescue/data/charcoal_daze_hit.png rename to data/charcoal_daze_hit.png diff --git a/mrrescue/data/charcoal_daze_rage.png b/data/charcoal_daze_rage.png similarity index 100% rename from mrrescue/data/charcoal_daze_rage.png rename to data/charcoal_daze_rage.png diff --git a/mrrescue/data/charcoal_idle.png b/data/charcoal_idle.png similarity index 100% rename from mrrescue/data/charcoal_idle.png rename to data/charcoal_idle.png diff --git a/mrrescue/data/charcoal_portrait.png b/data/charcoal_portrait.png similarity index 100% rename from mrrescue/data/charcoal_portrait.png rename to data/charcoal_portrait.png diff --git a/mrrescue/data/charcoal_projectile.png b/data/charcoal_projectile.png similarity index 100% rename from mrrescue/data/charcoal_projectile.png rename to data/charcoal_projectile.png diff --git a/mrrescue/data/charcoal_roll.png b/data/charcoal_roll.png similarity index 100% rename from mrrescue/data/charcoal_roll.png rename to data/charcoal_roll.png diff --git a/mrrescue/data/charcoal_roll_rage.png b/data/charcoal_roll_rage.png similarity index 100% rename from mrrescue/data/charcoal_roll_rage.png rename to data/charcoal_roll_rage.png diff --git a/mrrescue/data/charcoal_shards.png b/data/charcoal_shards.png similarity index 100% rename from mrrescue/data/charcoal_shards.png rename to data/charcoal_shards.png diff --git a/mrrescue/data/charcoal_transform.png b/data/charcoal_transform.png similarity index 100% rename from mrrescue/data/charcoal_transform.png rename to data/charcoal_transform.png diff --git a/mrrescue/data/charcoal_transform_hit.png b/data/charcoal_transform_hit.png similarity index 100% rename from mrrescue/data/charcoal_transform_hit.png rename to data/charcoal_transform_hit.png diff --git a/mrrescue/data/charcoal_transform_rage.png b/data/charcoal_transform_rage.png similarity index 100% rename from mrrescue/data/charcoal_transform_rage.png rename to data/charcoal_transform_rage.png diff --git a/mrrescue/data/charcoal_transition.png b/data/charcoal_transition.png similarity index 100% rename from mrrescue/data/charcoal_transition.png rename to data/charcoal_transition.png diff --git a/mrrescue/data/circles.png b/data/circles.png similarity index 100% rename from mrrescue/data/circles.png rename to data/circles.png diff --git a/mrrescue/data/countdown.png b/data/countdown.png similarity index 100% rename from mrrescue/data/countdown.png rename to data/countdown.png diff --git a/mrrescue/data/door.png b/data/door.png similarity index 100% rename from mrrescue/data/door.png rename to data/door.png diff --git a/mrrescue/data/enemy_angryjumper_hit.png b/data/enemy_angryjumper_hit.png similarity index 100% rename from mrrescue/data/enemy_angryjumper_hit.png rename to data/enemy_angryjumper_hit.png diff --git a/mrrescue/data/enemy_angryjumper_jump.png b/data/enemy_angryjumper_jump.png similarity index 100% rename from mrrescue/data/enemy_angryjumper_jump.png rename to data/enemy_angryjumper_jump.png diff --git a/mrrescue/data/enemy_angrynormal_hit.png b/data/enemy_angrynormal_hit.png similarity index 100% rename from mrrescue/data/enemy_angrynormal_hit.png rename to data/enemy_angrynormal_hit.png diff --git a/mrrescue/data/enemy_angrynormal_recover.png b/data/enemy_angrynormal_recover.png similarity index 100% rename from mrrescue/data/enemy_angrynormal_recover.png rename to data/enemy_angrynormal_recover.png diff --git a/mrrescue/data/enemy_angrynormal_run.png b/data/enemy_angrynormal_run.png similarity index 100% rename from mrrescue/data/enemy_angrynormal_run.png rename to data/enemy_angrynormal_run.png diff --git a/mrrescue/data/enemy_angryvolcano_hit.png b/data/enemy_angryvolcano_hit.png similarity index 100% rename from mrrescue/data/enemy_angryvolcano_hit.png rename to data/enemy_angryvolcano_hit.png diff --git a/mrrescue/data/enemy_angryvolcano_run.png b/data/enemy_angryvolcano_run.png similarity index 100% rename from mrrescue/data/enemy_angryvolcano_run.png rename to data/enemy_angryvolcano_run.png diff --git a/mrrescue/data/enemy_angryvolcano_shoot.png b/data/enemy_angryvolcano_shoot.png similarity index 100% rename from mrrescue/data/enemy_angryvolcano_shoot.png rename to data/enemy_angryvolcano_shoot.png diff --git a/mrrescue/data/enemy_fireball.png b/data/enemy_fireball.png similarity index 100% rename from mrrescue/data/enemy_fireball.png rename to data/enemy_fireball.png diff --git a/mrrescue/data/enemy_healthbar.png b/data/enemy_healthbar.png similarity index 100% rename from mrrescue/data/enemy_healthbar.png rename to data/enemy_healthbar.png diff --git a/mrrescue/data/enemy_jumper_hit.png b/data/enemy_jumper_hit.png similarity index 100% rename from mrrescue/data/enemy_jumper_hit.png rename to data/enemy_jumper_hit.png diff --git a/mrrescue/data/enemy_jumper_jump.png b/data/enemy_jumper_jump.png similarity index 100% rename from mrrescue/data/enemy_jumper_jump.png rename to data/enemy_jumper_jump.png diff --git a/mrrescue/data/enemy_jumper_recover.png b/data/enemy_jumper_recover.png similarity index 100% rename from mrrescue/data/enemy_jumper_recover.png rename to data/enemy_jumper_recover.png diff --git a/mrrescue/data/enemy_normal_hit.png b/data/enemy_normal_hit.png similarity index 100% rename from mrrescue/data/enemy_normal_hit.png rename to data/enemy_normal_hit.png diff --git a/mrrescue/data/enemy_normal_recover.png b/data/enemy_normal_recover.png similarity index 100% rename from mrrescue/data/enemy_normal_recover.png rename to data/enemy_normal_recover.png diff --git a/mrrescue/data/enemy_normal_run.png b/data/enemy_normal_run.png similarity index 100% rename from mrrescue/data/enemy_normal_run.png rename to data/enemy_normal_run.png diff --git a/mrrescue/data/enemy_thief_hit.png b/data/enemy_thief_hit.png similarity index 100% rename from mrrescue/data/enemy_thief_hit.png rename to data/enemy_thief_hit.png diff --git a/mrrescue/data/enemy_thief_recover.png b/data/enemy_thief_recover.png similarity index 100% rename from mrrescue/data/enemy_thief_recover.png rename to data/enemy_thief_recover.png diff --git a/mrrescue/data/enemy_thief_run.png b/data/enemy_thief_run.png similarity index 100% rename from mrrescue/data/enemy_thief_run.png rename to data/enemy_thief_run.png diff --git a/mrrescue/data/enemy_volcano_hit.png b/data/enemy_volcano_hit.png similarity index 100% rename from mrrescue/data/enemy_volcano_hit.png rename to data/enemy_volcano_hit.png diff --git a/mrrescue/data/enemy_volcano_run.png b/data/enemy_volcano_run.png similarity index 100% rename from mrrescue/data/enemy_volcano_run.png rename to data/enemy_volcano_run.png diff --git a/mrrescue/data/enemy_volcano_shoot.png b/data/enemy_volcano_shoot.png similarity index 100% rename from mrrescue/data/enemy_volcano_shoot.png rename to data/enemy_volcano_shoot.png diff --git a/mrrescue/data/exclamation.png b/data/exclamation.png similarity index 100% rename from mrrescue/data/exclamation.png rename to data/exclamation.png diff --git a/mrrescue/data/fire_floor.png b/data/fire_floor.png similarity index 100% rename from mrrescue/data/fire_floor.png rename to data/fire_floor.png diff --git a/mrrescue/data/fire_wall.png b/data/fire_wall.png similarity index 100% rename from mrrescue/data/fire_wall.png rename to data/fire_wall.png diff --git a/mrrescue/data/fire_wall_small.png b/data/fire_wall_small.png similarity index 100% rename from mrrescue/data/fire_wall_small.png rename to data/fire_wall_small.png diff --git a/mrrescue/data/gasghost.png b/data/gasghost.png similarity index 100% rename from mrrescue/data/gasghost.png rename to data/gasghost.png diff --git a/mrrescue/data/gasghost_hit.png b/data/gasghost_hit.png similarity index 100% rename from mrrescue/data/gasghost_hit.png rename to data/gasghost_hit.png diff --git a/mrrescue/data/gasleak_angry_idle_shot.png b/data/gasleak_angry_idle_shot.png similarity index 100% rename from mrrescue/data/gasleak_angry_idle_shot.png rename to data/gasleak_angry_idle_shot.png diff --git a/mrrescue/data/gasleak_hit.png b/data/gasleak_hit.png similarity index 100% rename from mrrescue/data/gasleak_hit.png rename to data/gasleak_hit.png diff --git a/mrrescue/data/gasleak_idle.png b/data/gasleak_idle.png similarity index 100% rename from mrrescue/data/gasleak_idle.png rename to data/gasleak_idle.png diff --git a/mrrescue/data/gasleak_idle_shot.png b/data/gasleak_idle_shot.png similarity index 100% rename from mrrescue/data/gasleak_idle_shot.png rename to data/gasleak_idle_shot.png diff --git a/mrrescue/data/gasleak_portrait.png b/data/gasleak_portrait.png similarity index 100% rename from mrrescue/data/gasleak_portrait.png rename to data/gasleak_portrait.png diff --git a/mrrescue/data/gasleak_rage_idle.png b/data/gasleak_rage_idle.png similarity index 100% rename from mrrescue/data/gasleak_rage_idle.png rename to data/gasleak_rage_idle.png diff --git a/mrrescue/data/gasleak_rage_idle_shot.png b/data/gasleak_rage_idle_shot.png similarity index 100% rename from mrrescue/data/gasleak_rage_idle_shot.png rename to data/gasleak_rage_idle_shot.png diff --git a/mrrescue/data/gasleak_rage_shot_walk.png b/data/gasleak_rage_shot_walk.png similarity index 100% rename from mrrescue/data/gasleak_rage_shot_walk.png rename to data/gasleak_rage_shot_walk.png diff --git a/mrrescue/data/gasleak_rage_walk.png b/data/gasleak_rage_walk.png similarity index 100% rename from mrrescue/data/gasleak_rage_walk.png rename to data/gasleak_rage_walk.png diff --git a/mrrescue/data/gasleak_shot_walk.png b/data/gasleak_shot_walk.png similarity index 100% rename from mrrescue/data/gasleak_shot_walk.png rename to data/gasleak_shot_walk.png diff --git a/mrrescue/data/gasleak_transition.png b/data/gasleak_transition.png similarity index 100% rename from mrrescue/data/gasleak_transition.png rename to data/gasleak_transition.png diff --git a/mrrescue/data/gasleak_walk.png b/data/gasleak_walk.png similarity index 100% rename from mrrescue/data/gasleak_walk.png rename to data/gasleak_walk.png diff --git a/mrrescue/data/highscore_panes.png b/data/highscore_panes.png similarity index 100% rename from mrrescue/data/highscore_panes.png rename to data/highscore_panes.png diff --git a/mrrescue/data/howto.png b/data/howto.png similarity index 100% rename from mrrescue/data/howto.png rename to data/howto.png diff --git a/mrrescue/data/hud.png b/data/hud.png similarity index 100% rename from mrrescue/data/hud.png rename to data/hud.png diff --git a/mrrescue/data/hud2.png b/data/hud2.png similarity index 100% rename from mrrescue/data/hud2.png rename to data/hud2.png diff --git a/mrrescue/data/hud_people.png b/data/hud_people.png similarity index 100% rename from mrrescue/data/hud_people.png rename to data/hud_people.png diff --git a/mrrescue/data/human_1_burn.png b/data/human_1_burn.png similarity index 100% rename from mrrescue/data/human_1_burn.png rename to data/human_1_burn.png diff --git a/mrrescue/data/human_1_carry_left.png b/data/human_1_carry_left.png similarity index 100% rename from mrrescue/data/human_1_carry_left.png rename to data/human_1_carry_left.png diff --git a/mrrescue/data/human_1_carry_right.png b/data/human_1_carry_right.png similarity index 100% rename from mrrescue/data/human_1_carry_right.png rename to data/human_1_carry_right.png diff --git a/mrrescue/data/human_1_fly.png b/data/human_1_fly.png similarity index 100% rename from mrrescue/data/human_1_fly.png rename to data/human_1_fly.png diff --git a/mrrescue/data/human_1_panic.png b/data/human_1_panic.png similarity index 100% rename from mrrescue/data/human_1_panic.png rename to data/human_1_panic.png diff --git a/mrrescue/data/human_1_run.png b/data/human_1_run.png similarity index 100% rename from mrrescue/data/human_1_run.png rename to data/human_1_run.png diff --git a/mrrescue/data/human_2_burn.png b/data/human_2_burn.png similarity index 100% rename from mrrescue/data/human_2_burn.png rename to data/human_2_burn.png diff --git a/mrrescue/data/human_2_carry_left.png b/data/human_2_carry_left.png similarity index 100% rename from mrrescue/data/human_2_carry_left.png rename to data/human_2_carry_left.png diff --git a/mrrescue/data/human_2_carry_right.png b/data/human_2_carry_right.png similarity index 100% rename from mrrescue/data/human_2_carry_right.png rename to data/human_2_carry_right.png diff --git a/mrrescue/data/human_2_fly.png b/data/human_2_fly.png similarity index 100% rename from mrrescue/data/human_2_fly.png rename to data/human_2_fly.png diff --git a/mrrescue/data/human_2_panic.png b/data/human_2_panic.png similarity index 100% rename from mrrescue/data/human_2_panic.png rename to data/human_2_panic.png diff --git a/mrrescue/data/human_2_run.png b/data/human_2_run.png similarity index 100% rename from mrrescue/data/human_2_run.png rename to data/human_2_run.png diff --git a/mrrescue/data/human_3_burn.png b/data/human_3_burn.png similarity index 100% rename from mrrescue/data/human_3_burn.png rename to data/human_3_burn.png diff --git a/mrrescue/data/human_3_carry_left.png b/data/human_3_carry_left.png similarity index 100% rename from mrrescue/data/human_3_carry_left.png rename to data/human_3_carry_left.png diff --git a/mrrescue/data/human_3_carry_right.png b/data/human_3_carry_right.png similarity index 100% rename from mrrescue/data/human_3_carry_right.png rename to data/human_3_carry_right.png diff --git a/mrrescue/data/human_3_fly.png b/data/human_3_fly.png similarity index 100% rename from mrrescue/data/human_3_fly.png rename to data/human_3_fly.png diff --git a/mrrescue/data/human_3_panic.png b/data/human_3_panic.png similarity index 100% rename from mrrescue/data/human_3_panic.png rename to data/human_3_panic.png diff --git a/mrrescue/data/human_3_run.png b/data/human_3_run.png similarity index 100% rename from mrrescue/data/human_3_run.png rename to data/human_3_run.png diff --git a/mrrescue/data/human_4_burn.png b/data/human_4_burn.png similarity index 100% rename from mrrescue/data/human_4_burn.png rename to data/human_4_burn.png diff --git a/mrrescue/data/human_4_carry_left.png b/data/human_4_carry_left.png similarity index 100% rename from mrrescue/data/human_4_carry_left.png rename to data/human_4_carry_left.png diff --git a/mrrescue/data/human_4_carry_right.png b/data/human_4_carry_right.png similarity index 100% rename from mrrescue/data/human_4_carry_right.png rename to data/human_4_carry_right.png diff --git a/mrrescue/data/human_4_fly.png b/data/human_4_fly.png similarity index 100% rename from mrrescue/data/human_4_fly.png rename to data/human_4_fly.png diff --git a/mrrescue/data/human_4_panic.png b/data/human_4_panic.png similarity index 100% rename from mrrescue/data/human_4_panic.png rename to data/human_4_panic.png diff --git a/mrrescue/data/human_4_run.png b/data/human_4_run.png similarity index 100% rename from mrrescue/data/human_4_run.png rename to data/human_4_run.png diff --git a/mrrescue/data/item_coolant.png b/data/item_coolant.png similarity index 100% rename from mrrescue/data/item_coolant.png rename to data/item_coolant.png diff --git a/mrrescue/data/item_regen.png b/data/item_regen.png similarity index 100% rename from mrrescue/data/item_regen.png rename to data/item_regen.png diff --git a/mrrescue/data/item_reserve.png b/data/item_reserve.png similarity index 100% rename from mrrescue/data/item_reserve.png rename to data/item_reserve.png diff --git a/mrrescue/data/item_slots.png b/data/item_slots.png similarity index 100% rename from mrrescue/data/item_slots.png rename to data/item_slots.png diff --git a/mrrescue/data/item_suit.png b/data/item_suit.png similarity index 100% rename from mrrescue/data/item_suit.png rename to data/item_suit.png diff --git a/mrrescue/data/item_tank.png b/data/item_tank.png similarity index 100% rename from mrrescue/data/item_tank.png rename to data/item_tank.png diff --git a/mrrescue/data/level_buildings.png b/data/level_buildings.png similarity index 100% rename from mrrescue/data/level_buildings.png rename to data/level_buildings.png diff --git a/mrrescue/data/light_fire.png b/data/light_fire.png similarity index 100% rename from mrrescue/data/light_fire.png rename to data/light_fire.png diff --git a/mrrescue/data/light_fireball.png b/data/light_fireball.png similarity index 100% rename from mrrescue/data/light_fireball.png rename to data/light_fireball.png diff --git a/mrrescue/data/light_player.png b/data/light_player.png similarity index 100% rename from mrrescue/data/light_player.png rename to data/light_player.png diff --git a/mrrescue/data/lovesplashpixel.png b/data/lovesplashpixel.png similarity index 100% rename from mrrescue/data/lovesplashpixel.png rename to data/lovesplashpixel.png diff --git a/mrrescue/data/magmahulk_jump.png b/data/magmahulk_jump.png similarity index 100% rename from mrrescue/data/magmahulk_jump.png rename to data/magmahulk_jump.png diff --git a/mrrescue/data/magmahulk_jump_hit.png b/data/magmahulk_jump_hit.png similarity index 100% rename from mrrescue/data/magmahulk_jump_hit.png rename to data/magmahulk_jump_hit.png diff --git a/mrrescue/data/magmahulk_land.png b/data/magmahulk_land.png similarity index 100% rename from mrrescue/data/magmahulk_land.png rename to data/magmahulk_land.png diff --git a/mrrescue/data/magmahulk_land_hit.png b/data/magmahulk_land_hit.png similarity index 100% rename from mrrescue/data/magmahulk_land_hit.png rename to data/magmahulk_land_hit.png diff --git a/mrrescue/data/magmahulk_portrait.png b/data/magmahulk_portrait.png similarity index 100% rename from mrrescue/data/magmahulk_portrait.png rename to data/magmahulk_portrait.png diff --git a/mrrescue/data/magmahulk_rage_jump.png b/data/magmahulk_rage_jump.png similarity index 100% rename from mrrescue/data/magmahulk_rage_jump.png rename to data/magmahulk_rage_jump.png diff --git a/mrrescue/data/magmahulk_rage_land.png b/data/magmahulk_rage_land.png similarity index 100% rename from mrrescue/data/magmahulk_rage_land.png rename to data/magmahulk_rage_land.png diff --git a/mrrescue/data/menu_box.png b/data/menu_box.png similarity index 100% rename from mrrescue/data/menu_box.png rename to data/menu_box.png diff --git a/mrrescue/data/overloaded_bar.png b/data/overloaded_bar.png similarity index 100% rename from mrrescue/data/overloaded_bar.png rename to data/overloaded_bar.png diff --git a/mrrescue/data/player_climb_down.png b/data/player_climb_down.png similarity index 100% rename from mrrescue/data/player_climb_down.png rename to data/player_climb_down.png diff --git a/mrrescue/data/player_climb_up.png b/data/player_climb_up.png similarity index 100% rename from mrrescue/data/player_climb_up.png rename to data/player_climb_up.png diff --git a/mrrescue/data/player_death.png b/data/player_death.png similarity index 100% rename from mrrescue/data/player_death.png rename to data/player_death.png diff --git a/mrrescue/data/player_gun.png b/data/player_gun.png similarity index 100% rename from mrrescue/data/player_gun.png rename to data/player_gun.png diff --git a/mrrescue/data/player_running.png b/data/player_running.png similarity index 100% rename from mrrescue/data/player_running.png rename to data/player_running.png diff --git a/mrrescue/data/player_throw.png b/data/player_throw.png similarity index 100% rename from mrrescue/data/player_throw.png rename to data/player_throw.png diff --git a/mrrescue/data/popup_text.png b/data/popup_text.png similarity index 100% rename from mrrescue/data/popup_text.png rename to data/popup_text.png diff --git a/mrrescue/data/red_screen.png b/data/red_screen.png similarity index 100% rename from mrrescue/data/red_screen.png rename to data/red_screen.png diff --git a/mrrescue/data/reserve_bar.png b/data/reserve_bar.png similarity index 100% rename from mrrescue/data/reserve_bar.png rename to data/reserve_bar.png diff --git a/mrrescue/data/sfx/blip.wav b/data/sfx/blip.wav similarity index 100% rename from mrrescue/data/sfx/blip.wav rename to data/sfx/blip.wav diff --git a/mrrescue/data/sfx/bossjump.wav b/data/sfx/bossjump.wav similarity index 100% rename from mrrescue/data/sfx/bossjump.wav rename to data/sfx/bossjump.wav diff --git a/mrrescue/data/sfx/bundesliga.ogg b/data/sfx/bundesliga.ogg similarity index 100% rename from mrrescue/data/sfx/bundesliga.ogg rename to data/sfx/bundesliga.ogg diff --git a/mrrescue/data/sfx/confirm.wav b/data/sfx/confirm.wav similarity index 100% rename from mrrescue/data/sfx/confirm.wav rename to data/sfx/confirm.wav diff --git a/mrrescue/data/sfx/countdown.wav b/data/sfx/countdown.wav similarity index 100% rename from mrrescue/data/sfx/countdown.wav rename to data/sfx/countdown.wav diff --git a/mrrescue/data/sfx/crash.wav b/data/sfx/crash.wav similarity index 100% rename from mrrescue/data/sfx/crash.wav rename to data/sfx/crash.wav diff --git a/mrrescue/data/sfx/door.wav b/data/sfx/door.wav similarity index 100% rename from mrrescue/data/sfx/door.wav rename to data/sfx/door.wav diff --git a/mrrescue/data/sfx/empty.wav b/data/sfx/empty.wav similarity index 100% rename from mrrescue/data/sfx/empty.wav rename to data/sfx/empty.wav diff --git a/mrrescue/data/sfx/endexplosion.wav b/data/sfx/endexplosion.wav similarity index 100% rename from mrrescue/data/sfx/endexplosion.wav rename to data/sfx/endexplosion.wav diff --git a/mrrescue/data/sfx/enemydie.wav b/data/sfx/enemydie.wav similarity index 100% rename from mrrescue/data/sfx/enemydie.wav rename to data/sfx/enemydie.wav diff --git a/mrrescue/data/sfx/glass.wav b/data/sfx/glass.wav similarity index 100% rename from mrrescue/data/sfx/glass.wav rename to data/sfx/glass.wav diff --git a/mrrescue/data/sfx/happyfeerings.ogg b/data/sfx/happyfeerings.ogg similarity index 100% rename from mrrescue/data/sfx/happyfeerings.ogg rename to data/sfx/happyfeerings.ogg diff --git a/mrrescue/data/sfx/jump.wav b/data/sfx/jump.wav similarity index 100% rename from mrrescue/data/sfx/jump.wav rename to data/sfx/jump.wav diff --git a/mrrescue/data/sfx/menujazz.ogg b/data/sfx/menujazz.ogg similarity index 100% rename from mrrescue/data/sfx/menujazz.ogg rename to data/sfx/menujazz.ogg diff --git a/mrrescue/data/sfx/opening.ogg b/data/sfx/opening.ogg similarity index 100% rename from mrrescue/data/sfx/opening.ogg rename to data/sfx/opening.ogg diff --git a/mrrescue/data/sfx/powerup.wav b/data/sfx/powerup.wav similarity index 100% rename from mrrescue/data/sfx/powerup.wav rename to data/sfx/powerup.wav diff --git a/mrrescue/data/sfx/pss.wav b/data/sfx/pss.wav similarity index 100% rename from mrrescue/data/sfx/pss.wav rename to data/sfx/pss.wav diff --git a/mrrescue/data/sfx/rescue.wav b/data/sfx/rescue.wav similarity index 100% rename from mrrescue/data/sfx/rescue.wav rename to data/sfx/rescue.wav diff --git a/mrrescue/data/sfx/rockerronni.ogg b/data/sfx/rockerronni.ogg similarity index 100% rename from mrrescue/data/sfx/rockerronni.ogg rename to data/sfx/rockerronni.ogg diff --git a/mrrescue/data/sfx/roof.ogg b/data/sfx/roof.ogg similarity index 100% rename from mrrescue/data/sfx/roof.ogg rename to data/sfx/roof.ogg diff --git a/mrrescue/data/sfx/scooterfest.ogg b/data/sfx/scooterfest.ogg similarity index 100% rename from mrrescue/data/sfx/scooterfest.ogg rename to data/sfx/scooterfest.ogg diff --git a/mrrescue/data/sfx/shoot.wav b/data/sfx/shoot.wav similarity index 100% rename from mrrescue/data/sfx/shoot.wav rename to data/sfx/shoot.wav diff --git a/mrrescue/data/sfx/throw.wav b/data/sfx/throw.wav similarity index 100% rename from mrrescue/data/sfx/throw.wav rename to data/sfx/throw.wav diff --git a/mrrescue/data/sfx/transform.wav b/data/sfx/transform.wav similarity index 100% rename from mrrescue/data/sfx/transform.wav rename to data/sfx/transform.wav diff --git a/mrrescue/data/sfx/victory.ogg b/data/sfx/victory.ogg similarity index 100% rename from mrrescue/data/sfx/victory.ogg rename to data/sfx/victory.ogg diff --git a/mrrescue/data/shards.png b/data/shards.png similarity index 100% rename from mrrescue/data/shards.png rename to data/shards.png diff --git a/mrrescue/data/shockwave.png b/data/shockwave.png similarity index 100% rename from mrrescue/data/shockwave.png rename to data/shockwave.png diff --git a/mrrescue/data/sparkles.png b/data/sparkles.png similarity index 100% rename from mrrescue/data/sparkles.png rename to data/sparkles.png diff --git a/mrrescue/data/splash.png b/data/splash.png similarity index 100% rename from mrrescue/data/splash.png rename to data/splash.png diff --git a/mrrescue/data/stats_screen.png b/data/stats_screen.png similarity index 100% rename from mrrescue/data/stats_screen.png rename to data/stats_screen.png diff --git a/mrrescue/data/stream.png b/data/stream.png similarity index 100% rename from mrrescue/data/stream.png rename to data/stream.png diff --git a/mrrescue/data/tangram.png b/data/tangram.png similarity index 100% rename from mrrescue/data/tangram.png rename to data/tangram.png diff --git a/mrrescue/data/temperature_bar.png b/data/temperature_bar.png similarity index 100% rename from mrrescue/data/temperature_bar.png rename to data/temperature_bar.png diff --git a/mrrescue/data/temperature_bar_blink.png b/data/temperature_bar_blink.png similarity index 100% rename from mrrescue/data/temperature_bar_blink.png rename to data/temperature_bar_blink.png diff --git a/mrrescue/data/tiles.png b/data/tiles.png similarity index 100% rename from mrrescue/data/tiles.png rename to data/tiles.png diff --git a/mrrescue/data/warning_icons.png b/data/warning_icons.png similarity index 100% rename from mrrescue/data/warning_icons.png rename to data/warning_icons.png diff --git a/mrrescue/data/water.png b/data/water.png similarity index 100% rename from mrrescue/data/water.png rename to data/water.png diff --git a/mrrescue/data/water_bar.png b/data/water_bar.png similarity index 100% rename from mrrescue/data/water_bar.png rename to data/water_bar.png diff --git a/mrrescue/door.lua b/door.lua similarity index 100% rename from mrrescue/door.lua rename to door.lua diff --git a/mrrescue/enemy.lua b/enemy.lua similarity index 100% rename from mrrescue/enemy.lua rename to enemy.lua diff --git a/mrrescue/fire.lua b/fire.lua similarity index 100% rename from mrrescue/fire.lua rename to fire.lua diff --git a/mrrescue/gasghost.lua b/gasghost.lua similarity index 100% rename from mrrescue/gasghost.lua rename to gasghost.lua diff --git a/mrrescue/gasleak.lua b/gasleak.lua similarity index 100% rename from mrrescue/gasleak.lua rename to gasleak.lua diff --git a/mrrescue/highscore_entry.lua b/highscore_entry.lua similarity index 100% rename from mrrescue/highscore_entry.lua rename to highscore_entry.lua diff --git a/mrrescue/highscore_list.lua b/highscore_list.lua similarity index 100% rename from mrrescue/highscore_list.lua rename to highscore_list.lua diff --git a/mrrescue/history.lua b/history.lua similarity index 100% rename from mrrescue/history.lua rename to history.lua diff --git a/mrrescue/howto.lua b/howto.lua similarity index 100% rename from mrrescue/howto.lua rename to howto.lua diff --git a/mrrescue/human.lua b/human.lua similarity index 100% rename from mrrescue/human.lua rename to human.lua diff --git a/mrrescue/ingame.lua b/ingame.lua similarity index 99% rename from mrrescue/ingame.lua rename to ingame.lua index 0dfd9e7..52004f1 100644 --- a/mrrescue/ingame.lua +++ b/ingame.lua @@ -189,7 +189,7 @@ function ingame.draw() lg.pop() if map.type == MT_NORMAL then - lg.setBlendMode("multiplicative") + lg.setBlendMode("multiply") lg.draw(canvas, 0,0) lg.setBlendMode("alpha") end @@ -449,10 +449,11 @@ function updateLightmap() or ingame_state == INGAME_COUNTDOWN_IN or ingame_state == INGAME_COUNTDOWN then lg.push() lg.translate(-math.floor(translate_x), -math.floor(translate_y)) - canvas:clear(0,0,0,255) + -- canvas:clear(0,0,0,255) lg.setCanvas(canvas) - lg.setBlendMode("additive") + lg.clear(0,0,0,255) + lg.setBlendMode("add") lg.draw(img.light_player, player.flx-128, player.fly-138) map:drawFireLight() diff --git a/mrrescue/ingame_menu.lua b/ingame_menu.lua similarity index 100% rename from mrrescue/ingame_menu.lua rename to ingame_menu.lua diff --git a/mrrescue/item.lua b/item.lua similarity index 100% rename from mrrescue/item.lua rename to item.lua diff --git a/mrrescue/joystick.lua b/joystick.lua similarity index 100% rename from mrrescue/joystick.lua rename to joystick.lua diff --git a/mrrescue/keyboard.lua b/keyboard.lua similarity index 100% rename from mrrescue/keyboard.lua rename to keyboard.lua diff --git a/mrrescue/levelselection.lua b/levelselection.lua similarity index 100% rename from mrrescue/levelselection.lua rename to levelselection.lua diff --git a/mrrescue/magmahulk.lua b/magmahulk.lua similarity index 100% rename from mrrescue/magmahulk.lua rename to magmahulk.lua diff --git a/mrrescue/main.lua b/main.lua similarity index 100% rename from mrrescue/main.lua rename to main.lua diff --git a/mrrescue/mainmenu.lua b/mainmenu.lua similarity index 100% rename from mrrescue/mainmenu.lua rename to mainmenu.lua diff --git a/mrrescue/map.lua b/map.lua similarity index 100% rename from mrrescue/map.lua rename to map.lua diff --git a/mrrescue/maps/base.lua b/maps/base.lua similarity index 100% rename from mrrescue/maps/base.lua rename to maps/base.lua diff --git a/mrrescue/maps/base.tmx b/maps/base.tmx similarity index 100% rename from mrrescue/maps/base.tmx rename to maps/base.tmx diff --git a/mrrescue/maps/floors/1-1-1.lua b/maps/floors/1-1-1.lua similarity index 100% rename from mrrescue/maps/floors/1-1-1.lua rename to maps/floors/1-1-1.lua diff --git a/mrrescue/maps/floors/1-1-1.tmx b/maps/floors/1-1-1.tmx similarity index 100% rename from mrrescue/maps/floors/1-1-1.tmx rename to maps/floors/1-1-1.tmx diff --git a/mrrescue/maps/floors/1-2.lua b/maps/floors/1-2.lua similarity index 100% rename from mrrescue/maps/floors/1-2.lua rename to maps/floors/1-2.lua diff --git a/mrrescue/maps/floors/1-2.tmx b/maps/floors/1-2.tmx similarity index 100% rename from mrrescue/maps/floors/1-2.tmx rename to maps/floors/1-2.tmx diff --git a/mrrescue/maps/floors/2-1.lua b/maps/floors/2-1.lua similarity index 100% rename from mrrescue/maps/floors/2-1.lua rename to maps/floors/2-1.lua diff --git a/mrrescue/maps/floors/2-1.tmx b/maps/floors/2-1.tmx similarity index 100% rename from mrrescue/maps/floors/2-1.tmx rename to maps/floors/2-1.tmx diff --git a/mrrescue/maps/floors/2-2.lua b/maps/floors/2-2.lua similarity index 100% rename from mrrescue/maps/floors/2-2.lua rename to maps/floors/2-2.lua diff --git a/mrrescue/maps/floors/2-2.tmx b/maps/floors/2-2.tmx similarity index 100% rename from mrrescue/maps/floors/2-2.tmx rename to maps/floors/2-2.tmx diff --git a/mrrescue/maps/room/10/1.lua b/maps/room/10/1.lua similarity index 100% rename from mrrescue/maps/room/10/1.lua rename to maps/room/10/1.lua diff --git a/mrrescue/maps/room/10/1.tmx b/maps/room/10/1.tmx similarity index 100% rename from mrrescue/maps/room/10/1.tmx rename to maps/room/10/1.tmx diff --git a/mrrescue/maps/room/10/2.lua b/maps/room/10/2.lua similarity index 100% rename from mrrescue/maps/room/10/2.lua rename to maps/room/10/2.lua diff --git a/mrrescue/maps/room/10/2.tmx b/maps/room/10/2.tmx similarity index 100% rename from mrrescue/maps/room/10/2.tmx rename to maps/room/10/2.tmx diff --git a/mrrescue/maps/room/10/3.lua b/maps/room/10/3.lua similarity index 100% rename from mrrescue/maps/room/10/3.lua rename to maps/room/10/3.lua diff --git a/mrrescue/maps/room/10/3.tmx b/maps/room/10/3.tmx similarity index 100% rename from mrrescue/maps/room/10/3.tmx rename to maps/room/10/3.tmx diff --git a/mrrescue/maps/room/10/4.lua b/maps/room/10/4.lua similarity index 100% rename from mrrescue/maps/room/10/4.lua rename to maps/room/10/4.lua diff --git a/mrrescue/maps/room/10/4.tmx b/maps/room/10/4.tmx similarity index 100% rename from mrrescue/maps/room/10/4.tmx rename to maps/room/10/4.tmx diff --git a/mrrescue/maps/room/10/5.lua b/maps/room/10/5.lua similarity index 100% rename from mrrescue/maps/room/10/5.lua rename to maps/room/10/5.lua diff --git a/mrrescue/maps/room/10/5.tmx b/maps/room/10/5.tmx similarity index 100% rename from mrrescue/maps/room/10/5.tmx rename to maps/room/10/5.tmx diff --git a/mrrescue/maps/room/10/6.lua b/maps/room/10/6.lua similarity index 100% rename from mrrescue/maps/room/10/6.lua rename to maps/room/10/6.lua diff --git a/mrrescue/maps/room/10/6.tmx b/maps/room/10/6.tmx similarity index 100% rename from mrrescue/maps/room/10/6.tmx rename to maps/room/10/6.tmx diff --git a/mrrescue/maps/room/11/1.lua b/maps/room/11/1.lua similarity index 100% rename from mrrescue/maps/room/11/1.lua rename to maps/room/11/1.lua diff --git a/mrrescue/maps/room/11/1.tmx b/maps/room/11/1.tmx similarity index 100% rename from mrrescue/maps/room/11/1.tmx rename to maps/room/11/1.tmx diff --git a/mrrescue/maps/room/11/2.lua b/maps/room/11/2.lua similarity index 100% rename from mrrescue/maps/room/11/2.lua rename to maps/room/11/2.lua diff --git a/mrrescue/maps/room/11/2.tmx b/maps/room/11/2.tmx similarity index 100% rename from mrrescue/maps/room/11/2.tmx rename to maps/room/11/2.tmx diff --git a/mrrescue/maps/room/11/3.lua b/maps/room/11/3.lua similarity index 100% rename from mrrescue/maps/room/11/3.lua rename to maps/room/11/3.lua diff --git a/mrrescue/maps/room/11/3.tmx b/maps/room/11/3.tmx similarity index 100% rename from mrrescue/maps/room/11/3.tmx rename to maps/room/11/3.tmx diff --git a/mrrescue/maps/room/11/4.lua b/maps/room/11/4.lua similarity index 100% rename from mrrescue/maps/room/11/4.lua rename to maps/room/11/4.lua diff --git a/mrrescue/maps/room/11/4.tmx b/maps/room/11/4.tmx similarity index 100% rename from mrrescue/maps/room/11/4.tmx rename to maps/room/11/4.tmx diff --git a/mrrescue/maps/room/11/5.lua b/maps/room/11/5.lua similarity index 100% rename from mrrescue/maps/room/11/5.lua rename to maps/room/11/5.lua diff --git a/mrrescue/maps/room/11/5.tmx b/maps/room/11/5.tmx similarity index 100% rename from mrrescue/maps/room/11/5.tmx rename to maps/room/11/5.tmx diff --git a/mrrescue/maps/room/11/6.lua b/maps/room/11/6.lua similarity index 100% rename from mrrescue/maps/room/11/6.lua rename to maps/room/11/6.lua diff --git a/mrrescue/maps/room/11/6.tmx b/maps/room/11/6.tmx similarity index 100% rename from mrrescue/maps/room/11/6.tmx rename to maps/room/11/6.tmx diff --git a/mrrescue/maps/room/17/1.lua b/maps/room/17/1.lua similarity index 100% rename from mrrescue/maps/room/17/1.lua rename to maps/room/17/1.lua diff --git a/mrrescue/maps/room/17/1.tmx b/maps/room/17/1.tmx similarity index 100% rename from mrrescue/maps/room/17/1.tmx rename to maps/room/17/1.tmx diff --git a/mrrescue/maps/room/17/2.lua b/maps/room/17/2.lua similarity index 100% rename from mrrescue/maps/room/17/2.lua rename to maps/room/17/2.lua diff --git a/mrrescue/maps/room/17/2.tmx b/maps/room/17/2.tmx similarity index 100% rename from mrrescue/maps/room/17/2.tmx rename to maps/room/17/2.tmx diff --git a/mrrescue/maps/room/17/3.lua b/maps/room/17/3.lua similarity index 100% rename from mrrescue/maps/room/17/3.lua rename to maps/room/17/3.lua diff --git a/mrrescue/maps/room/17/3.tmx b/maps/room/17/3.tmx similarity index 100% rename from mrrescue/maps/room/17/3.tmx rename to maps/room/17/3.tmx diff --git a/mrrescue/maps/room/17/4.lua b/maps/room/17/4.lua similarity index 100% rename from mrrescue/maps/room/17/4.lua rename to maps/room/17/4.lua diff --git a/mrrescue/maps/room/17/4.tmx b/maps/room/17/4.tmx similarity index 100% rename from mrrescue/maps/room/17/4.tmx rename to maps/room/17/4.tmx diff --git a/mrrescue/maps/room/17/5.lua b/maps/room/17/5.lua similarity index 100% rename from mrrescue/maps/room/17/5.lua rename to maps/room/17/5.lua diff --git a/mrrescue/maps/room/17/5.tmx b/maps/room/17/5.tmx similarity index 100% rename from mrrescue/maps/room/17/5.tmx rename to maps/room/17/5.tmx diff --git a/mrrescue/maps/room/17/6.lua b/maps/room/17/6.lua similarity index 100% rename from mrrescue/maps/room/17/6.lua rename to maps/room/17/6.lua diff --git a/mrrescue/maps/room/17/6.tmx b/maps/room/17/6.tmx similarity index 100% rename from mrrescue/maps/room/17/6.tmx rename to maps/room/17/6.tmx diff --git a/mrrescue/maps/room/24/1.lua b/maps/room/24/1.lua similarity index 100% rename from mrrescue/maps/room/24/1.lua rename to maps/room/24/1.lua diff --git a/mrrescue/maps/room/24/1.tmx b/maps/room/24/1.tmx similarity index 100% rename from mrrescue/maps/room/24/1.tmx rename to maps/room/24/1.tmx diff --git a/mrrescue/maps/room/24/2.lua b/maps/room/24/2.lua similarity index 100% rename from mrrescue/maps/room/24/2.lua rename to maps/room/24/2.lua diff --git a/mrrescue/maps/room/24/2.tmx b/maps/room/24/2.tmx similarity index 100% rename from mrrescue/maps/room/24/2.tmx rename to maps/room/24/2.tmx diff --git a/mrrescue/maps/room/24/3.lua b/maps/room/24/3.lua similarity index 100% rename from mrrescue/maps/room/24/3.lua rename to maps/room/24/3.lua diff --git a/mrrescue/maps/room/24/3.tmx b/maps/room/24/3.tmx similarity index 100% rename from mrrescue/maps/room/24/3.tmx rename to maps/room/24/3.tmx diff --git a/mrrescue/maps/room/24/4.lua b/maps/room/24/4.lua similarity index 100% rename from mrrescue/maps/room/24/4.lua rename to maps/room/24/4.lua diff --git a/mrrescue/maps/room/24/4.tmx b/maps/room/24/4.tmx similarity index 100% rename from mrrescue/maps/room/24/4.tmx rename to maps/room/24/4.tmx diff --git a/mrrescue/maps/room/24/5.lua b/maps/room/24/5.lua similarity index 100% rename from mrrescue/maps/room/24/5.lua rename to maps/room/24/5.lua diff --git a/mrrescue/maps/room/24/5.tmx b/maps/room/24/5.tmx similarity index 100% rename from mrrescue/maps/room/24/5.tmx rename to maps/room/24/5.tmx diff --git a/mrrescue/maps/room/24/6.lua b/maps/room/24/6.lua similarity index 100% rename from mrrescue/maps/room/24/6.lua rename to maps/room/24/6.lua diff --git a/mrrescue/maps/room/24/6.tmx b/maps/room/24/6.tmx similarity index 100% rename from mrrescue/maps/room/24/6.tmx rename to maps/room/24/6.tmx diff --git a/mrrescue/maps/top_base.lua b/maps/top_base.lua similarity index 100% rename from mrrescue/maps/top_base.lua rename to maps/top_base.lua diff --git a/mrrescue/maps/top_base.tmx b/maps/top_base.tmx similarity index 100% rename from mrrescue/maps/top_base.tmx rename to maps/top_base.tmx diff --git a/mrrescue/conf.lua b/mrrescue/conf.lua deleted file mode 100644 index 85c990e..0000000 --- a/mrrescue/conf.lua +++ /dev/null @@ -1,22 +0,0 @@ -function love.conf(t) - t.identity = "mrrescue" - t.version = "0.9.1" - t.console = false - - t.window.title = "Mr. Rescue" - t.window.icon = nil - t.window.width = 256*3 - t.window.height = 200*3 - t.window.borderless = false - t.window.resizable = false - t.window.fullscreen = false - t.window.fullscreentype = "normal" - t.window.vsync = true - t.window.fsaa = 0 - t.window.display = 1 - t.window.highdpi = false - t.window.srgb = false - - t.modules.physics = false - t.modules.mouse = false -end diff --git a/mrrescue/options.lua b/options.lua similarity index 98% rename from mrrescue/options.lua rename to options.lua index 6fd4903..21d5bb3 100644 --- a/mrrescue/options.lua +++ b/options.lua @@ -164,7 +164,8 @@ function options.action(k) end elseif k == "jump" then if options.selection == 2 then -- FULLSCREEN - toggleFullscreen() + config.fullscreen = wrap(config.fullscreen + 1, 0, 3) + setMode() playSound("blip") elseif options.selection == 3 then -- VSYNC toggleVSync() diff --git a/mrrescue/particles.lua b/particles.lua similarity index 100% rename from mrrescue/particles.lua rename to particles.lua diff --git a/mrrescue/player.lua b/player.lua similarity index 100% rename from mrrescue/player.lua rename to player.lua diff --git a/mrrescue/resources.lua b/resources.lua similarity index 99% rename from mrrescue/resources.lua rename to resources.lua index c0185a8..e5aa70d 100644 --- a/mrrescue/resources.lua +++ b/resources.lua @@ -147,7 +147,7 @@ function loadResources() img.stream:setWrap("repeat", "clamp") -- Create fonts - font.bold = lg.newImageFont(img.boldfont, " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?") + font.bold = lg.newImageFont(img.boldfont, " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?", 2) lg.setFont(font.bold) -- Create quads diff --git a/mrrescue/slam.lua b/slam.lua similarity index 100% rename from mrrescue/slam.lua rename to slam.lua diff --git a/mrrescue/splash.lua b/splash.lua similarity index 100% rename from mrrescue/splash.lua rename to splash.lua diff --git a/mrrescue/summary.lua b/summary.lua similarity index 100% rename from mrrescue/summary.lua rename to summary.lua diff --git a/mrrescue/util.lua b/util.lua similarity index 100% rename from mrrescue/util.lua rename to util.lua -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mrrescue.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

