[corsix-th] 02/02: Merge tag 'upstream/0.60'
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Tue May 31 17:29:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
detiste-guest pushed a commit to branch master
in repository corsix-th.
commit f5cc45659332f5a78585070c9ed7c6de7614c851
Merge: b6dafe0 e04433a
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Tue May 31 19:26:41 2016 +0200
Merge tag 'upstream/0.60'
Upstream version 0.60
.gitattributes | 17 -
.github/ISSUE_TEMPLATE.md | 40 +
.travis.yml | 126 +-
AnimView/rnc.cpp | 30 +-
AnimView/th.cpp | 2 +-
AnimView/tinystr.h | 2 +-
AnimView/tinyxml.h | 12 +-
AnimView/tinyxmlerror.cpp | 2 +-
AnimView/tinyxmlparser.cpp | 2 +-
CMake/FindLua.cmake | 15 +-
CMake/FindSDL2_mixer.cmake | 4 +-
CMakeLists.txt | 33 -
CONTRIBUTING.txt | 48 -
CorsixTH/Bitmap/flags32.png | Bin 342 -> 0 bytes
CorsixTH/Bitmap/new32.png | Bin 1008 -> 0 bytes
CorsixTH/Bitmap/open32.png | Bin 1550 -> 0 bytes
CorsixTH/Bitmap/parcels32.png | Bin 413 -> 0 bytes
CorsixTH/Bitmap/positions32.png | Bin 358 -> 0 bytes
CorsixTH/Bitmap/redo32.png | Bin 1502 -> 0 bytes
CorsixTH/Bitmap/save32.png | Bin 890 -> 0 bytes
CorsixTH/Bitmap/transparent_walls32.png | Bin 353 -> 0 bytes
CorsixTH/Bitmap/undo32.png | Bin 1601 -> 0 bytes
CorsixTH/CMakeLists.txt | 20 +-
CorsixTH/Campaigns/ChrizmanTV.campaign | 46 +
CorsixTH/Campaigns/Coffalot.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Dethsdaw.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Four Corners.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Greyham Gardens.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Holby.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Hoppalong.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Royal Hospital.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Snuffit Sands.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Tufflook.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Upper Pukington.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Wishinwell.map | Bin 0 -> 163948 bytes
CorsixTH/Campaigns/Writhe.map | Bin 0 -> 163948 bytes
.../avatar.level => Campaigns/coffalot.level} | 159 +-
CorsixTH/Campaigns/dethsdaw.level | 299 +++
CorsixTH/Campaigns/example.campaign | 13 +
.../avatar.level => Campaigns/fourcorners.level} | 189 +-
.../greyhamgardens.level} | 173 +-
.../{Levels/avatar.level => Campaigns/holby.level} | 164 +-
CorsixTH/Campaigns/hoppalong.level | 299 +++
CorsixTH/Campaigns/royalhospital.level | 301 +++
.../avatar.level => Campaigns/snuffitsands.level} | 186 +-
CorsixTH/Campaigns/tufflook.level | 299 +++
.../upperpukington.level} | 181 +-
.../avatar.level => Campaigns/wishinwell.level} | 191 +-
.../avatar.level => Campaigns/writhe.level} | 165 +-
CorsixTH/CorsixTH.lua | 2 -
CorsixTH/Levels/avatar.level | 25 +-
CorsixTH/Levels/confined_v5.level | 24 +-
CorsixTH/Levels/demo.level | 11 +-
CorsixTH/Levels/example.level | 30 +-
CorsixTH/Levels/finisham.level | 30 +-
CorsixTH/Levels/st.peter's.level | 24 +-
CorsixTH/Lua/api_version.lua | 4 +-
CorsixTH/Lua/app.lua | 395 ++--
CorsixTH/Lua/audio.lua | 16 +-
CorsixTH/Lua/base_config.lua | 4 +-
CorsixTH/Lua/calls_dispatcher.lua | 87 +-
CorsixTH/Lua/class.lua | 2 +-
CorsixTH/Lua/command.lua | 29 -
CorsixTH/Lua/command_stack.lua | 61 -
CorsixTH/Lua/commands/compound.lua | 48 -
CorsixTH/Lua/commands/set_map_cell.lua | 50 -
CorsixTH/Lua/commands/set_map_cell_flags.lua | 49 -
CorsixTH/Lua/config_finder.lua | 17 +-
CorsixTH/Lua/dialogs/adviser.lua | 7 +-
CorsixTH/Lua/dialogs/build_room.lua | 24 +-
CorsixTH/Lua/dialogs/edit_room.lua | 96 +-
CorsixTH/Lua/dialogs/fullscreen.lua | 10 +-
CorsixTH/Lua/dialogs/fullscreen/annual_report.lua | 8 +-
CorsixTH/Lua/dialogs/fullscreen/bank_manager.lua | 32 +-
CorsixTH/Lua/dialogs/fullscreen/drug_casebook.lua | 4 +-
CorsixTH/Lua/dialogs/fullscreen/fax.lua | 52 +-
.../Lua/dialogs/fullscreen/progress_report.lua | 34 +-
.../Lua/dialogs/fullscreen/research_policy.lua | 25 +-
.../Lua/dialogs/fullscreen/staff_management.lua | 33 +-
CorsixTH/Lua/dialogs/fullscreen/town_map.lua | 21 +-
CorsixTH/Lua/dialogs/furnish_corridor.lua | 8 +-
CorsixTH/Lua/dialogs/hire_staff.lua | 14 +-
CorsixTH/Lua/dialogs/information.lua | 19 +-
CorsixTH/Lua/dialogs/jukebox.lua | 2 +-
CorsixTH/Lua/dialogs/machine_dialog.lua | 18 +-
CorsixTH/Lua/dialogs/map_editor.lua | 663 ------
CorsixTH/Lua/dialogs/menu.lua | 56 +-
CorsixTH/Lua/dialogs/message.lua | 4 +-
CorsixTH/Lua/dialogs/patient.lua | 72 +-
CorsixTH/Lua/dialogs/place_objects.lua | 34 +-
CorsixTH/Lua/dialogs/place_staff.lua | 7 +-
CorsixTH/Lua/dialogs/queue_dialog.lua | 8 +-
CorsixTH/Lua/dialogs/resizables/cheats.lua | 26 +
.../Lua/dialogs/resizables/directory_browser.lua | 4 +-
CorsixTH/Lua/dialogs/resizables/file_browser.lua | 2 +-
.../dialogs/resizables/file_browsers/load_map.lua | 56 +
.../dialogs/resizables/file_browsers/save_map.lua | 106 +
.../Lua/dialogs/resizables/folder_settings.lua | 24 +-
CorsixTH/Lua/dialogs/resizables/main_menu.lua | 61 +-
CorsixTH/Lua/dialogs/resizables/map_editor.lua | 1569 ++++++++++++++
.../Lua/dialogs/resizables/menu_list_dialog.lua | 14 +-
.../menu_list_dialogs/custom_campaign.lua | 126 ++
.../resizables/menu_list_dialogs/custom_game.lua | 137 +-
CorsixTH/Lua/dialogs/resizables/new_game.lua | 13 +-
CorsixTH/Lua/dialogs/staff_dialog.lua | 80 +-
CorsixTH/Lua/dialogs/tree_ctrl.lua | 8 +-
CorsixTH/Lua/dialogs/watch.lua | 65 +-
CorsixTH/Lua/entities/humanoid.lua | 61 +-
CorsixTH/Lua/entities/inspector.lua | 2 +-
CorsixTH/Lua/entities/machine.lua | 145 +-
CorsixTH/Lua/entities/object.lua | 32 +-
CorsixTH/Lua/entities/patient.lua | 480 ++--
CorsixTH/Lua/entities/staff.lua | 110 +-
CorsixTH/Lua/entities/vip.lua | 317 ++-
CorsixTH/Lua/entity.lua | 17 +-
CorsixTH/Lua/epidemic.lua | 156 +-
CorsixTH/Lua/filesystem.lua | 4 +-
CorsixTH/Lua/game_ui.lua | 110 +-
CorsixTH/Lua/graphics.lua | 8 +-
CorsixTH/Lua/hospital.lua | 432 +++-
CorsixTH/Lua/humanoid_actions/die.lua | 2 +-
CorsixTH/Lua/humanoid_actions/meander.lua | 15 +-
CorsixTH/Lua/humanoid_actions/pickup.lua | 2 +-
CorsixTH/Lua/humanoid_actions/queue.lua | 15 +-
CorsixTH/Lua/humanoid_actions/seek_reception.lua | 7 +-
CorsixTH/Lua/humanoid_actions/seek_room.lua | 20 +-
CorsixTH/Lua/humanoid_actions/seek_toilets.lua | 4 +-
CorsixTH/Lua/humanoid_actions/spawn.lua | 2 +-
CorsixTH/Lua/humanoid_actions/use_object.lua | 6 +-
CorsixTH/Lua/humanoid_actions/vaccinate.lua | 19 +-
CorsixTH/Lua/humanoid_actions/walk.lua | 26 +-
CorsixTH/Lua/languages/brazilian_portuguese.lua | 182 +-
CorsixTH/Lua/languages/czech.lua | 324 +--
CorsixTH/Lua/languages/danish.lua | 230 +-
CorsixTH/Lua/languages/dutch.lua | 241 +-
CorsixTH/Lua/languages/english.lua | 115 +-
CorsixTH/Lua/languages/finnish.lua | 239 +-
CorsixTH/Lua/languages/french.lua | 607 +++---
CorsixTH/Lua/languages/german.lua | 16 +-
CorsixTH/Lua/languages/hungarian.lua | 4 +-
CorsixTH/Lua/languages/iberic_portuguese.lua | 18 +-
CorsixTH/Lua/languages/italian.lua | 266 ++-
CorsixTH/Lua/languages/korean.lua | 238 +-
CorsixTH/Lua/languages/norwegian.lua | 398 ++--
CorsixTH/Lua/languages/original_strings.lua | 16 +-
CorsixTH/Lua/languages/polish.lua | 239 +-
CorsixTH/Lua/languages/russian.lua | 243 +--
CorsixTH/Lua/languages/simplified_chinese.lua | 241 +-
CorsixTH/Lua/languages/spanish.lua | 291 ++-
CorsixTH/Lua/languages/swedish.lua | 132 +-
CorsixTH/Lua/languages/traditional_chinese.lua | 239 +-
CorsixTH/Lua/map.lua | 237 +-
CorsixTH/Lua/movie_player.lua | 4 +-
CorsixTH/Lua/objects/bin.lua | 1 +
CorsixTH/Lua/objects/desk.lua | 2 +-
CorsixTH/Lua/objects/door.lua | 2 +-
CorsixTH/Lua/objects/doors/entrance_right_door.lua | 2 +-
CorsixTH/Lua/objects/helicopter.lua | 2 +
CorsixTH/Lua/objects/litter.lua | 6 +-
CorsixTH/Lua/objects/plant.lua | 127 +-
CorsixTH/Lua/objects/reception_desk.lua | 9 +-
CorsixTH/Lua/persistance.lua | 28 +-
CorsixTH/Lua/queue.lua | 60 +-
CorsixTH/Lua/research_department.lua | 87 +-
CorsixTH/Lua/room.lua | 85 +-
CorsixTH/Lua/rooms/gp.lua | 26 +-
CorsixTH/Lua/rooms/operating_theatre.lua | 2 +-
CorsixTH/Lua/rooms/psych.lua | 2 +-
CorsixTH/Lua/rooms/research.lua | 3 -
CorsixTH/Lua/rooms/scanner_room.lua | 3 +-
CorsixTH/Lua/rooms/toilets.lua | 45 +-
CorsixTH/Lua/rooms/training.lua | 4 +-
CorsixTH/Lua/rooms/ward.lua | 9 +-
CorsixTH/Lua/run_debugger.lua | 10 +-
CorsixTH/Lua/sprite_viewer.lua | 4 +-
CorsixTH/Lua/staff_profile.lua | 4 +-
CorsixTH/Lua/string_extensions.lua | 16 +-
CorsixTH/Lua/strings.lua | 10 +-
CorsixTH/Lua/ui.lua | 36 +-
CorsixTH/Lua/utility.lua | 29 +-
CorsixTH/Lua/walls/external.lua | 4 +
CorsixTH/Lua/window.lua | 67 +-
CorsixTH/Lua/world.lua | 461 ++--
CorsixTH/RequiredResources.txt | 9 +-
CorsixTH/Src/bootstrap.cpp | 34 +-
CorsixTH/Src/config.h.in | 17 +-
CorsixTH/Src/iso_fs.cpp | 54 +-
CorsixTH/Src/iso_fs.h | 2 +-
CorsixTH/Src/lua.hpp | 25 +-
CorsixTH/Src/lua_sdl.h | 6 +-
CorsixTH/Src/main.cpp | 29 +-
CorsixTH/Src/persist_lua.cpp | 108 +-
CorsixTH/Src/persist_lua.h | 19 +-
CorsixTH/Src/random.c | 6 +-
CorsixTH/Src/rnc.cpp | 58 +-
CorsixTH/Src/run_length_encoder.cpp | 18 +-
CorsixTH/Src/run_length_encoder.h | 4 +-
CorsixTH/Src/sdl_audio.cpp | 42 +-
CorsixTH/Src/sdl_core.cpp | 63 +-
CorsixTH/Src/sdl_wm.cpp | 4 +-
CorsixTH/Src/th.cpp | 105 +-
CorsixTH/Src/th.h | 56 +-
CorsixTH/Src/th_gfx.cpp | 96 +-
CorsixTH/Src/th_gfx.h | 36 +-
CorsixTH/Src/th_gfx_font.cpp | 284 ++-
CorsixTH/Src/th_gfx_font.h | 106 +-
CorsixTH/Src/th_gfx_sdl.cpp | 165 +-
CorsixTH/Src/th_gfx_sdl.h | 35 +-
CorsixTH/Src/th_lua.cpp | 93 +-
CorsixTH/Src/th_lua.h | 108 +-
CorsixTH/Src/th_lua_anims.cpp | 2 +-
CorsixTH/Src/th_lua_gfx.cpp | 105 +-
CorsixTH/Src/th_lua_internal.h | 5 -
CorsixTH/Src/th_lua_map.cpp | 436 ++--
CorsixTH/Src/th_lua_movie.cpp | 14 +-
CorsixTH/Src/th_lua_sound.cpp | 25 +-
CorsixTH/Src/th_lua_strings.cpp | 4 +-
CorsixTH/Src/th_lua_ui.cpp | 49 +-
CorsixTH/Src/th_map.cpp | 545 +++--
CorsixTH/Src/th_map.h | 284 +--
CorsixTH/Src/th_map_overlays.cpp | 94 +-
CorsixTH/Src/th_map_overlays.h | 38 +-
CorsixTH/Src/th_movie.cpp | 350 ++-
CorsixTH/Src/th_movie.h | 319 ++-
CorsixTH/Src/th_pathfind.cpp | 178 +-
CorsixTH/Src/th_pathfind.h | 42 +-
CorsixTH/Src/th_sound.cpp | 31 +-
CorsixTH/Src/th_sound.h | 4 +-
CorsixTH/Src/xmi2mid.cpp | 70 +-
CorsixTH/Src/xmi2mid.h | 2 +-
CorsixTH/SrcUnshared/main.cpp | 41 +-
CorsixTH/changelog.txt | 55 +-
DebianPackage/control | 14 -
DebianPackage/debian-binary | 1 -
DebianPackage/postinst | 5 -
DebianPackage/prerm | 5 -
DebianPackage/readme.txt | 17 -
DebianPackage/usr/games/CorsixTH | 1 -
.../usr/share/applications/CorsixTH.desktop | 11 -
.../usr/share/applications/MapEdit.desktop | 11 -
DebianPackage/usr/share/doc/corsix-th/copyright | 19 -
DoxyGen/animview.doxygen | 2 +-
DoxyGen/corsixth_engine.doxygen | 2 +-
DoxyGen/leveledit.doxygen | 2 +-
DoxyGen/mapedit.doxygen | 2291 --------------------
Eclipse/Luna/CorsixTH/.buildpath | 9 -
Eclipse/Luna/CorsixTH/.project | 75 -
Eclipse/Luna/CorsixTH/README.txt | 2 -
LDocGen/lua_scan.lua | 1 +
LDocGen/output/main.css | 2 +-
LICENSE.txt | 64 +-
.../src/com/corsixth/leveledit/ReaderWriter.java | 2 +-
MapEdit/CMakeLists.txt | 200 --
MapEdit/Icon.icns | Bin 106194 -> 0 bytes
MapEdit/MapEdit.ico | Bin 136837 -> 0 bytes
MapEdit/MapEdit.rc | 34 -
MapEdit/RequiredResources.txt | 14 -
MapEdit/Src/app.cpp | 38 -
MapEdit/Src/app.h | 47 -
MapEdit/Src/block_gallery.cpp | 286 ---
MapEdit/Src/block_gallery.h | 86 -
MapEdit/Src/embedded_game.cpp | 448 ----
MapEdit/Src/embedded_game.h | 146 --
MapEdit/Src/frmLog.cpp | 43 -
MapEdit/Src/frmLog.h | 50 -
MapEdit/Src/frmMain.cpp | 761 -------
MapEdit/Src/frmMain.h | 129 --
MapEdit/Src/game.h | 31 -
MapEdit/Src/scrollable_game.cpp | 304 ---
MapEdit/Src/scrollable_game.h | 79 -
MapEdit/Src/th_map_wrapper.cpp | 391 ----
MapEdit/Src/th_map_wrapper.h | 70 -
README.md | 6 +-
WindowsInstaller/Win32Script.nsi | 4 +-
WindowsInstaller/config_template.txt | 5 +
appveyor.yml | 27 +
276 files changed, 11959 insertions(+), 13177 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git
More information about the Pkg-games-commits
mailing list