NeotokyoRebuild / neo

NEOTOKYO Rebuild - Source SDK 2013 mod of NEOTOKYO
https://neotokyorebuild.github.io/
Other
19 stars 13 forks source link

Replace neo_hud_elements to huds managing themselves #369

Closed nullsystem closed 3 months ago

nullsystem commented 3 months ago
nullsystem commented 3 months ago

Just a rebase done to fix merge conflicts.

AdamTadeusz commented 3 months ago

Just a rebase done to fix merge conflicts.

Are you sure? git diff shows a lot of changes and the date of the latest commit on this branch is now from 10 days ago

AdamTadeusz commented 3 months ago

Shit

nullsystem commented 3 months ago

Just a rebase done to fix merge conflicts.

Are you sure? git diff shows a lot of changes and the date of the latest commit on this branch is now from 10 days ago

@AdamTadeusz I think you're looking at the local, not remote branch/haven't updated it to match remote yet. It is definitely updated on remote: https://github.com/nullsystem/neo/tree/GH-332_neoHudMem