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
wyykak
ygopro
Commits
6a56e69f
Commit
6a56e69f
authored
Apr 01, 2017
by
edo9300
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'
parents
63758de2
d51773a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
gframe/image_manager.cpp
gframe/image_manager.cpp
+4
-4
textures/field-transparent3.png
textures/field-transparent3.png
+0
-0
textures/field3.png
textures/field3.png
+0
-0
No files found.
gframe/image_manager.cpp
View file @
6a56e69f
...
@@ -23,10 +23,10 @@ bool ImageManager::Initial() {
...
@@ -23,10 +23,10 @@ bool ImageManager::Initial() {
tHand
[
1
]
=
driver
->
getTexture
(
"textures/f2.jpg"
);
tHand
[
1
]
=
driver
->
getTexture
(
"textures/f2.jpg"
);
tHand
[
2
]
=
driver
->
getTexture
(
"textures/f3.jpg"
);
tHand
[
2
]
=
driver
->
getTexture
(
"textures/f3.jpg"
);
tBackGround
=
driver
->
getTexture
(
"textures/bg.jpg"
);
tBackGround
=
driver
->
getTexture
(
"textures/bg.jpg"
);
tBackGround_menu
=
driver
->
getTexture
(
"textures/bg.jpg"
);
tBackGround_menu
=
driver
->
getTexture
(
"textures/bg
_menu
.jpg"
);
tBackGround_deck
=
driver
->
getTexture
(
"textures/bg
2
.jpg"
);
tBackGround_deck
=
driver
->
getTexture
(
"textures/bg
_deck
.jpg"
);
tField
=
driver
->
getTexture
(
"textures/field
2
.png"
);
tField
=
driver
->
getTexture
(
"textures/field
3
.png"
);
tFieldTransparent
=
driver
->
getTexture
(
"textures/field-transparent
2
.png"
);
tFieldTransparent
=
driver
->
getTexture
(
"textures/field-transparent
3
.png"
);
return
true
;
return
true
;
}
}
void
ImageManager
::
SetDevice
(
irr
::
IrrlichtDevice
*
dev
)
{
void
ImageManager
::
SetDevice
(
irr
::
IrrlichtDevice
*
dev
)
{
...
...
textures/field-transparent3.png
0 → 100644
View file @
6a56e69f
321 KB
textures/field3.png
0 → 100644
View file @
6a56e69f
323 KB
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