From 35e21052b7aabc58dd9c5367793ace8fc2cda6bb Mon Sep 17 00:00:00 2001 From: rodent Date: Sat, 2 Nov 2013 17:09:26 +0000 Subject: [PATCH] Updated to latest stable, 1.1.0. Set LUA_VERSION_REQD=51, as the default, 52, doesn't work. Needs -lreadline and something else. Will look into this later. From ChangeLog: Engine changes -------------- * Add a very short sample quest with free graphics and musics (#232, #318). * Allow scripted dialog boxes (#184). * Allow a scripted game-over menu (#261). * Replace the old built-in dialog box by a very minimal one. * Remove the old built-in game-over menu. * Remove the old built-in dark rooms displaying (#205). * New entity: separators to visually separate some regions in a map (#177). * New type of ground: ice (#182). * New type of ground: low walls (#117). * Blocks and thrown items can now fall into holes, lava and water (#191). * Kill enemies that fall into holes, lava and water (#190). * Allow quest makers and users to set the size of the playing area. * Allow maps to have a default destination entity (#231). * A game can now start without specifying an initial map and destination. * Stairs inside a single floor can now go from any layer to a next one (#178). * Fix map menus not receiving on_command_pressed/released() events. * Fix camera callbacks never called when already on the target (#308). * Fix a crash when adding a new menu during a menu:on_finished() event. * Fix a crash when calling hero:start_victory() without sword. * Fix an error when loading sounds (#236). Sounds were working anyway. * Fix a possible memory error when playing sounds. * Fix blocks that continue to follow the hero after picking a treasure (#284). * Fix on_obtained() that was not called for non-brandished treasures (#295). * Jumpers can no longer be activated the opposite way when in water. * Jumpers are now activated after a slight delay (#253). * Sensors no longer automatically reset the hero's movement (#292). * Correctly detect the ground below the hero or any point. * Don't die if there is a syntax error in dialogs.dat. * Show a better error message if trying to play a Solarus 0.9 quest (#260). * Remove built-in debug keys. This can be done from Lua now. * Remove the preprocessor constant SOLARUS_DEBUG_KEYS. * Call on_draw() before drawing menus. * Fix .it musics looping when they should not. * Log all errors in error.txt (#287). * The quest archive can now also be named data.solarus.zip (#293). Data files format changes ------------------------- You can use the script tools/data_files_conversion/1.0_to_1.1/update_quest.lua to automatically update your data files. Don't forget to make a backup first. * Sprites: New syntax easier to read and parse (#168). * project_db.dat: New syntax easier to read and parse (#169). * quest.dat: Allow to specify a range of supported quest sizes. * Maps: Add the property "default" to destinations. * Maps: Make optional the property "destination" of teletransporters. * Tilesets: The ground value of diagonal walls with water has changed. * Tilesets: New ground values "ice" and "low_wall". * dialogs.dat: Allow any property in dialogs. dialog_id and text are mandatory. * languages.dat no longer exists. Languages are in project_db.dat now (#265). Lua API changes --------------- Changes that introduce incompatibilities: * map:is_dialog_enabled() is replaced by game:is_dialog_enabled(). * map:start_dialog() is replaced by game:start_dialog(). * Remove map:draw_dialog_box(), no longer needed. * Remove map:set_dialog_style(): replace it in your own dialog box system. * Remove map:set_dialog_position(): replace it in your own dialog box system. * Remove map:set_dialog_variable(): use the info param of game:start_dialog(). * Make map:get_entities() returns an iterator instead of an array (#249). * Replace map:set_pause_enabled() by game:set_pause_allowed(). * Make the enemy:create_enemy() more like map:create_enemy() (#215). * Remove sol.language.get_default_language(), useless and misleading (#265). * Remove sol.main.is_debug_enabled(). * Remove map:get_light() and map:set_light() (#205). * In game:get/set_ability(), ability "get_back_from_death" no longer exists. * Empty chests no longer show a dialog if there is no on:empty() event (#274). Changes that do not introduce incompatibilities: * game:get/set_starting_location(): map and destination can now be nil. * hero:teleport(): make destination optional (maps now have a default one). * map:create_teletransporter(): make destination optional. * Add a function sol.video.get_quest_size(). * Make map:get_camera_position() also return the size of the visible area. * Add a method entity:is_in_same_region(entity). * Add a method entity:get_center_position(). * Add methods entity:get_direction4_to(), entity:get_direction8_to() (#150). * Add a method game:get_hero(). * Add methods hero:get/set_walking_speed() (#206). * Add hero:get_state() and hero:on_state_changed() (#207). * Add events separator:on_activating() and separator:on_activated() (#272). * Add methods enemy:is/set_traversable() (#147). * Add a method enemy:immobilize() (#160). * Add on_position_changed() to all entities, not only enemies (#298). * Add on_obstacle_reached() to all entities, not only enemies (#298). * Add on_movement_changed() to all entities, not only enemies (#298). * Add on_movement_finished() to all entities, not only enemies/NPCs (#298). * target_movement:set_target(entity) now accepts an x,y offset (#154). * Add a method game:is_pause_allowed(). * Add a method map:get_ground() (#141). * Add a method map:get_music() (#306). * Add an optional parameter on_top to sol.menu.start. * Add sprite:on_animation_changed() and sprite:on_direction_changed() (#153). * Add a function sol.input.is_key_pressed(). * Add a function sol.input.is_joypad_button_pressed(). * Add a function sol.input.get_joypad_axis_state(). * Add a function sol.input.get_joypad_hat_direction(). * Add functions sol.input.is/set_joypad_enabled() (#175). * Add a function sol.audio.get_music() (#146). * Add a function sol.audio.get_music_format(). * Add a function sol.audio.get_music_num_channels(). * Add functions sol.audio.get/set_music_channel_volume() for .it files (#250). * Add functions sol.audio.get/set_music_tempo() for .it files (#250). * Return nil if the string is not found in sol.language.get_string(). * sol.language.get_dialog() is now implemented. * Add a function game:stop_dialog(status) to close the scripted dialog box. * Add an event game:on_dialog_started(dialog, info). * Add an event game:on_dialog_finished(dialog). * Add functions game:start_game_over() and game:stop_game_over (#261). * Add events game:on_game_over_started(), game:on_game_over_finished (#261). * Add sol.file functions: open(), exists(), remove(), mkdir() (#267). Solarus Quest Editor changes ---------------------------- * Add a GUI to upgrade automatically quest files to the latest format (#247). * Remove the initial prompt dialog to open a quest (#264). * Replace non-free images by new icons (#245). * Add tooltips to the add entity toolbar. * Simplify the add entity toolbar by showing only one icon per entity type. * Survive when images cannot be found (#256). * Create more content when creating a new quest (#258, #279). * Improve error messages. * Fix a crash when creating a destructible without tileset selected (#283). * Fix the sprite field disabled in the NPC properties dialog (#303). --- games/solarus/Makefile | 6 +++--- games/solarus/distinfo | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/games/solarus/Makefile b/games/solarus/Makefile index eb86b909c7029..3ed83592fa1bb 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2013/10/30 10:47:32 obache Exp $ +# $NetBSD: Makefile,v 1.7 2013/11/02 17:09:26 rodent Exp $ -VERSION= 1.0.4 +VERSION= 1.1.0 DISTNAME= solarus-${VERSION}-src PKGNAME= ${DISTNAME:S/-src//1} -PKGREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.solarus-games.org/downloads/solarus/ @@ -17,6 +16,7 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ .include "../../devel/physfs/buildlink3.mk" +LUA_VERSION_REQD= 51 BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.5 .include "../../lang/lua/buildlink3.mk" .include "../../audio/libmodplug/buildlink3.mk" diff --git a/games/solarus/distinfo b/games/solarus/distinfo index 344f2e1f506dd..2d91bd07a0d12 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2013/07/07 17:41:31 rodent Exp $ +$NetBSD: distinfo,v 1.3 2013/11/02 17:09:26 rodent Exp $ -SHA1 (solarus-1.0.4-src.tar.gz) = 793311c59b374f4e07ce8ee277fce2ab079e7b1c -RMD160 (solarus-1.0.4-src.tar.gz) = 5383513f7d118812823c6e0644758b24ce3105d1 -Size (solarus-1.0.4-src.tar.gz) = 702674 bytes +SHA1 (solarus-1.1.0-src.tar.gz) = e52791edf33b11b8abb4f1032e456c61b326a50f +RMD160 (solarus-1.1.0-src.tar.gz) = 94525793b0163e4311c3b1a337e7041bed9d62e7 +Size (solarus-1.1.0-src.tar.gz) = 2393855 bytes