Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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-2pick
Commits
3f787954
Commit
3f787954
authored
Apr 22, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into server
parents
4a42ccf1
c2d4164e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
gframe/game.cpp
gframe/game.cpp
+1
-1
script
script
+1
-1
No files found.
gframe/game.cpp
View file @
3f787954
...
...
@@ -98,7 +98,7 @@ bool Game::Initialize() {
if
(
!
device
)
return
false
;
// Apply skin
if
(
gameConf
.
skin_index
)
{
if
(
gameConf
.
skin_index
&&
gameConf
.
use_d3d
)
{
wchar_t
skin_dir
[
16
];
myswprintf
(
skin_dir
,
L"skin"
);
skinSystem
=
new
CGUISkinSystem
(
skin_dir
,
device
);
...
...
script
@
803af5d6
Subproject commit
45fa3f0610504b48bcf1cd299ecd88d7d2393d9b
Subproject commit
803af5d691b39a4a36661150dc4f957ba8f20187
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