This is an automated email from the git hooks/post-receive script. detiste-guest pushed a commit to branch master in repository mrrescue.
commit 684e4db9752611c4d02fb455e6a6e76df6f24c4a Merge: 0d51518 ff8e472 Author: Alexandre Detiste <[email protected]> Date: Sat Jan 21 11:58:46 2017 +0100 Merge tag 'upstream/1.02e' 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(-) -- 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
