Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Otowa Kotori
Tales of MajEyal
Commits
44e86438
Commit
44e86438
authored
11 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
Fixed the UI sometimes being affected by invisibility shader or suchlike
parent
c0749cea
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
game/modules/tome/class/Game.lua
+2
-0
2 additions, 0 deletions
game/modules/tome/class/Game.lua
game/modules/tome/dialogs/ShowChatLog.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/dialogs/ShowChatLog.lua
src/map.c
+2
-2
2 additions, 2 deletions
src/map.c
with
5 additions
and
3 deletions
game/modules/tome/class/Game.lua
+
2
−
0
View file @
44e86438
...
...
@@ -1573,6 +1573,8 @@ function _M:setupCommands()
print
(
"==============="
)
end
end
,
[{
"_g"
,
"ctrl"
}]
=
function
()
if
config
.
settings
.
cheat
then
game
.
log
(
"lol"
)
do
return
end
local
f
,
err
=
loadfile
(
"/data/general/events/fearscape-portal.lua"
)
print
(
f
,
err
)
setfenv
(
f
,
setmetatable
({
level
=
self
.
level
,
zone
=
self
.
zone
},
{
__index
=
_G
}))
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/dialogs/ShowChatLog.lua
+
1
−
1
View file @
44e86438
...
...
@@ -272,7 +272,7 @@ function _M:innerDisplay(x, y, nb_keyframes, tx, ty)
if
self
.
shadow
then
item
.
_tex
:
toScreenFull
(
x
+
2
,
h
+
2
,
item
.
w
,
item
.
h
,
item
.
_tex_w
,
item
.
_tex_h
,
0
,
0
,
0
,
self
.
shadow
)
end
item
.
_tex
:
toScreenFull
(
x
,
h
,
item
.
w
,
item
.
h
,
item
.
_tex_w
,
item
.
_tex_h
)
for
di
=
1
,
#
item
.
_dduids
do
item
.
_dduids
[
di
].
e
:
toScreen
(
nil
,
x
+
item
.
_dduids
[
di
].
x
,
h
,
item
.
_dduids
[
di
].
w
,
item
.
_dduids
[
di
].
w
,
1
)
end
for
di
=
1
,
#
item
.
_dduids
do
item
.
_dduids
[
di
].
e
:
toScreen
(
nil
,
x
+
item
.
_dduids
[
di
].
x
,
h
,
item
.
_dduids
[
di
].
w
,
item
.
_dduids
[
di
].
w
,
1
,
false
,
false
)
end
self
.
dlist
[
i
].
dh
=
h
-
y
-- print("<<",i,"::",h + ty)
...
...
This diff is collapsed.
Click to expand it.
src/map.c
+
2
−
2
View file @
44e86438
...
...
@@ -431,7 +431,7 @@ static int map_objects_toscreen(lua_State *L)
float
dh
=
h
*
dm
->
dh
;
int
dz
=
moid
;
if
(
m
!=
dm
&&
dm
->
shader
)
{
if
(
m
!=
dm
&&
allow_shader
&&
dm
->
shader
)
{
for
(
z
=
dm
->
nb_textures
-
1
;
z
>
0
;
z
--
)
{
if
(
multitexture_active
)
tglActiveTexture
(
GL_TEXTURE0
+
z
);
...
...
@@ -456,7 +456,7 @@ static int map_objects_toscreen(lua_State *L)
glDrawArrays
(
GL_QUADS
,
0
,
4
);
if
(
m
!=
dm
)
{
if
(
m
->
shader
)
useShader
(
m
->
shader
,
0
,
0
,
w
,
h
,
1
,
1
,
1
,
a
);
if
(
allow_shader
&&
m
->
shader
)
useShader
(
m
->
shader
,
0
,
0
,
w
,
h
,
1
,
1
,
1
,
a
);
else
tglUseProgramObject
(
0
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment