Merge Call of Chernobyl 1.4.22 (#1529) #1751
Merged
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)
= some fixes to sudden attack ai action
some buy/sell and supplies condition checks to prevent error if item section doesn't exist or incorrect params
…not a class or namespace name'
= Fixed GSC mistake can_trade was being forced same value as can_take
Xottab-DUTY
added
Enhancement
AI
Xottab-DUTY
force-pushed
the
feature/call_of_chernobyl
branch
from
d00dbe3 to
e08b807
Compare
3 tasks
This was referenced Dec 19, 2024
Neloreck
reviewed
Dec 19, 2024
Neloreck
reviewed
Dec 19, 2024
Neloreck
reviewed
Dec 19, 2024
Xottab-DUTY
added a commit
that referenced
this pull request
Dec 20, 2024
This was correct in vanilla, but in our case it's totally normal to miss some functors and there's no need to nag about this in the log. This also fixes FPS drop in Mixed configuration after #1751 merge due to BIG amount of logging about missing functors
Xottab-DUTY
added a commit
that referenced
this pull request
Dec 22, 2024
I forgot to add this in #1751 itself, sorry.
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.
Previous PR #1708 was merged a bit too early, I forgot to apply some fixes, dropped the merge and force pushed.