00:21 < bridge> [teeworlds] hello from the other siiiide 🎵 00:21 < teetow> neat 02:36 < Teeworlds> [teeworlds] Dune-jr opened pull request #1921: Restore ingame Player and Tee menus, add a warning that a reconnect is needed (master...feature-ingameplayermenus) https://git.io/fhUJ7 10:20 < Teeworlds> [teeworlds] oy closed pull request #1921: Restore ingame Player and Tee menus, add a warning that a reconnect is needed (master...feature-ingameplayermenus) https://git.io/fhUJ7 10:44 < Teeworlds> [teeworlds] oy pushed 1 new commit to master: https://git.io/fhUOD 10:44 < Teeworlds> teeworlds/master 8f2f42e oy: re-added inp_grab to support old mouse warping input. closes #1910 10:54 < Teeworlds> [teeworlds] oy pushed 1 new commit to master: https://git.io/fhU3e 10:54 < Teeworlds> teeworlds/master 0cc8e85 oy: close the motd if we actively wanna look on the scoreboard. closes #1920 10:56 < Teeworlds> [teeworlds] oy pushed 1 new commit to master: https://git.io/fhU3f 10:56 < Teeworlds> teeworlds/master 5754796 oy: updated version to 0.7.2 11:08 < Dune> o/ 11:18 < bridge> [teeworlds] @heinrich5991 we are releasing today, can your port binaries to Steam at some point when they'll be on teeworlds.com? 11:19 <@heinrich5991> Dune: if you have the binaries, I could upload them to steam already 11:30 < Oy> hey 11:38 <@heinrich5991> hi :) 11:42 < Oy> win and mac is on github 11:43 < bridge> [teeworlds] rip the motd :x 11:44 < bridge> [teeworlds] maybe I'm being pessimistic and people will try escape :p 11:45 < Oy> both work 11:45 < Oy> escape always worked too 11:45 < Oy> motd is a popup, they all close with escape 11:49 < Oy> merry christmas everyone :) 11:53 < Oy> will be out soon till very late evening today. just go ahead with the release then :) 11:53 < Dune_> ok :) 11:53 < Dune_> what do you mean by "both work" though? 11:53 < Dune_> tab doesn't work in my experience, did that change? 11:54 < Dune_> oh I'm stupid - https://github.com/teeworlds/teeworlds/commit/0cc8e8530dedda8510b9a0407beb9203a4f6d673 11:54 < Dune_> thanks 11:55 < Oy> :P 11:55 < Oy> moved all open 0.7.2. issues to 0.7.3 milestone and closes 0.7.2 milestone on github 11:56 < Dune_> *checks* 11:57 < Teeworlds> [teeworlds] oy pushed 1 new commit to 0.6: https://git.io/fhUGO 11:57 < Teeworlds> teeworlds/0.6 93f5bf6 oy: updated version for the 0.6 version server 11:57 < Oy> anything else u need me to do? 11:58 < Dune_> the 0.7 version server is updated I assume? 11:58 < Dune_> if so, we're all set, thanks :) 11:59 < Dune_> (I mean, the code for it shows 0.7.2) 12:01 <@heinrich5991> merry christmas :) 12:01 <@Dune_> isn't that early? :) 12:01 <@heinrich5991> not for germany, I think(?) 12:01 <@heinrich5991> in germany, christmas eve is the special day 12:02 <@heinrich5991> is that different for france? 12:02 < bridge> [teeworlds] @heinrich its christmas "eve" 12:02 < bridge> [teeworlds] its because for jews (and muslims btw) the day starts once the sun sets the day before 12:02 < bridge> [teeworlds] (kind of) 12:03 <@Dune_> I don't know if it's a nationwide thing, but we definitely say that the 25th here, or the 24th at midnight 12:04 < Oy> the code for the 0.7 version server is updated too yeah 12:05 <@Dune_> bridge: closed 0.6.0<=x<0.6.5 downloads 12:05 <@Dune_> alright, well have a nice day, Oy :) 12:14 < Oy> thx. have a nice day too :) 12:21 <@Dune_> heinrich5991: all 5 binaries are on https://github.com/teeworlds/teeworlds/releases 12:21 <@Dune_> linux relases are not tested 13:04 < Teeworlds> [teeworlds] Dune-jr opened pull request #1925: Fix Christmas time detection (!) (master...fix-xmas) https://git.io/fhUnW 13:06 <@heinrich5991> Dune_: so I should not upload the release for now? 13:06 <@Dune_> no, it is broken 13:08 <@heinrich5991> Dune_: we don't have anyone but oy building macos/windows, right? 13:08 <@Dune_> I assume you can't build mac, heinrich5991? 13:08 <@Dune_> I could build windows, but mac is tricky 13:08 <@heinrich5991> no, I can't build mac 13:08 <@heinrich5991> so merging this wouldn't help, we need to wait for oy anyway? 13:08 <@Dune_> it sounds like it. oy will only be back in "very late evening" though 13:09 <@Dune_> releasing without mac is probably a sucky option 13:09 <@heinrich5991> I don't like it 13:10 <@heinrich5991> (but it might be the pragmatic option, so feel free to ignore me ^^) 13:10 <@Dune_> it's not a given that you are here this late too 13:10 <@Dune_> the alternative would be to ask a mac guy 13:10 <@heinrich5991> ChillerDragon: do you know how to build a working dmg? 13:12 <@Dune_> @ChillerDragon 13:12 <@heinrich5991> uh, that works? ^^ 13:12 <@heinrich5991> @heinrich5991 13:12 <@heinrich5991> yup, does 13:13 <@Dune_> not always 13:13 <@Dune_> sent Oy a mail in any c ase 15:21 < bridge> [teeworlds] i can 15:21 < bridge> [teeworlds] oh 15:21 < bridge> [teeworlds] hi, @ChillerDragon 15:21 < bridge> [teeworlds] i am totally sick lying in bed :c 15:21 < bridge> [teeworlds] :( 15:21 < bridge> [teeworlds] what happened? 15:21 < bridge> [teeworlds] thailand xd 15:22 < bridge> [teeworlds] but i would die for tw 15:22 < bridge> [teeworlds] so do you need something? 15:22 < bridge> [teeworlds] haha, that's some passion 15:22 < bridge> [teeworlds] So here's what happened, we were ready to release the special christmas update and Oy went out 15:23 < bridge> [teeworlds] During the checks, it appeared there is a critical bug, so we need to rebuild everything 15:23 < bridge> [teeworlds] We can handle Windows and Linux, but not Mac 15:23 < bridge> [teeworlds] No hate and i love you all. But if i leave my bed now to spend all my last powers to build something and then it gets declined agian i get mad xd 15:23 < bridge> [teeworlds] so you really need it? then i can do it ofc. 15:23 < bridge> [teeworlds] @ChillerDragon your sacrifice will be remembered 15:23 < bridge> [teeworlds] rest assured we'll use it this time, Oy is out for good 15:24 < bridge> [teeworlds] k 15:24 < bridge> [teeworlds] build current master to dmg? 15:24 < bridge> [teeworlds] not current master 15:24 < bridge> [teeworlds] https://github.com/Dune-jr/teeworlds/, branch fix-xmas 15:24 < bridge> [teeworlds] oh 15:24 < bridge> [teeworlds] k 15:24 < bridge> [teeworlds] I could merge it in though 15:24 < bridge> [teeworlds] would be nice 15:25 < bridge> [teeworlds] alright 15:25 < bridge> [teeworlds] meh heinrichs pr is still not there. This will be fun. 15:25 < bridge> [teeworlds] Yeah, that's the thing 15:26 < bridge> [teeworlds] Do you remember what is left to do? 15:26 < bridge> [teeworlds] No 15:26 < bridge> [teeworlds] it will take me some time 15:26 < bridge> [teeworlds] hmm 15:27 < bridge> [teeworlds] @heinrich5991 could you fix the PR for mac somehow? 15:27 < bridge> [teeworlds] oh boi its 12 instead of 11 ? 15:27 < bridge> [teeworlds] thats the change xd 15:27 < bridge> [teeworlds] yeah 15:27 < bridge> [teeworlds] heinrich only has to merge my prs 15:27 < bridge> [teeworlds] then it should work for me 15:27 < bridge> [teeworlds] or i can git wizardly merge them locally 15:27 < bridge> [teeworlds] then you can simply work from your branch? 15:28 < bridge> [teeworlds] i succ at advanced git 15:28 < bridge> [teeworlds] Alright, I'll try to make it all on my local repo so you only have to pull and compile 15:28 < bridge> [teeworlds] it would be a nice start if ur pr gets merged 15:28 < bridge> [teeworlds] oh that would be super helpfull ❤ 15:29 < bridge> [teeworlds] isnt it easier to simply hexedit that? xd 15:30 < bridge> [teeworlds] might be :P 15:31 < bridge> [teeworlds] https://github.com/heinrich5991/teeworlds/pull/15/files 15:31 < bridge> [teeworlds] from unknown repository lol 15:31 < bridge> [teeworlds] ye ikr 15:31 < bridge> [teeworlds] alright, I'll do it 15:31 < bridge> [teeworlds] i succ at git and delete my repos all the time 15:39 < bridge> [teeworlds] @ChillerDragon 15:39 < bridge> [teeworlds] ``` 15:39 < bridge> [teeworlds] git fetch https://github.com/Dune-jr/teeworlds 4chiller 15:39 < bridge> [teeworlds] git checkout FETCH_HEAD -b 0.7.2 15:39 < bridge> [teeworlds] ``` 15:39 < bridge> [teeworlds] ty 15:39 < bridge> [teeworlds] then you should be able to make 15:40 < bridge> [teeworlds] do we have somebody to thest the build then? 15:40 < bridge> [teeworlds] you 😁 15:40 < bridge> [teeworlds] uff 15:40 < bridge> [teeworlds] well we will see 15:40 < bridge> [teeworlds] its a fetch and not a clone o.O 15:40 < bridge> [teeworlds] so i first clone tw master? 15:41 < bridge> [teeworlds] you have to be on a teeworlds repository for this to work 15:41 < bridge> [teeworlds] if you cannot test, I will find another way. building is already enough :) 15:41 < bridge> [teeworlds] Testing on my macbook is a bad test because it is blown with libs and doesnt represent an average mac device 15:41 < bridge> [teeworlds] That's not that bad 15:42 < bridge> [teeworlds] it failed 5 fixes on my moms imac when it already run on my device 15:42 < bridge> [teeworlds] moms break stuff 15:42 < bridge> [teeworlds] xd 15:43 < bridge> [teeworlds] Things to test for: 15:43 < bridge> [teeworlds] - server starts normally 15:43 < bridge> [teeworlds] - client starts and shows 0.7.2 version 15:43 < bridge> [teeworlds] - f1 has the xmas_hats option 15:43 < bridge> [teeworlds] - xmas hats are displayed by default (can be checked in the settings > Tee) 15:44 < bridge> [teeworlds] either it is me being too wasted rn or idk 15:44 < bridge> [teeworlds] i followed my own instructions from the past and it failed :c 15:44 < bridge> [teeworlds] 15:44 < bridge> [teeworlds] make package_dmg 15:44 < bridge> [teeworlds] make: *** No rule to make target `package_dmg'. Stop. 15:44 < bridge> [teeworlds] you're still in thailand? 15:45 < bridge> [teeworlds] huh 15:45 < bridge> [teeworlds] no i am at home c: 15:45 < bridge> [teeworlds] but thai got me some nasty virus 15:45 < bridge> [teeworlds] ``` 15:45 < bridge> [teeworlds] CMakeLists.txt:1664: add_custom_target(package_dmg DEPENDS ${CPACK_PACKAGE_FILE_NAME}.dmg) 15:45 < bridge> [teeworlds] CMakeLists.txt:1665: list(APPEND PACKAGE_TARGETS package_dmg) 15:45 < bridge> [teeworlds] ``` 15:45 < bridge> [teeworlds] CMakeLists should contain that 15:46 < bridge> [teeworlds] ye i also found my changes in the git log 15:46 < bridge> [teeworlds] it has to be me beeing stupid 15:46 < bridge> [teeworlds] or sick :) 15:48 < bridge> [teeworlds] well this is weird 15:48 < bridge> [teeworlds] i will try to do everything alone from scratch 15:48 < bridge> [teeworlds] even tho ur boilerplate looks good 15:49 < bridge> [teeworlds] https://github.com/heinrich5991/teeworlds/pull/15/files and https://github.com/heinrich5991/teeworlds/pull/17/files were merged in, as well as heinrich's PR 15:50 < bridge> [teeworlds] ye i can see that 15:50 < bridge> [teeworlds] but somehow it doesnt find make package_dmg i have no idea what causes that issue 15:50 < bridge> [teeworlds] what was the cmd agian to merge heirnichs pr locally? 15:50 < bridge> [teeworlds] surely you have to `cmake . -something`? I'm no CMake guru 15:51 < bridge> [teeworlds] cmake .. 15:51 < bridge> [teeworlds] ye i documented everything in my prs because i know that i tend to forget stuff 15:51 < bridge> [teeworlds] i also reread all the chat with heinrich 15:51 < bridge> [teeworlds] `git pull https://github.com/heinrich5991/teeworlds/ pr_cmake` merges his cmake into your repository 15:51 < bridge> [teeworlds] nice ty 15:51 < bridge> [teeworlds] do you have the working 0.7.1 release? you can work from that too 15:51 < bridge> [teeworlds] maybe it will be easier 15:52 < bridge> [teeworlds] if you can build 0.7.1 15:52 < bridge> [teeworlds] and apply the change manually 15:52 < bridge> [teeworlds] that is my plan 15:52 < bridge> [teeworlds] manually? what change? ^^ 15:52 < bridge> [teeworlds] ah, my fix? 15:52 < bridge> [teeworlds] ur 11 12 fix 15:52 < bridge> [teeworlds] well you don't need to do it manually but sure 15:52 < bridge> [teeworlds] yuk conflicts 15:53 < bridge> [teeworlds] if you can find your working repository, you can update it with this simple command: 15:53 < bridge> [teeworlds] `git pull https://github.com/teeworlds/teeworlds master` 15:53 < bridge> [teeworlds] what files conflicts? `git status` 15:53 < bridge> [teeworlds] so far they are fine 15:53 < bridge> [teeworlds] just version.h 15:53 < bridge> [teeworlds] makes sense 15:55 < bridge> [teeworlds] mabye i spell package wrong 15:55 < bridge> [teeworlds] xxxD 15:55 < bridge> [teeworlds] does it build? 15:55 < bridge> [teeworlds] i have no idea what changed 15:55 < bridge> [teeworlds] no the cmake package_dmg fails 15:55 < bridge> [teeworlds] Ohhh wait 15:55 < bridge> [teeworlds] ``` 15:55 < bridge> [teeworlds] cd build 15:55 < bridge> [teeworlds] cmake .. 15:56 < bridge> [teeworlds] cmake -DCMAKE_OTOOL=otool . 15:56 < bridge> [teeworlds] make package_dmg 15:56 < bridge> [teeworlds] ``` 15:56 < bridge> [teeworlds] i latley build hanbrake and i think i t installed me a new cmake 15:56 < bridge> [teeworlds] maybe my new cmake from handbrake is broken 15:56 < bridge> [teeworlds] ah nvm its make not cmake 15:57 < bridge> [teeworlds] i still have an old folder on my desktop where make_packge is working 15:57 < bridge> [teeworlds] copy paste it 15:57 < bridge> [teeworlds] but it has some dirty stuff in the working tree 15:57 < bridge> [teeworlds] and it is outdated 15:57 < bridge> [teeworlds] that's fine 15:58 < bridge> [teeworlds] copy paste the folder 15:58 < bridge> [teeworlds] k 15:58 < bridge> [teeworlds] then run this: 15:58 < bridge> [teeworlds] ``` 15:58 < bridge> [teeworlds] git reset --hard 15:58 < bridge> [teeworlds] git checkout origin/master 15:58 < bridge> [teeworlds] git pull https://github.com/teeworlds/teeworlds/ master 15:58 < bridge> [teeworlds] ``` 15:59 < bridge> [teeworlds] ouch but git reset --hard removes my fixes 15:59 < bridge> [teeworlds] it does? 15:59 < bridge> [teeworlds] ye 15:59 < bridge> [teeworlds] the dirty working tree are my fixes 15:59 < bridge> [teeworlds] ah then you want to keep the dirty stuff 15:59 < bridge> [teeworlds] y 15:59 < bridge> [teeworlds] maybe commit 15:59 < bridge> [teeworlds] idk 15:59 < bridge> [teeworlds] easy then 15:59 < bridge> [teeworlds] yes 15:59 < bridge> [teeworlds] ``` 15:59 < bridge> [teeworlds] git commit -a -m "Dirty fixes" 15:59 < bridge> [teeworlds] ``` 15:59 < bridge> [teeworlds] y 16:00 < bridge> [teeworlds] and then? 16:00 < bridge> [teeworlds] ``` 16:00 < bridge> [teeworlds] git pull https://github.com/teeworlds/teeworlds/ master 16:00 < bridge> [teeworlds] ``` 16:00 < bridge> [teeworlds] doesnt -a adds everything 16:00 < bridge> [teeworlds] it does 16:00 < bridge> [teeworlds] why is my working tree still dirty lol 16:00 < bridge> [teeworlds] what does `git status` say 16:01 < bridge> [teeworlds] some folders in other 16:01 < bridge> [teeworlds] i git add them and will commit agian 16:01 < bridge> [teeworlds] sure 16:01 < bridge> [teeworlds] ok im clean now 16:01 < bridge> [teeworlds] i fear conflicts 16:01 < bridge> [teeworlds] `git pull https://github.com/teeworlds/teeworlds.git master` 16:01 < bridge> [teeworlds] should just be `version.h` 16:01 < bridge> [teeworlds] i got conflicts xd 16:01 < bridge> [teeworlds] oh and submodue 16:01 < bridge> [teeworlds] possibly storage 16:01 < bridge> [teeworlds] we see submodules later 16:01 < bridge> [teeworlds] try to build first 16:04 < bridge> [teeworlds] i dont get it why make_pakcage is working there 16:04 < bridge> [teeworlds] and not in the newer versions 16:04 < bridge> [teeworlds] lucky me that i save thousands of folders all the time everywhere 16:04 < bridge> [teeworlds] it doesn't work? 16:04 < bridge> [teeworlds] in this old folder it works 16:04 < bridge> [teeworlds] but i dont see the difference to ur fork for example 16:04 < bridge> [teeworlds] PR is probably incomplete then 16:04 < bridge> [teeworlds] we can check that later 16:05 < bridge> [teeworlds] y 16:05 < bridge> [teeworlds] sadly i have a linker fail 16:05 < bridge> [teeworlds] and the nobo macos update destroyed reable linking output -.- 16:06 < bridge> [teeworlds] so you don't know what fails, 16:06 < bridge> [teeworlds] ? 16:06 < bridge> [teeworlds] Undefined symbols for architecture x86_64: 16:06 < bridge> [teeworlds] "_main", referenced from: 16:06 < bridge> [teeworlds] start in crt1.10.6.o 16:06 < bridge> [teeworlds] (maybe you meant: _SDL_main) 16:06 < bridge> [teeworlds] thats the only usefull bit i coudl find 16:06 < bridge> [teeworlds] make clean? 16:07 < bridge> [teeworlds] good idea 16:07 < bridge> [teeworlds] meh same resolut 16:08 < bridge> [teeworlds] do you have the linker fail with the old folder? 16:09 < bridge> [teeworlds] no 16:09 < bridge> [teeworlds] it has to be cuased by the update 16:09 < bridge> [teeworlds] so the update broke linking, uh 16:09 < bridge> [teeworlds] ye 16:09 < bridge> [teeworlds] maybe not the update directly 16:09 < bridge> [teeworlds] maybe wrong git usage 16:09 < bridge> [teeworlds] what were the conflict files!, 16:09 < bridge> [teeworlds] ? 16:09 < bridge> [teeworlds] storage 16:09 < bridge> [teeworlds] version 16:09 < bridge> [teeworlds] and uhm 16:09 < bridge> [teeworlds] submodules 16:09 < bridge> [teeworlds] oh i didnt fix the submodules 16:10 < bridge> [teeworlds] what was the update command? 16:10 < bridge> [teeworlds] `git submodule update` 16:10 < bridge> [teeworlds] unlikely to help 16:10 < bridge> [teeworlds] y no changes 16:10 < bridge> [teeworlds] hmmmmm 16:11 < bridge> [teeworlds] check `src/engine/shared/storage.cpp` 16:11 < bridge> [teeworlds] around line 240 you should see 16:11 < bridge> [teeworlds] ``` aResDir 16:11 < bridge> [teeworlds] }; 16:11 < bridge> [teeworlds] const int DirsCount = sizeof(aDirs) / sizeof(aDirs[0]);``` 16:11 < bridge> [teeworlds] y 16:12 < bridge> [teeworlds] resdir is my ugly var xd 16:12 < bridge> [teeworlds] but it is there 16:12 < bridge> [teeworlds] 16:12 < bridge> [teeworlds] https://cdn.discordapp.com/attachments/490150878934990850/526779291132887041/Bildschirmfoto_2018-12-24_um_16.12.35.png 16:12 < bridge> [teeworlds] i used vs code for conflict so it should be nobo save 16:13 < bridge> [teeworlds] let's see CMakeList.txt 16:13 < bridge> [teeworlds] around line 1634 16:14 < bridge> [teeworlds] 16:14 < bridge> [teeworlds] https://cdn.discordapp.com/attachments/490150878934990850/526779719849345034/Bildschirmfoto_2018-12-24_um_16.14.22.png 16:14 < bridge> [teeworlds] let's see 16:15 < bridge> [teeworlds] the sdl2 framework exsists in the other folder 16:16 < bridge> [teeworlds] I don't know :| 16:16 < bridge> [teeworlds] i am a nobo at debugging anyways but my brain is so dead brain now this doesnt help :c 16:17 < bridge> [teeworlds] hmmm 16:18 < bridge> [teeworlds] maybe it has something to do with the annoying branches 16:18 < bridge> [teeworlds] and i mix up master and pr_cmake 16:19 < bridge> [teeworlds] you shouldn't have manipulated any sort of branch for this 16:20 < bridge> [teeworlds] just pull teeworlds from your dirty repo 16:20 < bridge> [teeworlds] mind pushing? 16:20 < bridge> [teeworlds] `git branch` to know what branch you are on 16:20 < bridge> [teeworlds] y ik 16:21 < bridge> [teeworlds] @ChillerDragon do you use cmake-gui? 16:21 < bridge> [teeworlds] no 16:21 < bridge> [teeworlds] try it 😃 16:21 < bridge> [teeworlds] much easier 16:22 < bridge> [teeworlds] we have a linking problem @LordSk 16:23 < bridge> [teeworlds] i am afraight of guis 16:23 < bridge> [teeworlds] they confuse me 16:23 < bridge> [teeworlds] ``` 16:23 < bridge> [teeworlds] Undefined symbols for architecture x86_64: 16:23 < bridge> [teeworlds] "_main", referenced from: 16:23 < bridge> [teeworlds] start in crt1.10.6.o 16:23 < bridge> [teeworlds] (maybe you meant: _SDL_main) 16:23 < bridge> [teeworlds] ``` 16:23 < bridge> [teeworlds] did everything from scratch a little bit different same result 16:23 < bridge> [teeworlds] so SDL_main isnt linked? 16:23 < bridge> [teeworlds] it seems that my old version builds fine 16:23 < bridge> [teeworlds] more like _main isn't linked I assume? 16:23 < bridge> [teeworlds] but then then after upgrading to current master it fails 16:24 < bridge> [teeworlds] do we have a new sdl linkage? 16:24 < bridge> [teeworlds] there is a SDL_main lib for that purpose 16:24 < bridge> [teeworlds] in the last 200ish commits 16:24 < bridge> [teeworlds] no 16:24 < bridge> [teeworlds] afk dying a little bit real quick 16:25 < bridge> [teeworlds] @LordSk building 0.7.1 works. git pull teeworlds, resolve two conflicts, and it doesn't work 16:25 < bridge> [teeworlds] can't he hard reset? 16:26 < bridge> [teeworlds] and using cmake-gui is very straight forward 16:26 < bridge> [teeworlds] hard reset what? to the branches? 16:26 < bridge> [teeworlds] to master 16:26 < bridge> [teeworlds] to what branches* 16:26 < bridge> [teeworlds] master won't work 16:26 < bridge> [teeworlds] we need the cmake fixes 16:27 < bridge> [teeworlds] @heinrich5991 's PR wasn't merged 16:27 < bridge> [teeworlds] it is one file tho? 16:27 < bridge> [teeworlds] or am I mistaken 16:27 < bridge> [teeworlds] not only one: https://github.com/heinrich5991/teeworlds/pull/15/files 16:27 < bridge> [teeworlds] https://github.com/heinrich5991/teeworlds/pull/17/files 16:29 < bridge> [teeworlds] I dunno it shouldn't be that hard tbh 16:29 < bridge> [teeworlds] what do you suggest? 16:29 < bridge> [teeworlds] merry christmas to all of you 16:30 < bridge> [teeworlds] merry christmas @Fisico 😄 16:30 < bridge> [teeworlds] why doesnt bam work is the real question here 16:30 < bridge> [teeworlds] why do we need cmake? 16:31 < bridge> [teeworlds] I don't think we have the time to try something entirely new 16:32 < bridge> [teeworlds] it should work fine tho? 16:32 < bridge> [teeworlds] it did for years 16:32 < bridge> [teeworlds] well apparently it didn't 16:33 < bridge> [teeworlds] to me the issue is SDL_main isnt linked 16:33 < bridge> [teeworlds] @ChillerDragon give us your CMakeCache 16:34 < bridge> [teeworlds] im back! 16:35 < bridge> [teeworlds] y sure sec 16:36 < bridge> [teeworlds] https://pastebin.com/raw/hJX0HMwM 16:38 < bridge> [teeworlds] @LordSk 16:38 < bridge> [teeworlds] yeah im reading 16:38 < bridge> [teeworlds] pushy Dune :p 16:39 < bridge> [teeworlds] i still think someone can do this way faster with some hexediting the binary file 16:39 < bridge> [teeworlds] well 16:39 < bridge> [teeworlds] Maybe i can fake a dmg 16:39 < bridge> [teeworlds] try changing the SDL2_DIR path to your sdl2 directory 16:39 < bridge> [teeworlds] if i build the binary and then squeeze it into a finished 0.7.1 dmg 16:40 < bridge> [teeworlds] how?` 16:40 < bridge> [teeworlds] and run cmake again 16:40 < bridge> [teeworlds] where 16:40 < bridge> [teeworlds] edit the cache file 16:40 < bridge> [teeworlds] ``` 16:40 < bridge> [teeworlds] //The directory containing a CMake configuration file for SDL2. 16:40 < bridge> [teeworlds] SDL2_DIR:PATH=/usr/local/lib/cmake/SDL2 16:40 < bridge> [teeworlds] 16:40 < bridge> [teeworlds] //Path to a file. 16:40 < bridge> [teeworlds] SDL2_INCLUDEDIR:PATH=/Library/Frameworks/SDL2.framework/Headers 16:40 < bridge> [teeworlds] 16:40 < bridge> [teeworlds] //Path to a library. 16:40 < bridge> [teeworlds] SDL2_LIBRARY:FILEPATH=/Library/Frameworks/SDL2.framework 16:40 < bridge> [teeworlds] ``` 16:41 < bridge> [teeworlds] to the sdl framework i have in the tw dir directly? 16:41 < bridge> [teeworlds] that makes sense 16:41 < bridge> [teeworlds] actually there should be a FindSDL2 in your teeworlds folder right? 16:41 < bridge> [teeworlds] maybe it takes one with wrong version or something 16:41 < bridge> [teeworlds] where? 16:41 < bridge> [teeworlds] directly in the root? 16:41 < bridge> [teeworlds] not sure let me look at the pr 16:42 < bridge> [teeworlds] ./cmake/FIndSDL2.cmake 16:42 < bridge> [teeworlds] i have that 16:42 < bridge> [teeworlds] yeah that one 16:42 < bridge> [teeworlds] should i eidt that? 16:42 < bridge> [teeworlds] point it to the cmake folder 16:42 < bridge> [teeworlds] the SDL2_DIR 16:42 < bridge> [teeworlds] how ? xd 16:42 < bridge> [teeworlds] sry im nobo 16:42 < bridge> [teeworlds] it's fine 16:42 < bridge> [teeworlds] edit your CMakeCache file 16:43 < bridge> [teeworlds] the line I pasted earlier 16:43 < bridge> [teeworlds] put the path to the FindSDL2.cmake there instead 16:43 < bridge> [teeworlds] this might do nothing btw 16:44 < bridge> [teeworlds] uhm so i need a realtive path? 16:44 < bridge> [teeworlds] starting from where? 16:44 < bridge> [teeworlds] from the build? 16:44 < bridge> [teeworlds] so ../other/sdl/etc... 16:44 < bridge> [teeworlds] ah no 16:45 < bridge> [teeworlds] i mean ../cmake/FindSDL2.cmake 16:45 < bridge> [teeworlds] I'd go absolute just to be sure 16:45 < bridge> [teeworlds] xd uff 16:46 < bridge> [teeworlds] so the SDL2_Dir:PATH= 16:46 < bridge> [teeworlds] or which one 16:46 < bridge> [teeworlds] or SDL2_LIBRARY:FILEPATH 16:48 < bridge> [teeworlds] first one 16:48 < bridge> [teeworlds] y did 16:48 < bridge> [teeworlds] same result 16:48 < bridge> [teeworlds] did you run cmake again? 16:48 < bridge> [teeworlds] no 16:48 < bridge> [teeworlds] just make package_dmg 16:49 < bridge> [teeworlds] you have to run cmake for the changes to apply 16:49 < bridge> [teeworlds] doesnt that reset my Cache? 16:49 < bridge> [teeworlds] it should not 16:49 < bridge> [teeworlds] well still same result 16:50 < bridge> [teeworlds] and CMakeCache.txt was resetett 16:50 < bridge> [teeworlds] as i expected 16:50 < bridge> [teeworlds] well it is weird because it worked in 0.7.1 16:50 < bridge> [teeworlds] :c 16:50 < bridge> [teeworlds] how do you run cmake? 16:51 < bridge> [teeworlds] https://github.com/heinrich5991/teeworlds/pull/17 16:51 < bridge> [teeworlds] ``` 16:51 < bridge> [teeworlds] mkdir build 16:51 < bridge> [teeworlds] cd build 16:51 < bridge> [teeworlds] cmake .. 16:51 < bridge> [teeworlds] cmake -DCMAKE_OTOOL=otool . 16:51 < bridge> [teeworlds] make package_dmg 16:51 < bridge> [teeworlds] ``` 16:51 < bridge> [teeworlds] I'm not sure why the cache is reset 16:52 < bridge> [teeworlds] i have no idea< how ccmake worst but i thought if u run cmake it crates the cache file 16:52 < bridge> [teeworlds] and make builds depending on that file 16:52 < bridge> [teeworlds] well usually you run it once, it tells you if it succeeded 16:52 < bridge> [teeworlds] if not you makes changes and run it again 16:52 < bridge> [teeworlds] if not you make changes and run it again 16:54 < bridge> [teeworlds] normally i would keep bruteforcing now but i am way to exhausted i will lay down a bit now ._. if someone has an promising idea feel free to ping me 16:54 < bridge> [teeworlds] thanks for trying 😃 17:00 < bridge> [teeworlds] time to hex edit :D 17:05 < bridge> [teeworlds] +1 17:06 < bridge> [teeworlds] i only tried something like that once to bypass some nethash thingy or something like that to do some illegal stuff with vanilla modding hehe but i failed 17:06 < bridge> [teeworlds] shoudlnt the binary diff of the two linux versions give a pretty good hint where the 12 is located? 17:11 < bridge> [teeworlds] @ChillerDragon it does, on linux 17:12 < bridge> [teeworlds] `00121CF0 0C 0B` 17:12 < bridge> [teeworlds] but how do you do it on mac :p 17:52 < Teeworlds> [teeworlds] Dune-jr pushed 2 new commits to master: https://git.io/fhUES 17:52 < Teeworlds> teeworlds/master 0cebd1b Jordy Ruiz: Fix Christmas time detection 17:52 < Teeworlds> teeworlds/master b4101dc Jordy Ruiz: Merge pull request #1925 from Dune-jr/fix-xmas... 18:14 < bridge> [teeworlds] heinrich5991 / @heinrich5991 inp_grab is being troublesome 19:26 <@Dune_> is minus around? 19:32 < Teeworlds> [teeworlds] LordSk opened pull request #1927: Default inp_grab to 1 to be consistent with previous 0.7 releases (master...fix/inp_grab_default) https://git.io/fhUgy 19:34 < minus> i think minus is around, Dune_ 19:35 <@Dune_> that's nice 19:35 < minus> it is 19:35 <@Dune_> I'll try not to disturb the celebrations too long 19:35 < minus> celebrations are done 19:35 <@Dune_> that was quick 19:36 <@Dune_> after Oy left for the day (at least) we found two issues in the code 19:36 <@Dune_> the first was a bug that was quickly patched 19:36 <@Dune_> the second was that Oy added an inp_grab option to revert to 0.6 mouse behavior (not raw input, take in account mouse accel) 19:37 <@Dune_> this option is set to 0 by default, meaning that it *reverts* back to 0.6 by default, instead of keeping 0.7.1 behavior 19:37 <@Dune_> we are in the process of releasing 0.7.2. do you think I should change that option's default? 19:39 < minus> to how it was in 0.7.0? 19:39 <@Dune_> and 0.7.1, yes 19:39 <@Dune_> (we have to rebuild binaries anyway) 19:41 < minus> if the new default makes more sense, use the new one, if it can be considered a bugfix to revert it to 0.6, do it 19:41 < minus> in general changing defaults isn't great 19:41 <@Dune_> this option never existed and is introduced in 0.7.2 19:42 < bridge> [teeworlds] so 0.7.2 makes the new default like 0.6 was 19:42 < minus> can you link me to some info 19:42 < bridge> [teeworlds] which seems weird 19:42 <@Dune_> https://github.com/teeworlds/teeworlds/issues/1910 19:45 <@Dune_> This is LordSk's pending PR for 0.7.2: https://github.com/teeworlds/teeworlds/pull/1927 19:51 < minus> that option's naming is pretty bad 19:51 < minus> i'ma have to try 19:52 < bridge> [teeworlds] inp_grab 1 is raw input, 0.7 default 19:52 < bridge> [teeworlds] the mouse position is reset to the center of the screen, teeworlds use offsets every frame 19:53 < bridge> [teeworlds] inp_grab 01 is 0.6 behaviour aka desktop mouse mode 19:53 < bridge> [teeworlds] inp_grab 0 is 0.6 behaviour aka desktop mouse mode 19:55 < bridge> [teeworlds] 1 should be default 19:55 < bridge> [teeworlds] Old 06 behaviour should be optional 19:58 < bridge> [teeworlds] I agree Sonix 19:59 < bridge> [teeworlds] But we prefer raw input so there is a bias 20:01 < bridge> [teeworlds] in ddnet they've just added inp_mouseold 1,0 to enable/disable old mouse behaviour 20:01 < bridge> [teeworlds] i remember 20:01 < minus> so it should be a grab_mode? 20:01 < minus> raw and reset 20:03 < bridge> [teeworlds] The question is only if the default should be changed in Oy's absence, assuming it is a mistake, or not 20:03 < bridge> [teeworlds] there's no reason to make it default again?? 20:03 < bridge> [teeworlds] ^ 20:04 < bridge> [teeworlds] inconsistent with previous releases too 20:04 < bridge> [teeworlds] it should just be an option for players that are used with old mouse behaviour 20:04 < minus> if raw is the better mode, it should be default 20:04 < bridge> [teeworlds] raw is the 0.7 mode 20:04 < minus> if it just doesn't work properly then it shouldn't be default 20:04 < bridge> [teeworlds] better I don't know 😛 20:05 < bridge> [teeworlds] https://wiki.libsdl.org/SDL_HINT_MOUSE_RELATIVE_MODE_WARP 20:05 < bridge> [teeworlds] it works, how it works is subjective 20:05 < bridge> [teeworlds] "By default SDL will use raw input for relative mouse mode" 20:06 < bridge> [teeworlds] I say let's go, we can blame minus if it goes awry 20:07 < bridge> [teeworlds] just put raw default, its okay 20:07 < bridge> [teeworlds] yeah 20:29 <@Dune_> so I still have to guess whether that's intentional or not 20:30 < bridge> [teeworlds] doesn't matter i think 20:31 < bridge> [teeworlds] The problem are old players. If we want to have a smooth transition from 0.6 to 0.7, we should kept settings for such relevant thing as it was in 0.6. 20:32 < bridge> [teeworlds] We didn't tho 20:32 <@Dune_> the transition is way past us 20:32 <@Dune_> the question isn't whether this is a better change, but whether this should be considered a bu 20:32 <@Dune_> g 20:34 < bridge> [teeworlds] Transition will last for a month at least. I think, we should stay with 0.6-setting, I don't think so, Oy did it by accident ^.^ 20:34 < bridge> [teeworlds] we *already* changed 20:35 < bridge> [teeworlds] if we set the defaults now, they cannot be changed again 20:36 < bridge> [teeworlds] There's an option in settings to get back to 0.6 behaviour? (inp_grab 0)? 20:36 <@Dune_> that's what we're talking about, @Savander 20:37 <@Dune_> ah, not in the settings, no 20:37 < bridge> [teeworlds] It could be feature then 20:37 < bridge> [teeworlds] Then stick to 0.7 default ( inp_grab 1) 20:37 < bridge> [teeworlds] with option in settings tab, to get back to old behaviour 20:38 < bridge> [teeworlds] btw. inp_grab descriptions is quite bad 20:38 <@Dune_> I'll repeat, in case it's not clear. The question is: "is inp_grab defaulting to 0 a bug?" 20:38 < bridge> [teeworlds] hard to understand 20:38 <@Dune_> I'm inclining towards no 20:39 < bridge> [teeworlds] Probably not, but if it changes behaviour of mosue between minor versions, it sound bad no? 20:39 <@Dune_> it sounds bad yeah, but I'm no judge of that 20:39 < bridge> [teeworlds] so we can wait for Oy, or someone have to make decision 😄 20:40 <@Dune_> Oy will come too late for that 20:40 < bridge> [teeworlds] or we release tomorrow, chillerdragon is dead anyway 20:41 <@Dune_> Alright, I'll assume this is not a bug. 20:41 < bridge> [teeworlds] we don't have a mac build 20:41 <@Dune_> If it is, we can edit the release later I assume 20:41 <@Dune_> or maybe not 20:41 <@Dune_> we do 20:41 <@Dune_> only with the "no change" choice 20:41 <@Dune_> so I'll just put that then 20:41 <@Dune_> even though I disagree with the change 20:42 < bridge> [teeworlds] we don't even have a menu option 20:42 <@Dune_> yeah 20:42 <@Dune_> it's bad 20:42 < bridge> [teeworlds] to reenable the default 0.7 behaviour 20:42 < bridge> [teeworlds] this is VERY bad 20:42 < bridge> [teeworlds] actually, very bad yea 20:43 < bridge> [teeworlds] so let's wait for Oy, extend the event 20:43 < bridge> [teeworlds] and description for that command is weird."Use forceful input grabbing method" 20:43 < bridge> [teeworlds] doesn't really matter if the setting is clear 20:43 < bridge> [teeworlds] also, 0.7.2 before release, we could extend the time of event maybe 20:43 < bridge> [teeworlds] to whole december 20:44 <@Dune_> I also think we should 20:44 < bridge> [teeworlds] yes that'd be much better 20:44 < bridge> [teeworlds] Since, 6 decemeber 20:44 <@Dune_> huh 20:45 < bridge> [teeworlds] Santa Claus thing 20:45 < bridge> [teeworlds] and 24-27 december Christams 20:45 <@Dune_> there is no Santa Claus thing? 20:46 <@Dune_> @heinrich5991 halp 20:46 < minus> lemme try 0.7.1 20:46 < bridge> [teeworlds] No? In poland, we have santa's day 20:47 < bridge> [teeworlds] or something like that, don't know how to translate it to english actually 20:47 <@Dune_> 0.6 = no raw input 20:47 <@Dune_> 0.7.0/1 = raw input 20:47 <@Dune_> 0.7.2 = optional raw input. default=? 20:47 < bridge> [teeworlds] 0.7.2 default = raw input 20:47 < bridge> [teeworlds] ^ 20:47 < bridge> [teeworlds] ^ 20:48 < bridge> [teeworlds] and if we do that, no mac release so let's wait 20:48 <@Dune_> xmas is today for some people 20:48 < bridge> [teeworlds] Yea, xmas is here for poland as well 20:48 < bridge> [teeworlds] I think, 24 december is most important here 20:49 <@Dune_> yeah. in france it's different 20:49 < bridge> [teeworlds] yeah well the update shoulve come at the beginning of december 20:49 < bridge> [teeworlds] about 6 december, that's curious. I though you have similar event as well 20:49 < bridge> [teeworlds] but it's seems that you don't 😮 20:49 < bridge> [teeworlds] not in the middle of christmas 20:52 < minus> should there be a difference between inp_grab 0 and 1 in master? 20:52 <@Dune_> yes 20:52 < minus> i don't notice any 20:53 < minus> but that may be related to my setup 20:53 <@Dune_> inp_grab 1 = raw input 20:53 <@Dune_> inp_grab 0 = OS settings such as mouse accel 20:53 <@Dune_> I don't notice any either because I don't have any accel 20:53 < minus> oh well, i don't have that crap on 20:53 <@Dune_> most players do 20:53 < minus> dumbest invention ever if you ask me 20:55 < bridge> [teeworlds] Does mouse-speed set via OS changes speed of cursor as well? with inp_grab = 0 20:55 <@Dune_> likely does 20:55 < bridge> [teeworlds] it does 20:56 < bridge> [teeworlds] I think, by defualt it's in the middle on windows 20:57 <@Dune_> well, I need heinrich5991 for Steam either way, so I'll wait for now 22:59 <@heinrich5991> hi! 22:59 < Oy> the default value for inp_grab was intended 22:59 <@heinrich5991> I think we need a mac build, Oy 22:59 < Oy> hey 22:59 <@Dune_> hey 22:59 <@Dune_> mac build is there https://github.com/teeworlds/teeworlds/releases 23:00 <@heinrich5991> oh ok 23:00 <@heinrich5991> then I misunderstood the situation 23:00 <@Dune_> chillerdragon helped 23:00 <@heinrich5991> ah 23:00 <@Dune_> but #1927 was a hard one 23:01 < Oy> mouse behaviour should be like in the previous master versions 23:01 <@heinrich5991> wait 23:01 <@heinrich5991> like in 0.7 or 0.6? 23:01 <@heinrich5991> currently, it defaults to 0.6 behavior 23:01 < Oy> 0.6, 0.5, 0.4 etc 23:01 <@heinrich5991> k 23:02 < Oy> yeah, that's correct 23:03 < Oy> that warp mode wasn't working in times when the move to sdl2 was done 23:03 < Oy> but seems to work now 23:03 < bridge> [teeworlds] sdl2.0.9 doesn't work I think 23:04 < bridge> [teeworlds] need 2.0.8 23:04 <@heinrich5991> yes 23:04 <@heinrich5991> should use 2.0.8 23:04 <@heinrich5991> at least for windows 23:04 < Oy> yeah 23:04 <@heinrich5991> warp mode sounds kinda like a hack, raw mode sounds cleaner: https://forums.libsdl.org/viewtopic.php?t=11838 23:05 < bridge> [teeworlds] linux x64 checked 23:05 < bridge> [teeworlds] reuploading windows almost done 23:06 < bridge> [teeworlds] heinrich5991: can you download and port to steam? 23:06 < bridge> [teeworlds] you can release immediately 23:08 < Teeworlds> [teeworlds] heinrich5991 opened pull request #1928: Document `inp_grab` a little (master...pr_doc_inpgrab) https://git.io/fhUoI 23:11 < Oy> it don't just disable mouse acceleration, but considers your os mouse settings 23:12 <@heinrich5991> for some reason, I can't unpack the dmg :( 23:13 < minus> that discord bridge is seriously annoying 23:13 < minus> at least matrix bridges better 23:13 <@heinrich5991> matrix doesn't bridge to quakenet 23:14 <@Dune_> heinrich5991: need to remake a .dmg? :/ 23:14 <@Dune_> we can ask Oy 23:14 <@heinrich5991> no, this might just be me not being able to open it on linux 23:14 < Oy> sounds odd to me 23:15 <@heinrich5991> usually 7z x teeworlds-*-osx.dmg works 23:15 < Oy> yeah 23:15 <@heinrich5991> now it outputs files that look like partitions 23:15 <@heinrich5991> 0.MBR 1.Primary GPT Header 2.Primary GPT Table 3.free 4.Apple_APFS 5.free 6.Backup GPT Table 7.Backup GPT Header 23:16 < Oy> was it build with the release script? 23:16 <@heinrich5991> Dune_: ^ 23:16 <@Dune_> yes Oy 23:16 < Oy> heinrich5991: how is it for the 0.7.1 one? 23:17 < minus> maybe someone should set up CI/CD to build shit 23:17 < minus> note: not me 23:17 < minus> i've done it before 23:17 <@heinrich5991> that works, the 0.7.1 thing 23:17 <@heinrich5991> on the todo list :P after finishing the stupid cmake stuff 23:18 <@heinrich5991> also the ability to test would be nice now that we have wishlist items ^^ 23:18 < Oy> i didn't build on the latest mac osx version though 23:19 <@Dune_> ah, damn me, I forgot to write the steam draft announcement 23:19 < Oy> could build a new one 23:19 < Oy> would take some min 23:19 <@heinrich5991> a few mins don't hurt if you got the time 23:20 <@Dune_> chillerdragon won't be happy though, he did it while being sick and all :c 23:20 <@heinrich5991> :| 23:20 <@Dune_> almost released but the inp_grab stuff made me doubt :| 23:20 <@heinrich5991> you could try to test the dmg he built. if it works for mac users, it's fine 23:20 <@heinrich5991> I just need the archive contents 23:22 <@heinrich5991> I think the problem for me is that it contains an APFS file system while the old one probably contained an HFS+ file system 23:22 <@heinrich5991> https://en.wikipedia.org/wiki/Apple_File_System relatively new 23:23 < Oy> hm, doesn't work for older mac versions that should still work 23:26 <@Dune_> well, rebuild then oy 23:40 < Oy> updated the github one 23:43 <@heinrich5991> uploaded to teeworlds.com 23:46 < bridge> [teeworlds] teeworlds.com has github links anyway 23:47 <@heinrich5991> still :) 23:47 < Oy> what about start page? 23:48 < Oy> download tw for your os- button 23:51 <@heinrich5991> updated 23:51 <@heinrich5991> Dune_: do we have a release announcement? 23:53 <@heinrich5991> Oy: is it intended that the win32 archive doesn't contain a freetype.dll? 23:53 < Oy> nope 23:53 < Oy> should be in there 23:53 < Oy> doesn't run otherwise 23:54 < bridge> [teeworlds] I built it statically in 23:54 < bridge> [teeworlds] since you weren't here Oy 23:54 < bridge> [teeworlds] hey btw 23:54 < bridge> [teeworlds] merry christmas 😃 23:54 < Oy> hey 23:55 < Oy> why not use the dll? 23:55 < bridge> [teeworlds] but I'd rather have you do it if you don't mind 23:55 < minus> *cough* static linking 23:56 < bridge> [teeworlds] I'm not sure the release I did works correctly 23:57 < Oy> the win64 one on github started for me 23:57 <@heinrich5991> minus: not really a difference if you ship the dlls next to the program 23:57 < Oy> will test the win32 too 23:57 < minus> heinrich5991: except you can't forget shipping the DLLs 23:57 < minus> :D 23:58 < Sajadi> Merry Christmas from Austria :)