Skip to content

Conversation

@Starz0r
Copy link

@Starz0r Starz0r commented Mar 7, 2020

This should have been like 4 different branches, but didn't think of that at the time. Most notable changes:

  • Replaced proprietary filesystem unsandboxing DLL with a completely libre implementation.
  • Replaced proprietary window hook with YellowAfterlife's MIT-compatible replacement.
  • Updated codables dependency on NSP 1 to NSP 2.6.6

I had experimented with custom death animations, for now I have abandoned the idea, but I may return to it in the future.

…ith a C ABI compatible type (*const c_char) where applicable
… is not support in the third party INI package currently in use (zonyitoo/rust-ini#43)
Starz0r and others added 13 commits February 18, 2018 14:20
# Conflicts:
#	.gitignore
#	source.gmx/Configs/Default.config.gmx
#	source.gmx/extensions/N String Parser 2.extension.gmx
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_Documentation.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_check_saved.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_evaluate.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_evaluate_saved.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_execute_saved.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_execute_string.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_free.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_free_saved.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_initialize.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_notify.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/NSP_save.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_arithmetic_calculate.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_build_grid.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_combination_calculate.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_comparison_calculate.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_convert_to_list.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_dsm_get.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_dsm_set.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_evaluate_list.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_evaluate_long.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_evaluate_single.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_evaluate_special_word.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_execute_block.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_execute_line.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_execute_master.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_execute_script.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_execute_single.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_get_constant.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_get_token_type.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_gm_nom.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_grid_shift.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_asset.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_dsm.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_equal.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_number.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_script.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_special_word.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_string.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_is_variable.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_list_remove.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_list_set_types.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_list_tidy_and_verify.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_list_to_string.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_src_token.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_statement_positions.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_string_crop.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_string_crop_ext.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_string_find_last.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_string_force.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_token_is_valid.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_tokenize.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_type_is_a_value.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_type_name.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_get.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_get_br.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_get_new.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_get.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_get_br.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_get_new.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_set.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_set_br.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_global_set_new.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_set.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_set_br.gml
#	source.gmx/extensions/N String Parser 2/Assets/Scripts/nsp_variable_set_new.gml
#	source.gmx/extensions/N String Parser 2/yymanifest.xml
#	source.gmx/extensions/libjtool.extension.gmx
#	source.gmx/extensions/libjtool/libjtool.dll
#	source.gmx/extensions/libjtool/libjtool.dylib
#	source.gmx/extensions/libjtool/libjtool.ext
#	source.gmx/extensions/libjtool/libjtool.so
#	source.gmx/extensions/window_command_hook.extension.gmx
#	source.gmx/extensions/window_command_hook/window_command_hook.dll
#	source.gmx/extensions/window_command_hook/window_command_hook.gml
#	source.gmx/extensions/yymanifest.xml
#	source.gmx/objects/oApple.object.gmx
#	source.gmx/objects/oMenu.object.gmx
#	source.gmx/objects/oPalette.object.gmx
#	source.gmx/objects/oPlayerBloodCharm1.object.gmx
#	source.gmx/objects/oPlayerBloodEmitter.object.gmx
#	source.gmx/objects/oPlayerBloodTypeB.object.gmx
#	source.gmx/rooms/rm_sample_ex_patch_windowclose.room.gmx
#	source.gmx/scripts/NSP_check_saved.gml
#	source.gmx/scripts/alarm_setter.gml
#	source.gmx/scripts/cycleDeathAnim.gml
#	source.gmx/scripts/loadDeathAnim.gml
#	source.gmx/scripts/mainInit.gml
#	source.gmx/scripts/nsp_get_token_type.gml
#	source.gmx/scripts/nsp_list_set_types.gml
#	source.gmx/scripts/nsp_list_tidy_and_verify.gml
#	source.gmx/scripts/nsp_tokenize.gml
#	source.gmx/scripts/nsp_type_is_a_value.gml
#	source.gmx/scripts/nsp_type_name.gml
#	source.gmx/scripts/nsp_variable_get_br.gml
#	source.gmx/scripts/nsp_variable_get_new.gml
#	source.gmx/scripts/nsp_variable_global_get_br.gml
#	source.gmx/scripts/nsp_variable_global_get_new.gml
#	source.gmx/scripts/nsp_variable_global_set_br.gml
#	source.gmx/scripts/nsp_variable_global_set_new.gml
#	source.gmx/scripts/nsp_variable_set_br.gml
#	source.gmx/scripts/nsp_variable_set_new.gml
#	source.gmx/scripts/objectInPalette.gml
#	source.gmx/scripts/string_remove_whitespace.gml
#	source.gmx/sound/audio/sndDeath.wav
#	source.gmx/sound/sndDeath.sound.gmx
#	source.gmx/source.project.gmx
#	source.gmx/sprites/images/sMenuDeathAnim_0.png
#	source.gmx/sprites/sMenuDeathAnim.sprite.gmx
It was a good experiment while it lasted, I would like to revisit this in some form later, hopefully better designed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant