Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Call of Chernobyl 1.4.22 (#1529) #1708

Merged
merged 197 commits into from
Dec 19, 2024
Merged

Conversation

Xottab-DUTY
Copy link
Member

No description provided.

- 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
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 Xottab-DUTY added UI Lua pending review Player Experience Modmaker Experience Modmaker experience with OpenXRay Mods This issue is related to mods. Breaking change This breaks saves compatibility, or changes binary formats, etc. labels Aug 9, 2024
@Xottab-DUTY Xottab-DUTY linked an issue Aug 9, 2024 that may be closed by this pull request
3 tasks
@github-actions github-actions bot added the Game assets A feature or an issue that involves gamedata change label Aug 9, 2024
@Xottab-DUTY Xottab-DUTY force-pushed the feature/call_of_chernobyl branch 3 times, most recently from b65b542 to ac55516 Compare August 9, 2024 01:48
@Xottab-DUTY Xottab-DUTY mentioned this pull request Aug 9, 2024
3 tasks
@Xottab-DUTY Xottab-DUTY changed the title Merge Call of Chernobyl (#1529) Merge Call of Chernobyl 1.4.22 (#1529) Aug 19, 2024
@Xottab-DUTY Xottab-DUTY force-pushed the dev branch 2 times, most recently from e89fcc8 to f6fd5cc Compare October 24, 2024 02:36
@Xottab-DUTY Xottab-DUTY force-pushed the feature/call_of_chernobyl branch 2 times, most recently from 166395b to a650c06 Compare December 18, 2024 22:06
@Xottab-DUTY Xottab-DUTY force-pushed the feature/call_of_chernobyl branch from a650c06 to d41cabd Compare December 18, 2024 22:16
@Xottab-DUTY
Copy link
Member Author

Amen...

@Xottab-DUTY Xottab-DUTY merged commit 331cf36 into dev Dec 19, 2024
30 of 62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AI Artificial Intelligence Breaking change This breaks saves compatibility, or changes binary formats, etc. Enhancement Game assets A feature or an issue that involves gamedata change Gameplay Lua Modmaker Experience Modmaker experience with OpenXRay Mods This issue is related to mods. pending review Physics Player Experience UI
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Launch Call of Chernobyl
6 participants