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
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
MyCard
ygopro
Commits
549a5458
Commit
549a5458
authored
Aug 16, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro
into server
parents
06417418
07223d1a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
gframe/game.cpp
gframe/game.cpp
+1
-1
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+3
-0
No files found.
gframe/game.cpp
View file @
549a5458
...
...
@@ -26,7 +26,7 @@
#include <io.h>
#endif
const
unsigned
short
PRO_VERSION
=
0x134
4
;
const
unsigned
short
PRO_VERSION
=
0x134
5
;
namespace
ygo
{
...
...
ocgcore
@
1be62b3d
Subproject commit
a808800391120ce5e847e06ceb910ca2b4a8297b
Subproject commit
1be62b3d400e9b1a0e06c8ea8a9c1d38deaec663
script
@
fa9a0e7b
Subproject commit f
d6a91ec06257df19fc693eefa8e7cbfa5d716c6
Subproject commit f
a9a0e7ba5c6eb54a0c330bf90f83e90a6d187b0
strings.conf
View file @
549a5458
...
...
@@ -243,6 +243,9 @@
!
system
1164
同调召唤
!
system
1165
超量召唤
!
system
1166
连接召唤
!
system
1190
加入手卡
!
system
1191
送去墓地
!
system
1192
除外
#menu
!
system
1200
联机模式
!
system
1201
单人模式
...
...
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