Skip to content

main -> 60hz #36

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

Merged
x64-dev merged 3 commits into from
Sep 5, 2025
Merged

main -> 60hz #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
722ff2a
Tweaks to camera vals
x64-dev Sep 5, 2025
a848e4d
Fix bug with observer / civ in player list
x64-dev Sep 5, 2025
62bb16d
30hz mainline branch
x64-dev Sep 5, 2025
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
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

//#define GENERALS_ONLINE_RUN_FAST 1

#define GENERALS_ONLINE_DEFAULT_LOBBY_CAMERA_ZOOM 450
#define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 400
#define GENERALS_ONLINE_DEFAULT_LOBBY_CAMERA_ZOOM 310
#define GENERALS_ONLINE_MIN_LOBBY_CAMERA_ZOOM 210
#define GENERALS_ONLINE_MAX_LOBBY_CAMERA_ZOOM 1000

//#define GENERALS_ONLINE_HIGH_FPS_SERVER 1
Expand Down
9 changes: 6 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,13 @@ static void playerTooltip(GameWindow *window,
AsciiString sideName = "GUI:RandomSide";
if (mostGames > 0)
{
const PlayerTemplate* fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
if (fac)
if (favorite > 1) // cant be civilian or observer
{
sideName.format("SIDE:%s", fac->getSide().str());
const PlayerTemplate* fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
if (fac)
{
sideName.format("SIDE:%s", fac->getSide().str());
}
}
}
AsciiString rankName;
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/GeneralsOnline_Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define SETTINGS_KEY_CAMERA "camera"
#define SETTINGS_KEY_CAMERA_MIN_HEIGHT "min_height"
#define SETTINGS_KEY_CAMERA_MOVE_SPEED_RATIO "move_speed_ratio"
#define SETTINGS_KEY_CAMERA_MAX_HEIGHT_WHEN_LOBBY_HOST "max_height_when_lobby_host"
#define SETTINGS_KEY_CAMERA_MAX_HEIGHT_WHEN_LOBBY_HOST "max_height_only_when_lobby_host"

#define SETTINGS_KEY_INPUT "input"
#define SETTINGS_KEY_INPUT_LOCK_CURSOR_TO_GAME_WINDOW "lock_cursor_to_game_window"
Expand Down
Loading