Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
tome
Tales of MajEyal
Commits
a4eccd4f
Commit
a4eccd4f
authored
10 years ago
by
Alex Ksandra
Browse files
Options
Downloads
Patches
Plain Diff
For future use, hard to redo things in terms of it r/n but a bit later surely possible.
parent
c3af1474
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!199
ShowChatLog fix
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/engines/default/engine/LogDisplay.lua
+3
-2
3 additions, 2 deletions
game/engines/default/engine/LogDisplay.lua
game/engines/default/engine/UserChat.lua
+3
-2
3 additions, 2 deletions
game/engines/default/engine/UserChat.lua
with
6 additions
and
4 deletions
game/engines/default/engine/LogDisplay.lua
+
3
−
2
View file @
a4eccd4f
...
...
@@ -86,9 +86,10 @@ function _M:resize(x, y, w, h)
end
--- Returns the full log
function
_M
:
getLog
(
extra
)
function
_M
:
getLog
(
extra
,
timestamp
)
local
log
=
{}
for
i
=
1
,
#
self
.
log
do
for
i
=
1
,
#
self
.
log
do
if
timestamp
and
self
.
log
[
i
].
timestamp
<=
timestamp
then
break
end
if
not
extra
then
log
[
#
log
+
1
]
=
self
.
log
[
i
].
str
else
...
...
This diff is collapsed.
Click to expand it.
game/engines/default/engine/UserChat.lua
+
3
−
2
View file @
a4eccd4f
...
...
@@ -536,12 +536,13 @@ end
----------------------------------------------------------------
--- Returns the full log
function
_M
:
getLog
(
channel
,
extra
)
function
_M
:
getLog
(
channel
,
extra
,
timestamp
)
channel
=
channel
or
self
.
cur_channel
local
log
=
{}
if
self
.
channels
[
channel
]
then
for
_
,
i
in
ipairs
(
self
.
channels
[
channel
].
log
)
do
local
tstr
if
timestamp
and
i
.
timestamp
<=
timestamp
then
break
end
local
tstr
if
i
.
kind
==
"whisper"
then
tstr
=
tstring
{{
"color"
,
0xcb
,
0x87
,
0xd2
},
"<"
,
i
.
name
,
"> "
}
elseif
i
.
kind
==
"join"
then
...
...
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