Skip to content

Merge sohl1.2 branch upon latest master #493

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 36 commits into from
Dec 21, 2024
Merged

Merge sohl1.2 branch upon latest master #493

merged 36 commits into from
Dec 21, 2024

Conversation

@FreeSlave
Copy link
Member

I wanted to contribute some fixes to our sohl branch, but turned out, it's behind the master. So merging first

nekonomicon and others added 30 commits September 18, 2024 20:17
@nekonomicon
Better bounds check from HL25 update. (FWGS#469)
9212d51
@nekonomicon
Update frame-independent yaw speed calculation code. (FWGS#470)
13a83d1
@nekonomicon
Additional bounds checks on client-side.
c461624
@FreeSlave
Prevent game_zone_player from transitioning across levels to fix Mod_…
1a29908 
…NumForName: not found issue (FWGS#471)
@FreeSlave
Fix null dereference in game_score (FWGS#472)
35f1388
@nekonomicon
Merge full player movement unstuck code from HL25 Update.
5bb2762
@nekonomicon
ITEM_FLAG_NOCHOICE->ITEM_FLAG_NOAUTOSWITCHTO.
73ac4de
@nekonomicon
Better spawn spot randomization from HL25 update.
253a3cb
@nekonomicon
Send correct death notice.
c2bd17f
@nekonomicon
Make cl_bob cvar archive.
22f4f3b
@nekonomicon
Protect sensitivity cvar.
006d830
@a1batross
server: fix infinite loop while trying to look for spawn spot for dea…
13086d3 
…thmatch

Fixes: 253a3cb ("Better spawn spot randomization from HL25 update.")
@malortie @nekonomicon
Fix unreferenced variable.
d1aa71d
@malortie @nekonomicon
Reduce pMonster variable scope.
c193043
@malortie
Fix max nodes text. (FWGS#475)
0b43fab
@malortie
Fix nodes and links bounds check. (FWGS#474)
fb274f1
@nekonomicon
Reorder checks.
ff58521
@nekonomicon
Additional bounds checks.
a4f1f1a
@nekonomicon
Add check for new "sv_allow_autoaim".
b8d8a51
@nekonomicon
Merge additional HUD changes from HL25 Update.
0ccf5b8
@FreeSlave
Fix reading angles for DRC_CMD_CAMERA (FWGS#476)
9b76bc4
@FreeSlave
Fix sv_game_build_branch referencing the wrong string (FWGS#477)
aba5188
@FreeSlave
Fix Debug builds with old ninja versions (FWGS#478)
5417e6c
@FreeSlave
Build github artifacts using Ninja (FWGS#479)
8dc4084
@a1batross
client: wscript: force set vgui-dev path
ab853c9
@FreeSlave @a1batross
Copy vgui.so to the base build directory to fix linking with it in gi…
852fc5a 
…thub actions
@a1batross
Add WebAssembly and Solaris definitions from engine
82f85a4
@a1batross
scripts: waifulib: library_naming: make file true_postfix.txt during …
fab8cfe 
…configure with real platform info
@a1batross
wscript: enable gccdeps like in engine
387c266
@FreeSlave
Use latest scout steam runtime (FWGS#484)
5a6e0e0
@a1batross
Copy link
Member

Looks like typical master merge to me. I think it should be fine?

@FreeSlave
Copy link
Member Author

FreeSlave commented Dec 18, 2024 •
edited
Loading

It merged without conflicts. The only thing I did manually is changed the usage of UTIL_StripToken in couple of places because its signature has changed in 9212d51

@nekonomicon nekonomicon merged commit 9be3a5c into FWGS:sohl1.2 Dec 21, 2024
4 checks passed
@FreeSlave FreeSlave deleted the sohl1.2-merge branch June 25, 2025 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@FreeSlave @a1batross @nekonomicon @malortie @Elinsrc