Skip to content

Commit 3bd2eb3

Browse files
committed
feat(all): UI Rework, Internals Rewrite, and much more
Read CHANGELOG.md for more info
1 parent 30cf10e commit 3bd2eb3

File tree

94 files changed

+5667
-2088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+5667
-2088
lines changed

.github/ISSUE_TEMPLATE/report-bug.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ body:
2121
label: Version
2222
description: What version of GD-Roulette are you running?
2323
options:
24+
- 4.0.0
25+
- 3.1.0
2426
- 3.0.1
2527
- 3.0.0-beta.1
2628
- 2.1.0

ABOUT.md

Lines changed: 5 additions & 1 deletion

CHANGELOG.md

Lines changed: 34 additions & 0 deletions

CMakeLists.txt

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,49 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
44
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
55
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
66

7+
if (DEFINED ENV{GITHUB_ACTIONS})
8+
set(CMAKE_CONFIGURATION_TYPES "Release" CACHE STRING "" FORCE)
9+
endif()
10+
711
project(GD-Roulette LANGUAGES CXX VERSION 1.0.0)
812

913
set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
1014

11-
file(GLOB_RECURSE SRC_MAIN
12-
"${SRC_DIR}/**.hpp"
13-
"${SRC_DIR}/**.cpp"
14-
)
15+
if (CMAKE_GENERATOR MATCHES "Visual Studio")
16+
# glob headers on Visual Studio so headers appear in the solution explorer view
17+
file(GLOB_RECURSE SRC_MAIN
18+
"${SRC_DIR}/**.hpp"
19+
"${SRC_DIR}/**.cpp"
20+
)
21+
else()
22+
file(GLOB_RECURSE SRC_MAIN
23+
"${SRC_DIR}/**.cpp"
24+
)
25+
endif()
1526
add_library(${PROJECT_NAME} MODULE "${SRC_MAIN}")
27+
target_include_directories(${PROJECT_NAME}
28+
PRIVATE ${SRC_DIR}/managers # allow easy inclusion of managers
29+
PRIVATE ${SRC_DIR}/utils # allow easy inclusion of utils
30+
)
1631

32+
# make Visual Studio recognize folders as "filters"
1733
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
18-
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 23)
34+
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20)
35+
36+
source_group(TREE ${SRC_DIR} PREFIX "src" FILES ${SRC_MAIN})
37+
38+
# Platform specific stuff
39+
40+
if (WIN32)
41+
target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
42+
endif()
1943

20-
source_group(TREE ${SRC_DIR} PREFIX "src" FILES ${SRC_MAIN} )
2144

2245
if (NOT DEFINED ENV{GEODE_SDK})
2346
message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
2447
else()
2548
message(STATUS "Found Geode: $ENV{GEODE_SDK}")
2649
endif()
27-
2850
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
2951

3052
setup_geode_mod(${PROJECT_NAME})
@@ -35,16 +57,14 @@ include(cmake/git.cmake)
3557
message("Getting modules\n")
3658
include(cmake/rtrp.cmake)
3759

38-
target_include_directories(${PROJECT_NAME} PRIVATE ${RTRP_SOURCE_DIR}/include)
39-
40-
target_link_libraries(${PROJECT_NAME} RTRP)
41-
4260
# Warnings as errors
4361
set_property(TARGET ${PROJECT_NAME} PROPERTY COMPILE_WARNING_AS_ERROR ON)
4462

45-
add_compile_definitions(
46-
"_CRT_SECURE_NO_WARNINGS"
47-
"NOMINMAX"
48-
"WIN32_LEAN_AND_MEAN"
49-
)
50-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<$<CONFIG:RelWithDebInfo>:RWDI_MODE>)
63+
# Debug macro
64+
if (NOT DEFINED ENV{GITHUB_ACTIONS})
65+
target_compile_definitions(
66+
${PROJECT_NAME} PRIVATE
67+
$<$<CONFIG:Debug>:ROULETTE_DEBUG_BUILD>
68+
$<$<CONFIG:RelWithDebInfo>:ROULETTE_DEBUG_BUILD>
69+
)
70+
endif()

SUPPORT.md

Lines changed: 3 additions & 0 deletions

cmake/git.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
find_package(Git)
22

3-
if(Git_FOUND)
3+
if (Git_FOUND)
44
message("Git found: ${GIT_EXECUTABLE}")
55
endif()

cmake/rtrp.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ FetchContent_Declare(
88
)
99
message("Fetching RTRP")
1010
FetchContent_MakeAvailable(RTRP)
11+
12+
target_include_directories(${PROJECT_NAME} PRIVATE ${RTRP_SOURCE_DIR}/include)
13+
target_link_libraries(${PROJECT_NAME} RTRP)

mod.json

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"geode": "4.0.1",
2+
"geode": "4.2.0",
33
"gd": {
44
"win": "2.2074",
55
"android": "2.2074",
66
"mac": "2.2074"
77
},
8-
"version": "v3.1.0",
8+
"version": "v4.0.0",
99
"id": "spaghettdev.gd-roulette",
1010
"name": "GD-Roulette",
1111
"developer": "SpaghettDev",
@@ -20,18 +20,26 @@
2020
},
2121
"resources": {
2222
"sprites": [
23-
"resources/*.png"
24-
]
23+
"resources/buttons/*.png",
24+
"resources/game/*.png",
25+
"resources/misc/*.png"
26+
],
27+
"spritesheets": {
28+
"ListBorder": ["resources/misc/ListBorder/*.png"]
29+
}
2530
},
26-
"dependencies": [
27-
{
28-
"id": "geode.node-ids",
31+
"dependencies": {
32+
"geode.node-ids": {
2933
"version": ">=v1.17.0",
3034
"importance": "required"
35+
},
36+
"alphalaneous.pages_api": {
37+
"version": ">=v1.4.1",
38+
"importance": "suggested"
3139
}
32-
],
40+
},
3341
"tags": [
34-
"interface", "online"
42+
"interface", "online", "content"
3543
],
3644
"settings": {
3745
"max-skips": {
@@ -49,9 +57,9 @@
4957
"max": 9999,
5058
"min": 0
5159
},
52-
"auto-pause": {
53-
"name": "Auto Pause",
54-
"description": "Enable or disable auto pausing after getting the goal percentage during a round of roulette.",
60+
"hide-goal-reached": {
61+
"name": "Hide Goal Reached",
62+
"description": "Hide the 'Goal Reached!' popup after a short while after reaching the goal.",
5563
"type": "bool",
5664
"default": true
5765
},

resources/RL_btn_big.png

-207 KB
Binary file not shown.

0 commit comments

Comments
 (0)