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

Merged QuakeWorld qc Code into codebase. #163

Merged
merged 22 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
07b1738
Merged qw progs
Zungrysoft Sep 17, 2024
865d065
Removed .dat files
Zungrysoft Sep 17, 2024
833505a
Updated gitignore
Zungrysoft Sep 17, 2024
9e3aa4e
Added qwprogs.dat to build components
Zungrysoft Sep 17, 2024
f440ab5
Fixed carrying over items on map change in deathmatch
Zungrysoft Sep 18, 2024
bec99ef
Fixed some death message bugs
Zungrysoft Sep 18, 2024
298af6b
Removed QW's buggy shotgun particle batching
Zungrysoft Sep 18, 2024
8d08a4e
Made dropped quad have EF_BLUE effect
Zungrysoft Sep 18, 2024
b296cc3
Merged progs.src with qwprogs.src
Zungrysoft Sep 18, 2024
83fd1f4
Edited build script for new __QW__ compile
Zungrysoft Sep 18, 2024
fddd31a
Added comments to all __QW__ preprocessor directives
Zungrysoft Sep 18, 2024
af7f9b3
Fixed typo in ppd
Zungrysoft Sep 18, 2024
01a2ef1
Localization changes
Zungrysoft Sep 18, 2024
5215ed1
Refactored deathmatch settings
Zungrysoft Sep 19, 2024
7683d88
Fixed being unable to pick up armor while invulnerable
Zungrysoft Sep 19, 2024
bf3f6b3
Fixed indentation in localization file; updated CHAN_NO_PHS_ADD comment
Zungrysoft Sep 20, 2024
838f546
Changed some deathmatch mode definitions to preprocessor macros
Zungrysoft Sep 20, 2024
2ed82a2
Changed global constants to define statements
Zungrysoft Sep 20, 2024
daa9963
Moved qwprogs.dat to pak0
Zungrysoft Sep 29, 2024
505e114
Fixed invulnerable telefrag awarding kill to the wrong player
Zungrysoft Sep 29, 2024
f462807
Changed deathmatch settings some more
Zungrysoft Sep 29, 2024
baf6ee6
Changed buff axe infokey
Zungrysoft Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ docs/lqlogos/logomockup-wip2.ora
docs/lqlogos/logomockup-wip2.xcf
lq1/maps/.bmodelbspbak.7z
lq1/config.cfg
lq1/progs.dat
*/progs.dat
*/qwprogs.dat
lq1/gfx/pop.png
lq-pl.png
lq-pl.xcf
Expand Down
6 changes: 6 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ def compile_progs():
stderr=subprocess.STDOUT,
check=True, # Fail on non-zero exit code
)
subprocess.run(
["fteqcc", "qcsrc/progs.src", "-D__LIBREQUAKE__", "-D__QW__", "-O3"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
check=True, # Fail on non-zero exit code
)
except subprocess.CalledProcessError as e:
print(f"!!! Command failed:\n{e.stdout.decode('utf-8')}")
raise e
Expand Down
9 changes: 4 additions & 5 deletions build_components.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"docs/misc-docs/COPYING",
"docs/misc-docs/LibreProgsDeluxe.md",
"docs/misc-docs/pop.lmp.md"

]
},
"root": {
Expand All @@ -25,11 +24,11 @@
"gfx.wad",
"demo1.dem",
"demo2.dem",
"demo3.dem"
],
"files_pak1": [
"progs.dat"
"demo3.dem",
"progs.dat",
"qwprogs.dat"
],
"files_pak1": [],
"files_unpacked": []
},
"config": {
Expand Down
18 changes: 0 additions & 18 deletions qcsrc/ai.qc
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,6 @@ walkmove(angle, speed) primitive is all or nothing
entity sight_entity;
float sight_entity_time;

//pitch (angles_x) is inverted in quake due to a bug
//use makevectors2 for monsters with nonzero pitch
//anyone encountering this comment with a better understanding should update the comment to be more informative and useful to modders --gnounc
void makevectors2(vector ang) =
{
ang_x *= -1;
makevectors(ang);
};

float(float v) anglemod =
{
while (v >= 360)
v = v - 360;
while (v < 0)
v = v + 360;
return v;
};

/*
==============================================================================

Expand Down
Loading