Guild icon
DDraceNetwork
Development / developer
Development discussion. Logged to https://ddnet.tw/irclogs/ Connected with DDNet's IRC channel, Matrix room and GitHub repositories — IRC: #ddnet on Quakenet | Matrix: #ddnet-developer:matrix.org GitHub: https://github.com/ddnet
Between 2021-09-19 00:00:00Z and 2021-09-20 00:00:00Z
Avatar
8790f5c A TeeInvader, A Glitchhold - ddnet-maps
Avatar
chillerdragon BOT 2021-09-19 08:05:05Z
So I have this old fork of ddnet but when i started developing it i started with a new git history. Any ideas how to get ddnet git history in there? I thought about taking ddnet repo resetting it to my fork starting points commit then copy in all content from the initial commit. commit. And then cherry pick all my history on top. Any better ideas? Or any idea on how to find out which ddnet commit a given modified ddnet src has
Avatar
@deen are there any map scripts you would like to have right now? with my python bindings I would happily write some :)
Avatar
fstd, maybe pstd should be using longer random strings for the urls
Avatar
chillerdragon: i'd first find the commit your fork is based on, then just pull the master branch from the commit and put your changes ontop
13:49
and instead of cherry-picking you can also rebase interactive and put all at once, but there are probably many ways anyway
13:51
git merge --allow-unrelated-histories no idea if that triggers merge conflicts xd
Avatar
Avatar
Patiga
@deen are there any map scripts you would like to have right now? with my python bindings I would happily write some :)
Hm, can't really think of anything. For fixing stuff in map testing you mean? Could you automatically detect common map problems? 😄
Avatar
true that reminds me that I still had stuff I wanted to do in that area
Avatar
Could even ask testers for some things they are looking for, not sure how much is automatable
Avatar
I found https://github.com/heinrich5991/libtw2/issues/18, but it don't know yet how complex that output format is
Avatar
959da57 Knuski retired from mods - def-
Avatar
Adds the prediction for pickups and projectiles (based on #4108) For blinking entities (deactivated by switch) I also used the extended info to make the blinking effect happen client-side. So instead of the server omitting the projectile/pickup from the snapshot every N ticks (which prevented some things like explosive bullets from being predicted correctly), the server will keep sending the item and let the client decide how to show it. Added doors as well, and changed how they are sen...
Avatar
@Patiga check the binary in libtw2, it outputs msgpack. it's quite easy
Avatar
chillerdragon BOT 2021-09-19 21:06:00Z
and any idea on how i find the commit my fork is based on? (@Deleted User)
chillerdragon: i'd first find the commit your fork is based on, then just pull the master branch from the commit and put your changes ontop
Avatar
look at last change dates i guess
Avatar
chillerdragon BOT 2021-09-19 21:07:21Z
does that really work? :D
Avatar
why not, i mean you atleast have the version dont u?
Avatar
chillerdragon BOT 2021-09-19 21:07:42Z
u mean like with ls?
Avatar
so cant be that many commits
21:07
to check
21:08
mhh i'd look into your github repo
Avatar
chillerdragon BOT 2021-09-19 21:09:00Z
?
Avatar
or rebase against the first commit from that version and slowly add more commits until the diff is small
Avatar
chillerdragon BOT 2021-09-19 21:09:27Z
image.png
21:09
im not sure if those dates are from me creating the project or from actual ddnet edits
21:09
wait wat
Avatar
yeah look in github, or where your fork is from
Avatar
chillerdragon BOT 2021-09-19 21:10:07Z
sep jan
21:10
is that this year?
Avatar
its today bro
21:10
lmao
Avatar
chillerdragon BOT 2021-09-19 21:10:27Z
yea wtf
21:10
so the dates do not help
Avatar
is it on github?
Avatar
chillerdragon BOT 2021-09-19 21:11:01Z
Based on DDraceNetwork by deen & contributors (www.ddnet.tw) which is based on the great game teeworlds (www.teeworlds.com). - GitHub - DDNetPP/DDNetPP: Based on DDraceNetwork by deen &...
Avatar
there you have the dates
21:11
just go to the first commit
Avatar
chillerdragon BOT 2021-09-19 21:11:36Z
Based on DDraceNetwork by deen & contributors (www.ddnet.tw) which is based on the great game teeworlds (www.teeworlds.com). - DDNetPP/storage.cfg at master · DDNetPP/DDNetPP
21:11
that file was never edited
21:11
but thats only the commit date hm?
Avatar
yeah but now you know the first version and an approx. date
21:12
isnt that enough to work with?
Avatar
chillerdragon BOT 2021-09-19 21:12:31Z
its not approx date
21:12
its when i switched to git
21:12
nobody knows how old the code was already
Avatar
#define GAME_VERSION "0.6.3, 9.0.2"
21:13
so just start there and end with 9.0.3
Avatar
chillerdragon BOT 2021-09-19 21:13:13Z
yea that i know
21:13
manually looking at the diff commit by commit sounds crazy
21:14
i wonder if i could bisect with a few keyfiles
Avatar
i'd rebase your project against the first commit from 9.0.2 and just add the remaining commits until the diff is small
21:14
maybe you can even add all commits from 9.0.2 to 9.0.3
Avatar
chillerdragon BOT 2021-09-19 21:15:51Z
im not sure if i understood that
Avatar
merge yours with ddnet 9.0.2
Avatar
chillerdragon BOT 2021-09-19 21:16:57Z
okay so i take a ddnet repo do a hard reset to 9.0.2 then add my fork as a remote and do a merge from there?
21:17
but how can i merge unrelated git histories?
21:17
is that even possible?
21:18
--allow-unrelated-histories
21:18
ah ye
21:18
u wrote that already :D
21:19
but then wouldnt i get an initial merge conflict that swallows commits from after 9.0.2 ?
Avatar
yo guys, can i talk to somebody about protocol teeworlds implements?
21:19
are packets that large for netobjs?
Avatar
hard to say chillerdragon
Avatar
chillerdragon BOT 2021-09-19 21:19:59Z
yea most likley
Avatar
since you only switched to git after a while it can certenly happen
21:20
so
21:20
i'd suggest you take ddnet 9.0.2 add your files
21:20
commit
21:20
and then rebase
Avatar
chillerdragon BOT 2021-09-19 21:20:37Z
ye
21:20
or wait is it duplicating commits? :D
21:20
im a bit confused
21:21
but thats def not the start commit
Avatar
dublicated commits should be rebased away
21:22
if they dont add anything to the code, i dunno how you rebased or just cherry-picked, but yeah even then it can happen
21:22
if the code structure is too different
Avatar
chillerdragon BOT 2021-09-19 21:26:42Z
i think ill skim through the commits do a git show and then check my fork if it has the changes yet
21:26
ok troll
21:26
its 9.0.2 release sharp
21:26
hahaha
21:26
ok that was easy
21:29
timakro: i love you for forcing me to use git 5 years ago :D but would have loved you more if you told me to take ddnet repo and copie my code over as initial commit :p
You're invited to talk on Matrix
21:31
yikes this is a merge for another weekend but thanks jupjapjop
21:31
image.png
Avatar
zwelf: please ban "TD AMERITRADE SERVICES"
Avatar
𝖊𝖘𝖕𝖊𝖏𝖔📍 2021-09-19 23:35:08Z
greenthing
Exported 89 message(s)