Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ set(Impacto_Src
src/inputsystem.cpp
src/voicetable.cpp
src/animation.cpp
src/externalfont.cpp

src/text/backlogpage.cpp
src/text/text.cpp
Expand Down Expand Up @@ -94,6 +95,7 @@ set(Impacto_Src
src/profile/hud/loadingdisplay.cpp
src/profile/hud/datedisplay.cpp
src/profile/hud/tipsnotification.cpp
src/profile/hud/achievementnotification.cpp

src/profile/ui/commonmenu.cpp
src/profile/ui/systemmenu.cpp
Expand Down Expand Up @@ -256,6 +258,7 @@ set(Impacto_Src
src/hud/skipicondisplay.cpp
src/hud/waiticondisplay.cpp
src/hud/tipsnotification.cpp
src/hud/achievementnotification.cpp

src/hud/cc/dialoguebox.cpp
src/hud/cc/nametagdisplay.cpp
Expand Down Expand Up @@ -465,6 +468,7 @@ set(Impacto_Header
src/profile/hud/loadingdisplay.h
src/profile/hud/datedisplay.h
src/profile/hud/tipsnotification.h
src/profile/hud/achievementnotification.h

src/profile/ui/commonmenu.h
src/profile/ui/systemmenu.h
Expand Down Expand Up @@ -619,6 +623,7 @@ set(Impacto_Header
src/hud/skipicondisplay.h
src/hud/waiticondisplay.h
src/hud/tipsnotification.h
src/hud/achievementnotification.h

src/hud/cc/dialoguebox.h
src/hud/cc/nametagdisplay.h
Expand Down Expand Up @@ -1168,9 +1173,25 @@ list(APPEND Impacto_Include_Dirs ${WebP_INCLUDE_DIRS})

if (VCPKG_TOOLCHAIN)
find_package(fmt CONFIG REQUIRED)
find_package(Freetype REQUIRED)
find_package(harfbuzz CONFIG REQUIRED)
endif ()
list(APPEND Impacto_Libs fmt::fmt)

if (VCPKG_TOOLCHAIN)
list(APPEND Impacto_Libs
Freetype::Freetype
harfbuzz::harfbuzz
)
else ()
pkg_check_modules(freetype2 REQUIRED IMPORTED_TARGET freetype2)
pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
list(APPEND Impacto_Libs
PkgConfig::freetype2
PkgConfig::harfbuzz
)
endif ()

list(APPEND Impacto_Libs
pugixml::pugixml
atrac9
Expand Down
Binary file added games/common/NotoSansCJKjp-Regular.otf
Binary file not shown.
Binary file added games/common/achievementnotification.png

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should consider renaming the games folder to resources, i think that's a lot more applicable now that gamedata is external

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions profiles/cc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ include(root.BasePaths.RootProfilesDir .. '/cc/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/cc/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/cc/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/cc/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/cc/font.lua');
include(root.BasePaths.RootProfilesDir .. '/cc/dialogue.lua');
Expand Down
4 changes: 3 additions & 1 deletion profiles/cclcc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ root.ActiveRenderer = RendererType.OpenGL;

root.LayerCount = 100;
root.GameFeatures = GameFeature.Sc3VirtualMachine | GameFeature.Renderer2D | GameFeature.Input | GameFeature.Audio |
GameFeature.Video | GameFeature.Subtitles | GameFeature.DebugMenu;
GameFeature.Video | GameFeature.Subtitles | GameFeature.DebugMenu |
GameFeature.Achievements;
root.DesignWidth = 1920;
root.DesignHeight = 1080;

Expand Down Expand Up @@ -44,6 +45,7 @@ include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/common/scriptinput.lua');
include(root.BasePaths.RootProfilesDir .. '/common/scriptvars.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');

include(root.BasePaths.RootProfilesDir .. '/cclcc/scriptinput.lua');
include(root.BasePaths.RootProfilesDir .. '/cclcc/scriptvars.lua');
Expand Down
4 changes: 3 additions & 1 deletion profiles/chlcc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ root.ActiveRenderer = RendererType.OpenGL;

root.LayerCount = 100;
root.GameFeatures = GameFeature.Sc3VirtualMachine | GameFeature.Renderer2D | GameFeature.Input |
GameFeature.Audio | GameFeature.Video | GameFeature.Subtitles | GameFeature.DebugMenu;
GameFeature.Audio | GameFeature.Video | GameFeature.Subtitles | GameFeature.DebugMenu |
GameFeature.Achievements;
root.DesignWidth = 1280;
root.DesignHeight = 720;

Expand Down Expand Up @@ -45,6 +46,7 @@ include(root.BasePaths.RootProfilesDir .. '/chlcc/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/chlcc/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/chlcc/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/chlcc/font.lua');
include(root.BasePaths.RootProfilesDir .. '/chlcc/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/chn/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ include(root.BasePaths.RootProfilesDir .. '/chn/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/chn/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/chn/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/chn/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/chn/font.lua');
include(root.BasePaths.RootProfilesDir .. '/chn/dialogue.lua');
Expand Down
15 changes: 15 additions & 0 deletions profiles/common/achievementnotification.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root.AchievementNotification = {
BackgroundPath = "games/common/achievementnotification.png",
FontPath = "games/common/NotoSansCJKjp-Regular.otf",
DisplayDuration = 5.0,
FadeDuration = 0.5,
IconSize = 64.0,
IconOffset = { X = 20.0, Y = 20.0 },
TextGap = 20.0,
TextRightPadding = 20.0,
TitleFontSize = 24.0,
DescriptionFontSize = 16.0,
TextLineGap = 6.0,
TextColor = 0xFFFFFF,
OutlineColor = 0x000000,
};
1 change: 1 addition & 0 deletions profiles/darling/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ include(root.BasePaths.RootProfilesDir .. '/darling/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/darling/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/darling/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/darling/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/darling/font.lua');
include(root.BasePaths.RootProfilesDir .. '/darling/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/dash/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ include(root.BasePaths.RootProfilesDir .. '/dash/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/dash/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/dash/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/dash/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/dash/font.lua');
include(root.BasePaths.RootProfilesDir .. '/dash/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/mo6tw/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ include(root.BasePaths.RootProfilesDir .. '/mo6tw/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/mo6tw/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/mo6tw/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/mo6tw/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/mo6tw/font.lua');
include(root.BasePaths.RootProfilesDir .. '/mo6tw/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/mo7/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ include(root.BasePaths.RootProfilesDir .. '/mo7/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/mo7/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/mo7/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/mo7/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/mo7/font.lua');
include(root.BasePaths.RootProfilesDir .. '/mo7/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/mo8/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ include(root.BasePaths.RootProfilesDir .. '/mo8/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/mo8/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/mo8/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/mo8/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/mo8/font.lua');
include(root.BasePaths.RootProfilesDir .. '/mo8/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/rne/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ include(root.BasePaths.RootProfilesDir .. '/rne/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/rne/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/rne/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/rne/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/rne/font.lua');
include(root.BasePaths.RootProfilesDir .. '/rne/dialogue.lua');
Expand Down
1 change: 1 addition & 0 deletions profiles/sgps3/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ include(root.BasePaths.RootProfilesDir .. '/sgps3/tipssystem.lua');
include(root.BasePaths.RootProfilesDir .. '/sgps3/vfs.lua');
include(root.BasePaths.RootProfilesDir .. '/sgps3/sprites.lua');
include(root.BasePaths.RootProfilesDir .. '/common/animation.lua');
include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua');
include(root.BasePaths.RootProfilesDir .. '/sgps3/charset.lua');
include(root.BasePaths.RootProfilesDir .. '/sgps3/font.lua');
include(root.BasePaths.RootProfilesDir .. '/sgps3/dialogue.lua');
Expand Down
Loading
Loading