Merge Call of Chernobyl 1.4.22 (#1529) #1708
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- commented unused _Dedicated copy (last file)
+ fixed project dependencies (resources), now entire solution compiles without errors + fixed existing macros to use *Root* macros defines instead of $(Solution)* + moved all VS build related folders (bin, intermediate, lib, etc...) out of solution folder + added xrGame and xrGameBin macros + changed Debug config to generate game related DLLs in game folder (defined by environment variable XRAY_16X_GAME) - removed some projects (dedicated, editor, plugins) from build list in Debug configuration
+ code format: untabify
… start up + format: untabify and VS format
Console commands added: + fov + hud_fov + g_god + add g_unlimitedammo + jump_to_level + run_script + run_string + time_factor
+ fixed invalid (had extra space) name of exported script function speed in alife_monster_detail_path_manager_script.cpp
+ flush script command ! restricted console commands relevant to debugging (g_god, run_string, etc..) to only be available when program was started with -dbg key
* added LuaJIT-1.1.8 project
* added LuaJIT-1.1.8 project
Conflicts: src/3rd party/LuaJIT-1.1.8/LuaJIT-1.1.8.vcxproj src/3rd party/LuaJIT-1.1.8/LuaJIT-1.1.8.vcxproj.filters src/xrServerEntities/script_storage.cpp
+ build_config_defines.h - take some control over ever growing number of changes Script callbacks (examples in bind_stalker.script) + key_press + key_release (disabled in build_config_defines.h) + key_hold (disabled in build_config_defines.h) + mouse_move (disabled in build_config_defines.h) + move_wheel + item_to_ruck + item_to_belt + item_to_slot Misc: + first person death (configurable in build_config_defines.h)
Xottab-DUTY
added
UI
Lua
pending review
Player Experience
Modmaker Experience
3 tasks
github-actions
bot
added
the
Game assets
Xottab-DUTY
force-pushed
the
feature/call_of_chernobyl
branch
2 times, most recently
from
b5d786a
to
b65b542
Compare
Xottab-DUTY
force-pushed
the
feature/call_of_chernobyl
branch
from
b65b542
to
ac55516
Compare
…or corrupted "encyclopedia" section is removed from system.ltx in CoC, some infoportions are incorrect
| @@ -135,6 +135,8 @@ SCRIPT_EXPORT(CUIActorMenu, (CUIDialogWnd), | |||
| .def("IsShown", &CUIActorMenu::IsShown) | |||
| .def("ShowDialog", &CUIActorMenu::ShowDialog) | |||
| .def("HideDialog", &CUIActorMenu::HideDialog) | |||
| .def("ToSlot", &CUIActorMenu::ToSlotScript) | |||
| .def("ToBelt", &CUIActorMenu::ToBeltScript) | |||
There was a problem hiding this comment.
А где остальные методы? SetMenuMode, GetMenuMode, GetPartner, GetInvBox, SetPartner, SetInvBox, SetActor
There was a problem hiding this comment.
Они из CoC 1.5, этот пул-реквест мёржит только 1.4.22 (переименовал его, чтобы не запутываться)
| //Alundaio: To get the savegame fname to make our own custom save states | ||
| luabind::functor<void> funct1; | ||
| if (GEnv.ScriptEngine->functor("alife_storage_manager.CALifeStorageManager_before_save", funct1)) | ||
| funct1((pcstr)m_save_name); |
There was a problem hiding this comment.
А куда пропали вызовы convert_path_separators, restore_path_separators? Надо проверить на Linux, не сломает ли это сохранения
There was a problem hiding this comment.
Они давно уже все внутри CLocatorAPI (и ещё в нескольких местах где нужно).
Не уверен насчёт этого места, может и нужно, проверить надо, да..
There was a problem hiding this comment.
и ещё в нескольких местах где нужно
А лучше вообще без них, но это надо переписывать FS, так что это другая история))
Xottab-DUTY
changed the title
…g tab when the pda is closed
Xottab-DUTY
force-pushed
the
dev
branch
2 times, most recently
from
e89fcc8
to
f6fd5cc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.