mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2025-12-06 04:04:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'overlay_h'

Browse source 
# Conflicts:
#   .gitlab-ci.yml
#   dll/steam_client.cpp
#   dll/steam_inventory.h
#   dll/steam_user_stats.h
This commit is contained in:
Nemirtingas 2019-12-06 12:44:43 +00:00
commit d1a4adc5bd
37 changed files with 2545 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dll/steam_user_stats.h
View file

@ -51,7 +51,7 @@ private:
SteamCallResults* callback_results;
class SteamCallBacks* callbacks;
std::vector<struct Steam_Leaderboard> leaderboards;
nlohmann::json defined_achievements;
nlohmann::json user_achievements;