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.

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

RetroAchievements bug fixes and adjustments #472

Merged
merged 20 commits into from
Aug 29, 2024
Merged

RetroAchievements bug fixes and adjustments #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
45cca70
Before atlas rewrite
OFFTKP Aug 12, 2024
0a02682
After atlas rewrite
OFFTKP Aug 15, 2024
4bca574
Encore mode and other stuff
OFFTKP Aug 16, 2024
5ca6130
Bit better time/score recognition
OFFTKP Aug 16, 2024
663c6f2
Implement atlas load from file
OFFTKP Aug 16, 2024
5c21bcc
Some fixes
OFFTKP Aug 16, 2024
5987e95
Switch to thread pool
OFFTKP Aug 17, 2024
e2018b0
【CURL】Optimize requests to use caches and TCP keep alive.
skylersaleh Aug 17, 2024
9f86988
Merge pull request #4 from skylersaleh/network_opt
OFFTKP Aug 17, 2024
f7ce0f5
Download cache
OFFTKP Aug 17, 2024
9952cc2
Don't wait for all requests before uploading
OFFTKP Aug 17, 2024
b31c7ea
【Frontend】Better achievement UI
skylersaleh Aug 17, 2024
c8f44bb
Merge pull request #5 from skylersaleh/achiev_ui
OFFTKP Aug 17, 2024
3e0e5dc
Better progress indicators
OFFTKP Aug 18, 2024
cacd6f3
Fix text heights
OFFTKP Aug 18, 2024
8fe6cf4
Spacing
OFFTKP Aug 18, 2024
dcb7508
Register button
OFFTKP Aug 18, 2024
321172f
Don't hide stuff for hardcore when logged out
OFFTKP Aug 18, 2024
a08d635
Make register button work on web, some small bug fixes
OFFTKP Aug 18, 2024
64778f8
Fix iOS build
OFFTKP Aug 28, 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
15 changes: 10 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ endif()

if (EMSCRIPTEN)
set(CMAKE_EXECUTABLE_SUFFIX ".html") # This line is used to set your executable to build with the emscripten html template so taht you can directly open it.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -sEXPORTED_FUNCTIONS=[_se_load_settings,_se_login_cloud,_main,_malloc,_free,_em_oath_sign_in_callback,_em_https_request_callback_wrapper,_gsecret_web] -sEXPORTED_RUNTIME_METHODS=ccall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sEXPORTED_FUNCTIONS=[_se_load_settings,_se_login_cloud,_main,_malloc,_free,_em_oath_sign_in_callback,_em_https_request_callback_wrapper,_gsecret_web] -sEXPORTED_RUNTIME_METHODS=ccall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -sEXPORTED_FUNCTIONS=[_se_load_settings,_se_login_cloud,_https_open_url,_main,_malloc,_free,_em_oath_sign_in_callback,_em_https_request_callback_wrapper,_gsecret_web] -sEXPORTED_RUNTIME_METHODS=ccall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sEXPORTED_FUNCTIONS=[_se_load_settings,_se_login_cloud,_https_open_url,_main,_malloc,_free,_em_oath_sign_in_callback,_em_https_request_callback_wrapper,_gsecret_web] -sEXPORTED_RUNTIME_METHODS=ccall")
endif ()

#=== LIBRARY: sokol
Expand Down Expand Up @@ -292,7 +292,7 @@ if(ENABLE_HTTP_CONTROL_SERVER)
set(SKYEMU_SRC ${SKYEMU_SRC} src/http_control_server.cpp)
endif()

set(SKYEMU_SRC ${SKYEMU_SRC} src/cloud.cpp src/https.cpp)
set(SKYEMU_SRC ${SKYEMU_SRC} src/cloud.cpp src/https.cpp src/atlas.cpp)

if(UNICODE_GUI)
set(SKYEMU_SRC ${SKYEMU_SRC} src/utf8proc/utf8proc.c)
Expand All @@ -308,8 +308,13 @@ endif()

if(ENABLE_RETRO_ACHIEVEMENTS)
add_definitions(-DENABLE_RETRO_ACHIEVEMENTS=1)
add_definitions(-DRC_DISABLE_LUA)
add_definitions(-DRC_CLIENT_SUPPORTS_HASH)
add_library(Lua STATIC src/lua/onelua.c)
if(IOS)
target_compile_definitions(Lua PRIVATE LUA_USE_IOS) # makes it so system is not used
endif()
set_property(TARGET Lua PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
set(LINK_LIBS ${LINK_LIBS} Lua)
set(RCHEEVOS_SRC src/rcheevos/src/rapi/rc_api_common.c
src/rcheevos/src/rapi/rc_api_editor.c
src/rcheevos/src/rapi/rc_api_info.c
Expand Down Expand Up @@ -341,7 +346,7 @@ if(ENABLE_RETRO_ACHIEVEMENTS)
src/rcheevos/src/rurl/url.c
)
set(SKYEMU_SRC ${SKYEMU_SRC} ${RCHEEVOS_SRC} src/retro_achievements.cpp)
include_directories(src/rcheevos/include)
include_directories(src/rcheevos/include src/lua)
endif()

if(IOS)
Expand Down
Loading
Loading