Japro update #166
Merged
Japro update #166
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
nerf tribes shield/protect
…ng listen servers (JACoders#1217) * fix g_weaponDisable + g_forcePowerDisable regression when creating listen servers. re-enabling this block that turns e.g. g_weaponDisable 1 --> g_weaponDisable 524279 also fix some stray uninitialised warnings * replace commented code with commented words
1) a trigger brush w/ spawnflags 512 that covers the river 2) a target_position for each bend in the river. push angle will be interpolated between the nearest two positions
adjust trigger water push speed
(cherry picked from commit 3f21a83)
(cherry picked from commit 8b4454a)
(cherry picked from commit 1715267)
…dir to source dir (JACoders#1177) * add a custom cmake target to copy compilation DB from build dir to source dir see https://clang.llvm.org/docs/JSONCompilationDatabase.html for further details * gitignore compile_commands.json
(cherry picked from commit 375e215)
# Conflicts: # .github/workflows/build.yml # CMakeLists.txt # README.md # cmake/Modules/InstallZIP.cmake # code/CMakeLists.txt # code/cgame/cg_credits.cpp # code/cgame/cg_view.cpp # code/client/cl_console.cpp # code/client/cl_keys.cpp # code/client/cl_main.cpp # code/client/cl_scrn.cpp # code/client/client.h # code/client/keys.h # code/game/g_roff.cpp # code/game/g_svcmds.cpp # code/game/wp_saberLoad.cpp # code/qcommon/cm_patch.h # code/qcommon/common.cpp # code/qcommon/cvar.cpp # code/qcommon/ojk_saved_game_helper_fwd.h # code/qcommon/qcommon.h # code/qcommon/safe/memory.h # code/rd-common/tr_font.cpp # code/rd-vanilla/tr_image.cpp # code/rd-vanilla/tr_shader.cpp # code/ui/ui_main.cpp # code/ui/ui_shared.cpp # code/win32/game.rc # code/win32/winquake.rc # codeJK2/cgame/FX_DEMP2.cpp # codeJK2/cgame/FX_Disruptor.cpp # codeJK2/cgame/FxPrimitives.h # codeJK2/cgame/FxScheduler.h # codeJK2/cgame/FxSystem.cpp # codeJK2/cgame/FxSystem.h # codeJK2/cgame/FxUtil.cpp # codeJK2/cgame/FxUtil.h # codeJK2/cgame/animtable.h # codeJK2/cgame/cg_camera.cpp # codeJK2/cgame/cg_camera.h # codeJK2/cgame/cg_consolecmds.cpp # codeJK2/cgame/cg_credits.cpp # codeJK2/cgame/cg_draw.cpp # codeJK2/cgame/cg_drawtools.cpp # codeJK2/cgame/cg_effects.cpp # codeJK2/cgame/cg_ents.cpp # codeJK2/cgame/cg_info.cpp # codeJK2/cgame/cg_local.h # codeJK2/cgame/cg_localents.cpp # codeJK2/cgame/cg_playerstate.cpp # codeJK2/cgame/cg_predict.cpp # codeJK2/cgame/cg_scoreboard.cpp # codeJK2/cgame/cg_servercmds.cpp # codeJK2/cgame/cg_snapshot.cpp # codeJK2/cgame/cg_syscalls.cpp # codeJK2/cgame/cg_view.cpp # codeJK2/game/AI_Atst.cpp # codeJK2/game/AI_Default.cpp # codeJK2/game/AI_Droid.cpp # codeJK2/game/AI_GalakMech.cpp # codeJK2/game/AI_Grenadier.cpp # codeJK2/game/AI_Howler.cpp # codeJK2/game/AI_ImperialProbe.cpp # codeJK2/game/AI_Interrogator.cpp # codeJK2/game/AI_Mark1.cpp # codeJK2/game/AI_Mark2.cpp # codeJK2/game/AI_MineMonster.cpp # codeJK2/game/AI_Remote.cpp # codeJK2/game/AI_Seeker.cpp # codeJK2/game/AI_Sentry.cpp # codeJK2/game/AI_Sniper.cpp # codeJK2/game/AI_Utils.cpp # codeJK2/game/CMakeLists.txt # codeJK2/game/G_Timer.cpp # codeJK2/game/NPC_combat.cpp # codeJK2/game/NPC_goal.cpp # codeJK2/game/NPC_misc.cpp # codeJK2/game/NPC_move.cpp # codeJK2/game/NPC_reactions.cpp # codeJK2/game/NPC_senses.cpp # codeJK2/game/NPC_sounds.cpp # codeJK2/game/NPC_spawn.cpp # codeJK2/game/NPC_utils.cpp # codeJK2/game/Q3_Interface.cpp # codeJK2/game/Q3_Interface.h # codeJK2/game/Q3_Registers.cpp # codeJK2/game/anims.h # codeJK2/game/b_local.h # codeJK2/game/b_public.h # codeJK2/game/bg_pangles.cpp # codeJK2/game/bg_public.h # codeJK2/game/channels.h # codeJK2/game/fields.h # codeJK2/game/g_ICARUS.cpp # codeJK2/game/g_active.cpp # codeJK2/game/g_breakable.cpp # codeJK2/game/g_camera.cpp # codeJK2/game/g_cmds.cpp # codeJK2/game/g_functions.cpp # codeJK2/game/g_functions.h # codeJK2/game/g_items.h # codeJK2/game/g_local.h # codeJK2/game/g_missile.cpp # codeJK2/game/g_object.cpp # codeJK2/game/g_objectives.cpp # codeJK2/game/g_public.h # codeJK2/game/g_roff.cpp # codeJK2/game/g_roff.h # codeJK2/game/g_shared.h # codeJK2/game/g_spawn.cpp # codeJK2/game/g_svcmds.cpp # codeJK2/game/g_target.cpp # codeJK2/game/g_trigger.cpp # codeJK2/game/g_usable.cpp # codeJK2/game/ghoul2_shared.h # codeJK2/game/objectives.h # codeJK2/game/statindex.h # codeJK2/game/teams.h # codeJK2/game/w_local.h # codeJK2/game/weapons.h # codeJK2/game/wp_blaster_rifle.cpp # codeJK2/game/wp_bowcaster.cpp # codeJK2/game/wp_demp2.cpp # codeJK2/game/wp_disruptor.cpp # codeJK2/game/wp_emplaced_gun.cpp # codeJK2/game/wp_flechette.cpp # codeJK2/game/wp_rocket_launcher.cpp # codeJK2/icarus/BlockStream.cpp # codeJK2/icarus/Instance.cpp # codeJK2/icarus/Interface.cpp # codeJK2/icarus/Interpreter.cpp # codeJK2/icarus/Sequence.cpp # codeJK2/icarus/Sequencer.cpp # codeJK2/icarus/TaskManager.cpp # codeJK2/icarus/Tokenizer.cpp # codeJK2/icarus/blockstream.h # codeJK2/icarus/instance.h # codeJK2/icarus/interface.h # codeJK2/icarus/interpreter.h # codeJK2/icarus/sequencer.h # codeJK2/icarus/taskmanager.h # codeJK2/icarus/tokenizer.h # codeJK2/qcommon/safe/memory.h # codeJK2/win32/game.rc # codeJK2/win32/resource.h # codemp/cgame/cg_view.c # codemp/client/cl_console.cpp # codemp/client/cl_keys.cpp # codemp/client/cl_main.cpp # codemp/client/client.h # codemp/client/keys.h # codemp/game/bg_misc.c # codemp/game/bg_pmove.c # codemp/game/g_cvar.c # codemp/game/g_main.c # codemp/game/g_xcvar.h # codemp/qcommon/common.cpp # codemp/rd-common/tr_font.cpp # codemp/rd-vulkan/tr_WorldEffects.h # codemp/rd-vulkan/tr_ghoul2.cpp # codemp/rd-vulkan/tr_quicksprite.h # shared/rd-rend2/glsl/shadowvolume.glsl # shared/rd-rend2/tr_bsp.cpp # shared/rd-rend2/tr_curve.cpp # shared/rd-rend2/tr_ghoul2.cpp # shared/rd-rend2/tr_local.h # shared/rd-rend2/tr_main.cpp # shared/rd-rend2/tr_mesh.cpp # shared/rd-rend2/tr_model.cpp # shared/rd-rend2/tr_shade.cpp # shared/rd-rend2/tr_shader.cpp # shared/rd-rend2/tr_surface.cpp
# Conflicts: # codemp/cgame/cg_local.h # codemp/game/ai_main.c # codemp/game/bg_misc.c # codemp/game/bg_pmove.c # codemp/game/bg_public.h # codemp/game/bg_saber.c # codemp/game/bg_slidemove.c # codemp/game/g_account.c # codemp/game/g_client.c # codemp/game/g_cmds.c # codemp/game/g_combat.c # codemp/game/g_cvar.c # codemp/game/g_items.c # codemp/game/g_local.h # codemp/game/g_main.c # codemp/game/g_mover.c # codemp/game/g_svcmds.c # codemp/game/g_team.c # codemp/game/g_trigger.c # codemp/game/g_weapon.c
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.