[corsix-th] 03/05: Merge tag 'upstream/0.61_beta1'
Phil Morrell
emorrp1-guest at moszumanska.debian.org
Fri Nov 17 11:14:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
emorrp1-guest pushed a commit to branch master
in repository corsix-th.
commit 3d74b2d4cfcc9548d3856b75aadc2afd71dad08d
Merge: 60572e0 11439d2
Author: Phil Morrell <debian at emorrp1.name>
Date: Fri Nov 17 11:02:16 2017 +0000
Merge tag 'upstream/0.61_beta1'
Upstream version 0.61~beta1
.gitignore | 8 +
.luacheckrc | 233 +
.travis.yml | 11 +-
AnimView/VSPR-0.xml | 181414 ------------------
AnimView/frmMain.cpp | 6 +-
AnimView/th.cpp | 7 +-
CMake/CopyVcpkgLua.cmake | 29 +
CMake/FindLua.cmake | 4 +-
CMake/PrecompiledDeps.cmake | 100 +
CMake/VcpkgDeps.cmake | 61 +
CMakeLists.txt | 29 +-
CorsixTH/CMakeLists.txt | 44 +-
CorsixTH/CorsixTH.lua | 13 -
CorsixTH/CorsixTH.rc | 4 +-
CorsixTH/Lua/api_version.lua | 4 +-
CorsixTH/Lua/app.lua | 124 +-
CorsixTH/Lua/audio.lua | 112 +-
CorsixTH/Lua/calls_dispatcher.lua | 35 +-
CorsixTH/Lua/class.lua | 5 +-
CorsixTH/Lua/config_finder.lua | 8 +-
CorsixTH/Lua/debug_script.lua | 6 +-
CorsixTH/Lua/dialogs/bottom_panel.lua | 26 +-
CorsixTH/Lua/dialogs/build_room.lua | 8 +-
CorsixTH/Lua/dialogs/edit_room.lua | 325 +-
CorsixTH/Lua/dialogs/fullscreen.lua | 27 +-
CorsixTH/Lua/dialogs/fullscreen/annual_report.lua | 138 +-
CorsixTH/Lua/dialogs/fullscreen/bank_manager.lua | 6 +-
CorsixTH/Lua/dialogs/fullscreen/drug_casebook.lua | 2 +-
CorsixTH/Lua/dialogs/fullscreen/fax.lua | 19 +-
CorsixTH/Lua/dialogs/fullscreen/graphs.lua | 381 +-
.../Lua/dialogs/fullscreen/hospital_policy.lua | 65 +-
.../Lua/dialogs/fullscreen/progress_report.lua | 9 +-
.../Lua/dialogs/fullscreen/research_policy.lua | 14 +-
.../Lua/dialogs/fullscreen/staff_management.lua | 5 +-
CorsixTH/Lua/dialogs/fullscreen/town_map.lua | 9 +-
CorsixTH/Lua/dialogs/furnish_corridor.lua | 16 +-
CorsixTH/Lua/dialogs/hire_staff.lua | 6 +-
CorsixTH/Lua/dialogs/information.lua | 6 +-
CorsixTH/Lua/dialogs/jukebox.lua | 8 +-
CorsixTH/Lua/dialogs/machine_dialog.lua | 2 +-
CorsixTH/Lua/dialogs/menu.lua | 26 +-
CorsixTH/Lua/dialogs/message.lua | 8 +-
CorsixTH/Lua/dialogs/patient.lua | 142 +-
CorsixTH/Lua/dialogs/place_objects.lua | 112 +-
CorsixTH/Lua/dialogs/place_staff.lua | 19 +-
CorsixTH/Lua/dialogs/queue_dialog.lua | 33 +-
CorsixTH/Lua/dialogs/resizable.lua | 26 +-
.../Lua/dialogs/resizables/calls_dispatcher.lua | 12 +-
CorsixTH/Lua/dialogs/resizables/cheats.lua | 5 +-
CorsixTH/Lua/dialogs/resizables/customise.lua | 18 -
.../Lua/dialogs/resizables/directory_browser.lua | 4 +-
CorsixTH/Lua/dialogs/resizables/dropdown.lua | 1 -
CorsixTH/Lua/dialogs/resizables/file_browser.lua | 9 -
.../resizables/file_browsers/choose_font.lua | 20 -
.../dialogs/resizables/file_browsers/save_game.lua | 2 -
.../dialogs/resizables/file_browsers/save_map.lua | 2 -
.../Lua/dialogs/resizables/folder_settings.lua | 20 +-
CorsixTH/Lua/dialogs/resizables/lua_console.lua | 17 +-
CorsixTH/Lua/dialogs/resizables/main_menu.lua | 1 -
CorsixTH/Lua/dialogs/resizables/map_editor.lua | 92 +-
.../Lua/dialogs/resizables/menu_list_dialog.lua | 14 +-
.../menu_list_dialogs/custom_campaign.lua | 60 +-
.../resizables/menu_list_dialogs/custom_game.lua | 5 +-
CorsixTH/Lua/dialogs/resizables/new_game.lua | 6 -
CorsixTH/Lua/dialogs/resizables/options.lua | 6 -
CorsixTH/Lua/dialogs/resizables/update.lua | 7 -
CorsixTH/Lua/dialogs/staff_dialog.lua | 30 +-
CorsixTH/Lua/dialogs/staff_rise.lua | 2 -
CorsixTH/Lua/dialogs/tree_ctrl.lua | 18 +-
CorsixTH/Lua/entities/grim_reaper.lua | 12 +-
CorsixTH/Lua/entities/humanoid.lua | 48 +-
CorsixTH/Lua/entities/machine.lua | 68 +-
CorsixTH/Lua/entities/object.lua | 61 +-
CorsixTH/Lua/entities/patient.lua | 177 +-
CorsixTH/Lua/entities/staff.lua | 28 +-
CorsixTH/Lua/entities/vip.lua | 13 +-
CorsixTH/Lua/entity.lua | 23 +-
CorsixTH/Lua/entity_map.lua | 113 +-
CorsixTH/Lua/epidemic.lua | 133 +-
CorsixTH/Lua/filesystem.lua | 2 +-
CorsixTH/Lua/game_ui.lua | 89 +-
CorsixTH/Lua/graphics.lua | 103 +-
CorsixTH/Lua/hospital.lua | 352 +-
CorsixTH/Lua/humanoid_action.lua | 113 +
CorsixTH/Lua/humanoid_actions/answer_call.lua | 11 +-
CorsixTH/Lua/humanoid_actions/call_checkpoint.lua | 16 +
CorsixTH/Lua/humanoid_actions/check_watch.lua | 11 +
CorsixTH/Lua/humanoid_actions/die.lua | 99 +-
CorsixTH/Lua/humanoid_actions/falling.lua | 10 +
CorsixTH/Lua/humanoid_actions/get_up.lua | 9 +
CorsixTH/Lua/humanoid_actions/idle.lua | 35 +
CorsixTH/Lua/humanoid_actions/idle_spawn.lua | 34 +-
CorsixTH/Lua/humanoid_actions/knock_door.lua | 19 +
CorsixTH/Lua/humanoid_actions/meander.lua | 27 +-
CorsixTH/Lua/humanoid_actions/multi_use_object.lua | 54 +-
CorsixTH/Lua/humanoid_actions/on_ground.lua | 9 +
CorsixTH/Lua/humanoid_actions/pee.lua | 10 +
CorsixTH/Lua/humanoid_actions/pickup.lua | 23 +
CorsixTH/Lua/humanoid_actions/queue.lua | 113 +-
CorsixTH/Lua/humanoid_actions/seek_reception.lua | 42 +-
CorsixTH/Lua/humanoid_actions/seek_room.lua | 58 +-
CorsixTH/Lua/humanoid_actions/seek_staffroom.lua | 16 +-
CorsixTH/Lua/humanoid_actions/seek_toilets.lua | 17 +-
CorsixTH/Lua/humanoid_actions/shake_fist.lua | 10 +
CorsixTH/Lua/humanoid_actions/spawn.lua | 50 +-
CorsixTH/Lua/humanoid_actions/staff_reception.lua | 15 +
CorsixTH/Lua/humanoid_actions/sweep_floor.lua | 19 +-
CorsixTH/Lua/humanoid_actions/tap_foot.lua | 12 +-
CorsixTH/Lua/humanoid_actions/use_object.lua | 35 +
CorsixTH/Lua/humanoid_actions/use_screen.lua | 17 +
CorsixTH/Lua/humanoid_actions/use_staffroom.lua | 103 +-
CorsixTH/Lua/humanoid_actions/vaccinate.lua | 33 +-
.../Lua/humanoid_actions/vip_go_to_next_room.lua | 25 +-
CorsixTH/Lua/humanoid_actions/vomit.lua | 10 +
CorsixTH/Lua/humanoid_actions/walk.lua | 83 +-
CorsixTH/Lua/humanoid_actions/yawn.lua | 12 +-
CorsixTH/Lua/languages/brazilian_portuguese.lua | 4092 +-
CorsixTH/Lua/languages/developer.lua | 5 +-
CorsixTH/Lua/languages/english.lua | 3 +
CorsixTH/Lua/languages/french.lua | 80 +-
CorsixTH/Lua/languages/german.lua | 6 +-
CorsixTH/Lua/languages/italian.lua | 2 +-
CorsixTH/Lua/languages/norwegian.lua | 14 +-
CorsixTH/Lua/languages/polish.lua | 129 +-
CorsixTH/Lua/languages/spanish.lua | 122 +-
CorsixTH/Lua/map.lua | 53 +-
CorsixTH/Lua/movie_player.lua | 148 +-
CorsixTH/Lua/objects/bench.lua | 18 +-
CorsixTH/Lua/objects/bin.lua | 2 +-
CorsixTH/Lua/objects/chair.lua | 31 +-
CorsixTH/Lua/objects/door.lua | 2 +-
CorsixTH/Lua/objects/helicopter.lua | 13 +-
CorsixTH/Lua/objects/litter.lua | 21 +-
CorsixTH/Lua/objects/machines/inflator.lua | 2 +-
CorsixTH/Lua/objects/plant.lua | 29 +-
CorsixTH/Lua/objects/rathole.lua | 62 +
CorsixTH/Lua/objects/reception_desk.lua | 13 +-
CorsixTH/Lua/persistance.lua | 12 +-
CorsixTH/Lua/queue.lua | 16 +-
CorsixTH/Lua/research_department.lua | 12 +-
CorsixTH/Lua/room.lua | 148 +-
CorsixTH/Lua/rooms/blood_machine_room.lua | 40 +-
CorsixTH/Lua/rooms/cardiogram.lua | 118 +-
CorsixTH/Lua/rooms/decontamination.lua | 69 +-
CorsixTH/Lua/rooms/dna_fixer.lua | 36 +-
CorsixTH/Lua/rooms/electrolysis.lua | 63 +-
CorsixTH/Lua/rooms/fracture_clinic.lua | 25 +-
CorsixTH/Lua/rooms/general_diag.lua | 77 +-
CorsixTH/Lua/rooms/gp.lua | 82 +-
CorsixTH/Lua/rooms/hair_restoration.lua | 45 +-
CorsixTH/Lua/rooms/inflation.lua | 26 +-
CorsixTH/Lua/rooms/jelly_vat.lua | 26 +-
CorsixTH/Lua/rooms/operating_theatre.lua | 190 +-
CorsixTH/Lua/rooms/pharmacy.lua | 41 +-
CorsixTH/Lua/rooms/psych.lua | 56 +-
CorsixTH/Lua/rooms/research.lua | 127 +-
CorsixTH/Lua/rooms/scanner_room.lua | 103 +-
CorsixTH/Lua/rooms/slack_tongue.lua | 33 +-
CorsixTH/Lua/rooms/staff_room.lua | 2 +-
CorsixTH/Lua/rooms/toilets.lua | 103 +-
CorsixTH/Lua/rooms/training.lua | 81 +-
CorsixTH/Lua/rooms/ultrascan.lua | 23 +-
CorsixTH/Lua/rooms/ward.lua | 55 +-
CorsixTH/Lua/rooms/x_ray_room.lua | 50 +-
CorsixTH/Lua/run_debugger.lua | 2 +-
CorsixTH/Lua/sprite_viewer.lua | 16 +-
CorsixTH/Lua/strict.lua | 2 +-
CorsixTH/Lua/string_extensions.lua | 1 -
CorsixTH/Lua/strings.lua | 60 +-
CorsixTH/Lua/ui.lua | 34 +-
CorsixTH/Lua/utility.lua | 45 +-
CorsixTH/Lua/window.lua | 31 +-
CorsixTH/Lua/world.lua | 555 +-
CorsixTH/Luatest/non_strict.lua | 4 +-
CorsixTH/Src/persist_lua.cpp | 89 +-
CorsixTH/Src/sdl_audio.cpp | 46 +-
CorsixTH/Src/sdl_core.cpp | 6 +
CorsixTH/Src/th_gfx.cpp | 7 +-
CorsixTH/Src/th_gfx_font.h | 2 +-
CorsixTH/Src/th_gfx_sdl.cpp | 56 +-
CorsixTH/Src/th_gfx_sdl.h | 3 +
CorsixTH/Src/th_lua_gfx.cpp | 10 +
CorsixTH/Src/th_lua_map.cpp | 89 +-
CorsixTH/Src/th_lua_movie.cpp | 13 +-
CorsixTH/Src/th_map.cpp | 108 +-
CorsixTH/Src/th_map.h | 14 +-
CorsixTH/Src/th_movie.cpp | 370 +-
CorsixTH/Src/th_movie.h | 70 +-
CorsixTH/Src/th_pathfind.cpp | 78 +-
CorsixTH/Src/th_pathfind.h | 9 +-
LevelEdit/src/com/corsixth/leveledit/Gui.java | 3 +-
LevelEdit/src/com/corsixth/leveledit/Menu.java | 4 +
.../src/com/corsixth/leveledit/ReaderWriter.java | 63 +-
.../src/com/corsixth/leveledit/TabAwards.java | 10 +
.../src/com/corsixth/leveledit/TabDiseases.java | 129 +
.../src/com/corsixth/leveledit/TabEarthquakes.java | 10 +-
.../src/com/corsixth/leveledit/TabEmergencies.java | 25 +-
.../src/com/corsixth/leveledit/TabGeneral.java | 34 +
LevelEdit/src/com/corsixth/leveledit/TabGoals.java | 30 +
.../src/com/corsixth/leveledit/TabObjects.java | 112 +
.../src/com/corsixth/leveledit/TabPopulation.java | 10 +-
LevelEdit/src/com/corsixth/leveledit/TabStaff.java | 50 +
.../src/com/corsixth/leveledit/VarManipulator.java | 375 +-
README.md | 10 +-
WindowsInstaller/LanguageStrings.nsh | 57 +
WindowsInstaller/Win32Script.nsi | 20 +-
WindowsInstaller/config_template.txt | 3 +
appveyor.yml | 26 +-
scripts/build_vcpkg_deps.ps1 | 144 +
209 files changed, 8824 insertions(+), 186935 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