Guild icon
Teeworlds
IRC / bridge
One-way IRC channel bridge. If you want to be able to send messages to IRC, contact @Dune or @heinrich5991. https://www.teeworlds.com/?page=docs&wiki=rules/irc_rules
Between 2019-08-13 00:00:00Z and 2019-08-14 00:00:00Z
Avatar
[quakenet] Dune BOT 2019-08-13 20:28:52Z
Actually, since 0.7, we always know who damages us, and how much
20:29
Maybe this could be exploited in statistics / "what killed you" kind of stuff, although I guess it is pretty clear in Teeworlds what kills you
Avatar
[quakenet] Oy BOT 2019-08-13 20:30:51Z
kill messages yeah
Avatar
ChillerDragon 2019-08-13 20:31:31Z
who it is might be even more interesting before you die
20:31
but for sure not in fast pace vanilla. But maybe in some tactical long range bush camp mods
Avatar
[quakenet] Dune BOT 2019-08-13 20:40:04Z
I was rather thinking about some end game statistics but we already have two boards for that
20:40
Some games have such a screen after you die but it doesn't fit teeworlds since you respawn so fast
Avatar
ChillerDragon 2019-08-13 20:42:28Z
u so you meant exploit ina positive feature sense xd
20:42
i thought exploits are nasty
Avatar
[quakenet] Dune BOT 2019-08-13 20:42:56Z
huh? it's not an exploit
Avatar
ChillerDragon 2019-08-13 20:43:15Z
u brought that word up
Avatar
[quakenet] Dune BOT 2019-08-13 20:43:27Z
I think to exploit =/= to do an exploit
Avatar
ChillerDragon 2019-08-13 20:43:42Z
anyways doesnt cs:go has something liek "you were damaged by x people before you died" or sumsin like that
Avatar
[quakenet] Dune BOT 2019-08-13 20:43:56Z
yeah but it doesn't fit teeworlds since you respawn so fast
Avatar
ChillerDragon 2019-08-13 20:44:05Z
lms
20:44
dont like it but just wanted to bring that ide aup
Avatar
[quakenet] Dune BOT 2019-08-13 20:45:19Z
that's true, it could be specific to survival
Avatar
Is it still possible in 0.7 to edit client info, like skin, name or team?
Avatar
[quakenet] Oy BOT 2019-08-13 21:01:54Z
skin/team yeah, name kinda
Avatar
what does kinda mean?
21:04
I mean serverside, oops*
21:04
So changing all of these using CPlayer::Snap() still works?
Avatar
[quakenet] Oy BOT 2019-08-13 21:07:24Z
it's not part of the snapshot anymore. there're messages for that now
Avatar
I assume a message like CL_SAY?
21:18
Or how to change the name? Can it be done by the server like using Snap, and/or can it be set by the client?
Avatar
[quakenet] Oy BOT 2019-08-13 21:20:55Z
there's no message to change the name. can just be done with a fake disconnect/connect
Avatar
But it can be done serverside?
Avatar
[quakenet] Oy BOT 2019-08-13 21:21:50Z
yeah
Avatar
How?
21:22
I mean, which variable is it?
21:22
And what do you mean by fake reconnect?
Avatar
[quakenet] Oy BOT 2019-08-13 21:24:23Z
A retro multiplayer shooter. Contribute to teeworlds/teeworlds development by creating an account on GitHub.
21:27
"And what do you mean by fake reconnect?"
21:29
@Dune why do you use the broadcast as racetime instead of the server timer (top center)
Avatar
[quakenet] Oy BOT 2019-08-13 21:29:52Z
if you ant to change the name of player x for player y you have to send player y that x left (https://github.com/teeworlds/teeworlds/blob/master/src/game/server/gamecontext.cpp#L701) and then connected with the new name (https://github.com/teeworlds/teeworlds/blob/master/src/game/server/gamecontext.cpp#L603)
A retro multiplayer shooter. Contribute to teeworlds/teeworlds development by creating an account on GitHub.
A retro multiplayer shooter. Contribute to teeworlds/teeworlds development by creating an account on GitHub.
Avatar
Alright, and if I want to change it for myself?
Avatar
[quakenet] ChillerDragon BOT 2019-08-13 21:31:35Z
how to do private messages in irc again? :c
Avatar
[quakenet] Oy BOT 2019-08-13 21:31:36Z
you can't
Avatar
[quakenet] ChillerDragon BOT 2019-08-13 21:31:43Z
xd
Avatar
[quakenet] Dune BOT 2019-08-13 21:31:54Z
@fokkonaut: I don't do anything. I haven't written the race mod. Also, the server time is useful for other things and hard to overwrite (no protocol for that)
Avatar
[quakenet] Oy BOT 2019-08-13 21:31:58Z
query
Avatar
ChillerDragon 2019-08-13 21:32:15Z
how can i use time_freq(9
21:32
is it one second?
Avatar
Oy: can I change the name for myself?
21:32
Dune: Ah, okay
Avatar
[quakenet] Dune BOT 2019-08-13 21:32:46Z
@fokkonaut: the server cannot change your own name
Avatar
[quakenet] Oy BOT 2019-08-13 21:32:47Z
no you can't
Avatar
Damn
Avatar
[quakenet] ChillerDragon BOT 2019-08-13 21:33:17Z
Oy look query things for nasty nudes
Avatar
[quakenet] Oy BOT 2019-08-13 21:33:38Z
time_freq should be 1 sec yeah
Avatar
ChillerDragon 2019-08-13 21:33:43Z
oh perfect
21:33
thanks
Avatar
Oy, the server also cant detect if we change the name, right?
21:35
on client
Avatar
[quakenet] Oy BOT 2019-08-13 21:35:12Z
no
Avatar
Alright
21:35
Is clan changing possible?
21:36
I guess no.
Avatar
[quakenet] Oy BOT 2019-08-13 21:36:11Z
no same as name
Avatar
Well, I can understand why this has changed, but couldnt you just do that for Vanilla mods? (serverside)
Avatar
ChillerDragon 2019-08-13 21:37:26Z
"vanilla mods" xd
Avatar
gametype*
Avatar
[quakenet] Oy BOT 2019-08-13 21:37:41Z
what do u need it for?
Avatar
ChillerDragon 2019-08-13 21:37:56Z
changing names n vanilla was always fun and never a problem
Avatar
It is cool to have in my opinion (probably just used to it)
Avatar
[quakenet] Oy BOT 2019-08-13 21:38:25Z
nah, only saw people changing names to insult others
Avatar
ChillerDragon 2019-08-13 21:38:37Z
yes as i said only fun 😃
Avatar
[quakenet] Oy BOT 2019-08-13 21:38:44Z
:P
Avatar
[quakenet] Dune BOT 2019-08-13 21:38:44Z
Name changing shouldn't be so frequent that you need to do it in the middle of a game imho
Avatar
ChillerDragon 2019-08-13 21:38:53Z
but removing duplicated names has prio imo
Avatar
[quakenet] Oy BOT 2019-08-13 21:38:58Z
true
Avatar
Oh yes
21:39
Who even removed that?
Avatar
[quakenet] Dune BOT 2019-08-13 21:39:11Z
git blame :)
Avatar
[quakenet] Oy BOT 2019-08-13 21:39:20Z
me probably
Avatar
And who thought it would be good to have no name? xD
Avatar
[quakenet] Oy BOT 2019-08-13 21:39:31Z
we have id's
Avatar
ChillerDragon 2019-08-13 21:39:33Z
oy probably
Avatar
[quakenet] Dune BOT 2019-08-13 21:39:34Z
Oy: almost sure it was someone else's pr
Avatar
Even tho we have IDs, most players play with IDs off, so one can hide behind a bush
Avatar
[quakenet] Dune BOT 2019-08-13 21:40:41Z
We can bring back forced IDs but I think most people would still rather play off
Avatar
ChillerDragon 2019-08-13 21:40:46Z
hdidn behind bushes is cool tho 😃
21:40
but the chat is meh
Avatar
Haha
Avatar
[quakenet] Dune BOT 2019-08-13 21:40:59Z
hiding behind bush is a bit of a bad map gimmick
Avatar
ChillerDragon 2019-08-13 21:41:01Z
and also whisper
Avatar
[quakenet] Dune BOT 2019-08-13 21:41:07Z
and if it's really a problem you can reenable IDs right
Avatar
if i remember correctly, you cant chat as noname
Avatar
[quakenet] Dune BOT 2019-08-13 21:41:15Z
besides you can have very short names like ` anyway
Avatar
ChillerDragon 2019-08-13 21:41:24Z
still hughe different
21:41
ce+
Avatar
[quakenet] Oy BOT 2019-08-13 21:41:30Z
empty names are gonna be removed
Avatar
ChillerDragon 2019-08-13 21:41:35Z
:party:
Avatar
[quakenet] Oy BOT 2019-08-13 21:41:42Z
think there's an issue for it
Avatar
[quakenet] Dune BOT 2019-08-13 21:41:47Z
would be nice for the chat, but I don't think it changes much to the bush problem
Avatar
In my opinion we should remove the IDs of the ingame nameplates and only show them in the board and chat
Avatar
[quakenet] Dune BOT 2019-08-13 21:42:09Z
In v 0.7.2 it is possible to play with an empty nickname. An issue that existed before and was fixed before. #616 Speculation: The client appears to still have a nick validity check, but it doesn&a...
Avatar
[quakenet] Oy BOT 2019-08-13 21:42:24Z
well dunno if you could see . so easily
Avatar
ChillerDragon 2019-08-13 21:42:26Z
wait is ids in debug menu a ddnet feature or got it removed in 0.7 ?
Avatar
This is a serverside feauture, cant we bring it as a minor patch?
Avatar
[quakenet] Dune BOT 2019-08-13 21:42:36Z
I think they're not allowed on 0.7.3 even
21:42
there is already a patch for it
Avatar
what does that do?
Avatar
[quakenet] Dune BOT 2019-08-13 21:44:26Z
"prevent empty nicknames"
21:44
since 0.7.3
Avatar
[quakenet] Oy BOT 2019-08-13 21:44:35Z
Dune: i think some more code was removed
Avatar
[quakenet] Dune BOT 2019-08-13 21:44:44Z
ah, possible
Avatar
So, do they get a name like (1)?
Avatar
[quakenet] Oy BOT 2019-08-13 21:45:51Z
that was the old way right?
Avatar
[quakenet] Oy BOT 2019-08-13 21:46:10Z
then it should be like that. looks ok
Avatar
[quakenet] Dune BOT 2019-08-13 21:46:21Z
yes
Avatar
Is it?
21:46
Or will it
Avatar
[quakenet] Dune BOT 2019-08-13 21:46:27Z
A retro multiplayer shooter. Contribute to nheir/teeworlds development by creating an account on GitHub.
21:46
the function TrySetClientName will fail
21:46
so auto rename will trigger
Avatar
A retro multiplayer shooter. Contribute to nheir/teeworlds development by creating an account on GitHub.
21:47
So this prevent it?
21:47
(noname)
Avatar
[quakenet] Dune BOT 2019-08-13 21:48:15Z
A retro multiplayer shooter. Contribute to nheir/teeworlds development by creating an account on GitHub.
Avatar
[quakenet] Oy BOT 2019-08-13 21:48:17Z
!*pName
Avatar
[quakenet] Dune BOT 2019-08-13 21:48:36Z
!pName does not check for the first element, only if the pointer is non-null
Avatar
A retro multiplayer shooter. Contribute to nheir/teeworlds development by creating an account on GitHub.
21:49
then this looks wrong to me
Avatar
[quakenet] Dune BOT 2019-08-13 21:49:30Z
how so?
Avatar
because we dont rename to (1) if we dont have a name
Avatar
[quakenet] Dune BOT 2019-08-13 21:49:41Z
if the string is empty, the first element will contain 0
21:49
we do
21:49
I showed you where we do that
Avatar
Okay
Avatar
[quakenet] Dune BOT 2019-08-13 21:49:53Z
TrySetClientName will return -1
21:50
A retro multiplayer shooter. Contribute to nheir/teeworlds development by creating an account on GitHub.
Avatar
Ah yes
21:50
Sorry
21:50
Btw: 0.6 maps work on 0.7, right?
Avatar
[quakenet] Oy BOT 2019-08-13 21:50:31Z
all hat set name code is gone
Avatar
[quakenet] Dune BOT 2019-08-13 21:50:45Z
Yes, but they use different default mapres
Avatar
[quakenet] Oy BOT 2019-08-13 21:50:59Z
they work yeah, might look funny
21:51
there's a script to convert the maps
Avatar
But if a server supports the DDrace0.6 front layer, it should also work on 0.7 if the server implements that?
Avatar
[quakenet] Dune BOT 2019-08-13 21:51:26Z
Yes
Avatar
[quakenet] Oy BOT 2019-08-13 21:51:28Z
guess so
Avatar
Thats good
21:51
Well, I guess I will move my mod to 0.7
21:52
And start a new life over here
21:52
0.6 is dead anyways and DDNet too
21:52
well, at least kind of and its not fun there anymore
Avatar
[quakenet] Dune BOT 2019-08-13 21:52:29Z
is it related to ddos?
Avatar
I player some time on 0.7 now and it reminds me of the good old 0.5 times
Avatar
[quakenet] Oy BOT 2019-08-13 21:52:48Z
there's still the ddos thing in 0.6?
Avatar
0.6 gets a lot of DDoS
21:52
Yea
Avatar
[quakenet] Oy BOT 2019-08-13 21:53:01Z
oh ok
Avatar
There was a 2week ddos just recently
21:53
the masters werent reachable
Avatar
[quakenet] Oy BOT 2019-08-13 21:53:34Z
thought the 0.6 masters have been taken down
Avatar
or maybe I am wrong, but it was multiple days
21:53
Uhm, not that I knew
Avatar
[quakenet] Oy BOT 2019-08-13 21:55:29Z
ah ok
Avatar
Wait, was it possible to change teams of players without fame reconnect?
21:56
fake*
Avatar
[quakenet] Dune BOT 2019-08-13 21:56:42Z
there is already a protocol message for changing teams?
Avatar
[quakenet] Oy BOT 2019-08-13 21:56:43Z
yeah
Avatar
So if me as a server wants to put player1 in team blue
21:57
thatd work?
Avatar
[quakenet] Oy BOT 2019-08-13 21:57:15Z
check what the rcon set_team commands does
Avatar
nice, good
21:59
What is the player mode for?
21:59
ready*
Avatar
[quakenet] Oy BOT 2019-08-13 22:00:20Z
during a match a player can press the unready button to pause the game
22:00
useful in clan wars etc
Avatar
pause the game?
Avatar
[quakenet] Oy BOT 2019-08-13 22:01:03Z
game is paused
Avatar
cant that be abused
Avatar
[quakenet] Oy BOT 2019-08-13 22:01:52Z
well, in public probably
Avatar
So what is it for
Avatar
[quakenet] Oy BOT 2019-08-13 22:02:11Z
but in clan matches, players don'T
Avatar
is this activated in public?
Avatar
[quakenet] Oy BOT 2019-08-13 22:02:36Z
don'
22:02
t think so
Avatar
weird feature
Avatar
[quakenet] Oy BOT 2019-08-13 22:04:04Z
really useful for non-public games
22:04
to have timeouts
Avatar
[quakenet] Oy BOT 2019-08-13 22:04:23Z
players simulated it in the past
Avatar
How would that work for timeouts
Avatar
[quakenet] Oy BOT 2019-08-13 22:05:08Z
that's the timeout, game is paused
Avatar
Also, in mods this can be used for a custom input I think?
22:05
So this can toggle something for example?
Avatar
[quakenet] Oy BOT 2019-08-13 22:06:19Z
possible yeah
Avatar
If I create a fork of teeworlds, and make a mod out of it, and later I want to merge some new commits, lets say 1 month, 30 commits later; How do i merge them in?
Avatar
[quakenet] Dune BOT 2019-08-13 22:07:41Z
many ways
22:07
git pull origin master does it directly
22:07
if you have an up to date master branch you can also do git merge master
22:08
if you only want to merge one commit you can git cherry-pick
Avatar
up to date master?
Avatar
[quakenet] Oy BOT 2019-08-13 22:08:52Z
then you have to work on the mod not on master
22:08
in a seperate branch
Avatar
[quakenet] Dune BOT 2019-08-13 22:09:13Z
mod should not be your master branch
Avatar
Why?
Avatar
[quakenet] Dune BOT 2019-08-13 22:09:38Z
plenty of reasons, merging patches from parent fork as master is one
Avatar
[quakenet] Oy BOT 2019-08-13 22:10:17Z
flagball is a good example :)
Avatar
So I create a new branch, work in it, and later merge the master?
22:10
But how to update the mod branch then?
Avatar
[quakenet] Dune BOT 2019-08-13 22:11:34Z
see above
Avatar
Can I also use the compare button on github?
22:12
If I work in master
Avatar
[quakenet] Dune BOT 2019-08-13 22:12:08Z
for what purpose?
Avatar
Wait, if I work on master I cant do pull requests right?
22:12
So another reason for a branch?
Avatar
[quakenet] Dune BOT 2019-08-13 22:12:57Z
you can
22:13
pull requests should be on a different branch than the active one anyway
22:13
because if you work on it the pull request changes :)
22:13
So, okay. I will make a new branch for the mod.
22:13
How do I update the mod branch with current master commits?
22:13
(im not a git wizard, sorry)
22:14
Just wanna make sure I do it clean before I start
Avatar
[quakenet] Dune BOT 2019-08-13 22:14:03Z
I gave you three ways just above
Avatar
I did not understand
Avatar
[quakenet] Dune BOT 2019-08-13 22:14:44Z
before being able to join his own server :/
22:14
oops
Avatar
I can
22:15
just its not modified yet
22:15
Only the vanilla master, nothing more.
Avatar
[quakenet] Dune BOT 2019-08-13 22:15:22Z
1. git pull origin master does it directly
22:15
2. if you have an up to date master branch you can also do git merge master
Avatar
(forked)
Avatar
[quakenet] Dune BOT 2019-08-13 22:15:23Z
3. if you only want to merge one commit you can git cherry-pick
22:15
what did you not understand?
Avatar
if I use git pull origin master, then I update the master branch, dont I?
Avatar
[quakenet] Dune BOT 2019-08-13 22:15:58Z
you should maintain a local master branch that is up to date with upstream (vanilla teeworlds)
22:16
you update the current branch
22:16
so if you do it on another branch than master, it will merge somewhat
Avatar
What?! xd
22:16
I am confused
Avatar
[quakenet] Dune BOT 2019-08-13 22:16:52Z
usually, you always do git checkout master git pull origin master
22:17
or it will pull commits on other branches
22:17
So thats how I update master branch with teeworlds master?
Avatar
[quakenet] Dune BOT 2019-08-13 22:17:38Z
yes
Avatar
and how do I update a mod branch after that
Avatar
[quakenet] Dune BOT 2019-08-13 22:17:59Z
going in two steps is probably the cleanest way :)
22:18
git merge master
22:18
git is so nice when you can use it, and so horrible when you can4t
Avatar
so its just that? git checkout master git pull origin master git checkout branch git merge master ?
Avatar
[quakenet] Dune BOT 2019-08-13 22:19:08Z
that works yes
Avatar
And if conflicts appear?
Avatar
[quakenet] Dune BOT 2019-08-13 22:19:40Z
good luck :D
Avatar
[quakenet] Oy BOT 2019-08-13 22:19:49Z
solve them :)
Avatar
[quakenet] Dune BOT 2019-08-13 22:19:57Z
use gloves
22:20
git glove
Avatar
But I could do: git checkout master git pull origin master go to github, compare between master branch and modbranch and then create a pull request, git checkout pullrequest-branch git pull merge conflicts I saw on the pull request changes tab, merge pull request?
22:22
fix conflicts*
Avatar
[quakenet] Oy BOT 2019-08-13 22:22:44Z
why don't you do it locally?
Avatar
[quakenet] Dune BOT 2019-08-13 22:22:47Z
sounds like it works, it's quite convoluted though...
22:22
+1 doing it locally is easier
Avatar
Im not a git wizard, I dont know how to use it for such things
Avatar
[quakenet] Oy BOT 2019-08-13 22:23:17Z
you could use some visual git program if command line is too heavy
22:23
like sourcetree
Avatar
[quakenet] Dune BOT 2019-08-13 22:23:55Z
I recommend sublime merge :)
22:24
@fokkonaut: well when you git merge and conflicts appear git basically stops there
22:24
you have to edit the files to resolve the conflicts
22:24
and then git commit
Avatar
But if I use the pull request method, I can see if git automatically does sonething I dont want, change it before the merge and the go on?
Avatar
[quakenet] Dune BOT 2019-08-13 22:25:39Z
git probably won't automatically do something you don't want
Avatar
So they wont just overwrite a line? But anyways, I can check if with new commits applied it still is in order and like it should be
Avatar
[quakenet] Dune BOT 2019-08-13 22:26:38Z
yeah never had problems with git auto stuff
Avatar
Okay, I will trust you :D For doing it locally its just this, correct? git checkout master git pull origin master git checkout branch git merge master (if more branches, then the last two for every branch?)
Avatar
[quakenet] Dune BOT 2019-08-13 22:28:45Z
yes
Avatar
Thanks alot
Avatar
[quakenet] Dune BOT 2019-08-13 22:29:30Z
np. that is if origin is teeworlds/teeworlds, otherwise you have to add the remote with git remote add
22:31
And Dune, Oy, I wanted to apologize for my first appearance, I was not really kind towards you...
Avatar
[quakenet] Dune BOT 2019-08-13 22:32:32Z
Don't worry, @fokkonaut. Oy just left though
Avatar
ChillerDragon 2019-08-13 23:29:37Z
fokko nobo appologizing lol
23:29
didnt see that yet
23:30
whats next? Ryo apologizing? xd
Avatar
[quakenet] Dune BOT 2019-08-13 23:30:32Z
maybe a teeworlds release without last minute emergency bug fixes :')
Avatar
ChillerDragon 2019-08-13 23:31:03Z
that would be fun too
Avatar
How does the bot system work in 0.7?
Avatar
[quakenet] Dune BOT 2019-08-13 23:46:10Z
There is a flag for NPCs
Avatar
Can I mark a player as a bot?
Avatar
[quakenet] Dune BOT 2019-08-13 23:46:17Z
the server can say "this dude is a bot"
23:46
yes
Avatar
Huh, how
23:46
so i dont have to hide them from master?
Avatar
[quakenet] Dune BOT 2019-08-13 23:46:46Z
yes, not anymore
23:46
in the server browser, there is a "hide bots" option
23:46
if disabled, it will show NPCs
Avatar
And can these guys move?
Avatar
[quakenet] Dune BOT 2019-08-13 23:47:05Z
yes
Avatar
Where is the code for that
Avatar
[quakenet] Dune BOT 2019-08-13 23:47:13Z
you can even falsely tag real players as bots, no restriction
Avatar
[quakenet] Dune BOT 2019-08-13 23:47:45Z
hmm
23:48
should be something in network.py
Avatar
I mean the code for the movement
Avatar
[quakenet] Dune BOT 2019-08-13 23:48:47Z
yeah playerflags
23:48
PlayerFlags = Flags("PLAYERFLAG", ["ADMIN", "CHATTING", "SCOREBOARD", "READY", "DEAD", "WATCHING", "BOT"])
23:48
huh, there is no such code
23:49
bot just means server controlled
23:49
it's an ongoing issue though :)
Avatar
Oh, I thought there is movement ready
23:49
How to add such a bot? Are they still the good old not working but server crashing debug bots? :p
Avatar
[quakenet] Dune BOT 2019-08-13 23:50:20Z
you can have dummies with dbg_dummies [nb] if that's what you mean
Avatar
Yes, thats what I mea
23:50
n
Avatar
[quakenet] Dune BOT 2019-08-13 23:50:34Z
that needs a reload
23:51
One thing I saw, that made me sad, was that gun and hammer are no longer pickups :( not possible to make gun and hammer pickups anymore
Avatar
[quakenet] Dune BOT 2019-08-13 23:51:29Z
really? didn't see that change
23:51
I tried but did not work
Avatar
[quakenet] Dune BOT 2019-08-13 23:51:50Z
You can make laser ammo pickups though somehow
23:52
@Slayer *gV* did that for his vampire mod
Avatar
I know, I have them
23:52
Uh nice
23:53
@Dune the change was that pickups now have their own array and we dont send a WEAPON_ anymore
23:53
they have PICKUP_ now, without hammer and gun
Avatar
[quakenet] Dune BOT 2019-08-13 23:53:36Z
oh, okay
Avatar
enum* not array
23:55
Can I remove folders like Travis, or will it break auto merge compatibility?
Avatar
[quakenet] Dune BOT 2019-08-13 23:56:17Z
Travis? ah the CI stuff
Avatar
or removing vanilla functions?
Avatar
[quakenet] Dune BOT 2019-08-13 23:56:30Z
that is fine
23:56
if a change occurs on Travis or those functions, you'll probably have git ask you what to do
Avatar
But then I need to resolve conflicts i guess
Avatar
[quakenet] Dune BOT 2019-08-13 23:56:51Z
probably not even, if you delete the whole file
Avatar
Ah nice
Avatar
[quakenet] Dune BOT 2019-08-13 23:56:58Z
just ignore the changes anyway
Avatar
and also if I delete like ctf.cpp?
Avatar
[quakenet] Dune BOT 2019-08-13 23:57:13Z
yeah, it'll be fine
Avatar
good
23:58
64p are now supported, right? Also visually
Exported 341 message(s)