Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
R
rd-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
苍蓝
rd-ygopro
Commits
1986c0af
Commit
1986c0af
authored
May 21, 2024
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server-develop' of ../versions/ygopro-mc into server-develop
parents
7630bb0e
fbf1f188
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+4
-0
premake5.lua
premake5.lua
+1
-2
No files found.
gframe/tag_duel.cpp
View file @
1986c0af
...
...
@@ -680,7 +680,11 @@ void TagDuel::Surrender(DuelPlayer* dp) {
if
(
dp
->
type
>
3
||
!
pduel
)
return
;
uint32
player
=
dp
->
type
;
<<<<<<<
HEAD
#ifndef YGOPRO_SERVER_MODE
=======
#if !defined(YGOPRO_SERVER_MODE) || defined(YGOPRO_TAG_SURRENDER_CONFIRM)
>>>>>>>
fbf1f188020a6ecffedddbe5cf2cf7b00a8269fc
if
(
surrender
[
player
])
return
;
static
const
uint32
teammatemap
[]
=
{
1
,
0
,
3
,
2
};
...
...
premake5.lua
View file @
1986c0af
...
...
@@ -61,13 +61,12 @@ newoption { trigger = "server-mode", category = "YGOPro - server", description =
newoption
{
trigger
=
"server-zip-support"
,
category
=
"YGOPro - server"
,
description
=
""
}
newoption
{
trigger
=
"server-pro2-support"
,
category
=
"YGOPro - server"
,
description
=
""
}
-- koishipro specific
boolOptions
=
{
"compat-mycard"
,
"no-lua-safe"
,
"message-debug"
,
"no-side-check"
,
"tag-surrender-confirm"
,
}
for
_
,
boolOption
in
ipairs
(
boolOptions
)
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