Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
YGOPRO-520DIY
ygopro
Commits
778772e7
Commit
778772e7
authored
Apr 03, 2025
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server' into server-develop
parents
47f1ebfc
c060b0d4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
appveyor.yml
appveyor.yml
+1
-0
cards.cdb
cards.cdb
+0
-0
gframe/sound_manager.cpp
gframe/sound_manager.cpp
+1
-1
ocgcore
ocgcore
+1
-1
premake5.lua
premake5.lua
+3
-1
No files found.
appveyor.yml
View file @
778772e7
...
@@ -27,6 +27,7 @@ install:
...
@@ -27,6 +27,7 @@ install:
before_build
:
before_build
:
-
xcopy /E premake\* .
-
xcopy /E premake\* .
-
xcopy /E resource\* .
-
premake5 vs2019 --server-zip-support
-
premake5 vs2019 --server-zip-support
configuration
:
Release
configuration
:
Release
...
...
cards.cdb
View file @
778772e7
No preview for this file type
gframe/sound_manager.cpp
View file @
778772e7
...
@@ -121,7 +121,7 @@ void SoundManager::PlaySound(char* sound) {
...
@@ -121,7 +121,7 @@ void SoundManager::PlaySound(char* sound) {
ma_sound_start
(
usingSoundEffectPointer
);
ma_sound_start
(
usingSoundEffectPointer
);
#endif
#endif
#ifdef YGOPRO_USE_IRRKLANG
#ifdef YGOPRO_USE_IRRKLANG
engineSound
->
play2D
(
sound
Path
);
engineSound
->
play2D
(
sound
);
#endif
#endif
#endif
#endif
}
}
...
...
ocgcore
@
c839efc3
Subproject commit c
a5bd0f5e1b4113d7e046d8228b70fc2281d08eb
Subproject commit c
839efc376239d72400ee84c42851d8ad76b5535
premake5.lua
View file @
778772e7
...
@@ -111,7 +111,8 @@ boolOptions = {
...
@@ -111,7 +111,8 @@ boolOptions = {
"no-lua-safe"
,
"no-lua-safe"
,
"message-debug"
,
"message-debug"
,
"no-side-check"
,
"no-side-check"
,
"enable-debug-func"
"enable-debug-func"
,
"log-lua-memory-size"
,
}
}
for
_
,
boolOption
in
ipairs
(
boolOptions
)
do
for
_
,
boolOption
in
ipairs
(
boolOptions
)
do
...
@@ -124,6 +125,7 @@ numberOptions = {
...
@@ -124,6 +125,7 @@ numberOptions = {
"min-deck"
,
"min-deck"
,
"max-extra"
,
"max-extra"
,
"max-side"
,
"max-side"
,
"lua-memory-size"
,
}
}
for
_
,
numberOption
in
ipairs
(
numberOptions
)
do
for
_
,
numberOption
in
ipairs
(
numberOptions
)
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment