| 00:10.55 | *** join/#bzflag khonkhortisan (~Khonkhort@2601:8:8600:9b0:4a5b:39ff:fe94:be23) |
| 00:54.11 | *** join/#bzflag khonkhortisan (~Khonkhort@2601:8:8600:9b0:4a5b:39ff:fe94:be23) |
| 01:39.57 | *** join/#bzflag khonkhortisan (~Khonkhort@2601:8:8600:9b0:4a5b:39ff:fe94:be23) |
| 02:23.00 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 02:23.00 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 02:46.11 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:7885:3170:76d5:f36e) |
| 02:53.29 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:7885:3170:76d5:f36e) |
| 03:52.11 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 04:51.33 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 04:51.33 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 05:57.58 | *** join/#bzflag delusional (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 06:47.38 | *** join/#bzflag Snake12534 (uid45641@gateway/web/irccloud.com/x-swozxzrmingauzra) |
| 07:23.55 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 07:44.19 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 07:44.23 | *** join/#bzflag death__ (~I_Died_On@69.136.32.149) |
| 07:45.23 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 08:20.50 | *** join/#bzflag I_Died_Once (~I_Died_On@69.136.32.149) |
| 08:20.50 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 10:25.55 | *** join/#bzflag Chestal (~thilo@vmax.unix-ag.uni-siegen.de) |
| 10:25.55 | *** mode/#bzflag [+o Chestal] by ChanServ |
| 14:16.16 | *** join/#bzflag Cobra_Fast (~coprah@wtwrp.de) |
| 14:17.29 | *** join/#bzflag Kaelten (Kaelten@2600:3c00::f03c:91ff:fedb:9160) |
| 14:17.29 | *** join/#bzflag Kaelten (Kaelten@WoWUIDev/WoWAce/WoWIFA/CurseStaff/kaelten) |
| 14:22.50 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 16:34.03 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 16:34.07 | *** join/#bzflag death__ (~I_Died_On@69.136.32.149) |
| 16:49.46 | Not-311d | [02bzflag-import-3] 07kongr45gpen pushed 032 commits to 03v2_4_x [+0/-0/±6] 13http://git.io/SnkYOw |
| 16:49.47 | Not-311d | [02bzflag-import-3] 07kongr45gpen 03f8ab7d6 - Update the shot statistics live |
| 16:49.48 | Not-311d | [02bzflag-import-3] 07kongr45gpen 0368900df - Set 0% as the default hit/fired ratio for shot stats to increase readability |
| 16:59.53 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 16:59.53 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 17:02.25 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 17:09.08 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 17:09.08 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 17:19.55 | *** join/#bzflag Patlabor221 (~JeffM@107-209-61-107.lightspeed.irvnca.sbcglobal.net) |
| 17:29.40 | *** join/#bzflag khonkhortisan (~Khonkhort@2601:8:8600:9b0:4a5b:39ff:fe94:be23) |
| 17:46.52 | *** join/#bzflag sirquine (~quine@c-67-162-133-17.hsd1.co.comcast.net) |
| 17:49.06 | *** join/#bzflag brlcad (~sean@66-118-151-70.static.sagonet.net) |
| 20:02.34 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 20:20.30 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 20:20.30 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 21:33.12 | *** join/#bzflag zuii (~akos@BC06BD4B.catv.pool.telekom.hu) |
| 21:33.58 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 21:33.58 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 21:42.20 | *** join/#bzflag Snake12534 (uid45641@gateway/web/irccloud.com/x-dbdnigqojfpajzaf) |
| 22:06.10 | zuii | i cant create git patch |
| 22:06.39 | zuii | i only created repo for the plugin not for the whole bzflag project |
| 22:07.45 | zuii | i had to add a new event bzfsAPI.h modified some lines in bzfs.cxx |
| 22:08.19 | zuii | i created a new new repo, copied files into it, gitk shows the diff |
| 22:08.28 | zuii | but i cant create pacth |
| 22:15.48 | zuii | its size is zero |
| 22:16.05 | zuii | anyway i created whole bzflag repo |
| 22:16.40 | zuii | my dev repo https://github.com/akooos/bzflag-devrepo.git |
| 22:18.11 | Patlabor221 | so you didn't fork you just made a new repo? |
| 22:18.35 | zuii | fork? noh i created local git repo from nothing |
| 22:18.51 | zuii | i have just start to use git |
| 22:19.02 | alezakos | that's very old code, too |
| 22:19.06 | Patlabor221 | yeah so you can't make a patch because it doesn't know what to patch against |
| 22:19.08 | Patlabor221 | do this |
| 22:19.18 | Patlabor221 | Fork bzflag into your account |
| 22:19.33 | Patlabor221 | then copy your Cxx and H files into that repository |
| 22:19.49 | Patlabor221 | and commit, that will just add the changes you made |
| 22:20.12 | Patlabor221 | then you can push those changes to your fork and create a pull request against the official bzflag |
| 22:20.36 | Patlabor221 | yeah did you do this from 2.4.2 or from the 2_4_x branch |
| 22:20.43 | Patlabor221 | my guess is you used the tarbal |
| 22:21.07 | zuii | yep |
| 22:21.14 | zuii | doh |
| 22:21.17 | alezakos | BTW, shouldn't our README file say 2.4.3 instead of 2.4.2? |
| 22:21.38 | zuii | okay which branch should i fork? |
| 22:21.46 | Patlabor221 | yeah that has no history link to us |
| 22:21.55 | Patlabor221 | you don't fork a branch |
| 22:21.59 | Patlabor221 | you fork a repository |
| 22:22.05 | Patlabor221 | it doesn't matter what branch you are on |
| 22:22.15 | Patlabor221 | so fork the import-3 repository |
| 22:22.23 | Patlabor221 | do a clone of the v2_4_x branch |
| 22:22.28 | zuii | aham done |
| 22:22.32 | Patlabor221 | make your chnages in that clone |
| 22:22.37 | Patlabor221 | then commit them |
| 22:22.40 | Patlabor221 | and push them |
| 22:22.52 | Patlabor221 | then you can create a pull request for the mainline |
| 22:22.58 | Patlabor221 | it's like an automatic patch |
| 22:23.07 | Patlabor221 | then we can review it and apply it |
| 22:24.47 | zuii | i just want you to see what changes i have made so far |
| 22:25.07 | zuii | i added new event, you may not gonna like it.. |
| 22:25.30 | Patlabor221 | ok then you can do a few more steps |
| 22:25.48 | Patlabor221 | make a new branch in your forked repo of v2_4_x |
| 22:25.51 | Patlabor221 | clone that branch |
| 22:25.59 | Patlabor221 | make your changes that you want us to see in that branch |
| 22:26.02 | Patlabor221 | and commit them |
| 22:26.07 | Patlabor221 | then you can make a pull rewuest |
| 22:26.37 | Patlabor221 | then make you can ether make new branchs for new things to show us, or update that branch from your working branch |
| 22:26.53 | Patlabor221 | but you need to be working in some kind of fork to be able to push changes to us |
| 22:27.29 | Patlabor221 | since you used the tarbal, that repository doens't know that it came from bzflag, it just knows that it is code |
| 22:27.38 | Patlabor221 | you started over |
| 22:28.32 | Patlabor221 | We should probalby put some instructions for "so you want to make a patch" |
| 22:28.36 | Patlabor221 | somewhere |
| 22:28.43 | Patlabor221 | probalby in the repo readme |
| 22:42.08 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 22:42.09 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 22:47.50 | zuii | i cloned the forked repo, didnot make any other branches, copied plugin folder "KeepQuiet" |
| 22:47.58 | zuii | and git just ignores it |
| 22:48.10 | Patlabor221 | you have to add it |
| 22:48.14 | zuii | git add . |
| 22:48.18 | zuii | or git add -A |
| 22:48.22 | Patlabor221 | then you can commit it |
| 22:48.27 | Patlabor221 | then sync it |
| 22:51.47 | blast007 | 'git diff' should show uncommited changes once you add the files |
| 22:52.40 | zuii | im still haing problam adding files to my local repo |
| 22:53.35 | zuii | https://github.com/akooos/bzflag-import-3/tree/v2_4_x/plugins |
| 22:53.47 | zuii | i pushed everything except KeepQuiet folder |
| 22:54.12 | blast007 | you don't push folders, you push changesets |
| 22:57.48 | zuii | finally |
| 22:58.00 | zuii | folder was added as a submodule |
| 22:58.13 | zuii | i removed it an readded it |
| 22:58.18 | zuii | all the files |
| 22:59.16 | zuii | to badd it was not only one push |
| 23:04.45 | blast007 | don't push until you got it right ;) |
| 23:06.30 | zuii | i created a pull request |
| 23:06.50 | zuii | already |
| 23:07.21 | Patlabor221 | I don't see the pull request in our list |
| 23:07.45 | Patlabor221 | there is just my crappy one with too much history |
| 23:08.37 | alezakos | don't create a pull request yet, one of your commits has reversed the entire 2.4.3 code to 2.4.2 |
| 23:09.42 | Patlabor221 | yeah I'd just start over and remake your changes, not copy, since you didn't use current code the copy idea wont' work |
| 23:12.35 | Patlabor221 | we can have a readme.mu in the repo that will show instead of the checked in readme right? |
| 23:12.46 | alezakos | yeah |
| 23:12.49 | alezakos | s/mu/md |
| 23:13.11 | Patlabor221 | maybe that's what we should do |
| 23:13.29 | Patlabor221 | then let that have some instructions on how to use gitubt |
| 23:13.45 | Patlabor221 | and then that'd leave the regular readme being the one for tarbals and binaries |
| 23:14.37 | Patlabor221 | I mean it does seem odd that the current readme on github has a link to github about how to get bzflag ;) |
| 23:15.05 | Patlabor221 | can we link to the actual readme from the md one? |
| 23:15.11 | alezakos | yup |
| 23:15.20 | Patlabor221 | then lets just do that |
| 23:15.39 | Patlabor221 | it can have sections "how to start making changes to bzflag" |
| 23:15.40 | alezakos | github seems to prioritize README.MD over a regular README, so we're good to go |
| 23:15.44 | Patlabor221 | cool |
| 23:16.51 | blast007 | why have a separate one? markdown is pretty readable even as plain text (which was the main design goal of the syntax) |
| 23:17.09 | Patlabor221 | because I think they 2 docs have different target audiences |
| 23:17.30 | *** join/#bzflag khonkhortisan (~Khonkhort@2601:8:8600:9b0:4a5b:39ff:fe94:be23) |
| 23:17.34 | blast007 | then it should be called something else |
| 23:17.35 | Patlabor221 | one is for someone who is AT the repo, the other is someone who got a tarbal or binary and needs to know how to use the game |
| 23:17.39 | Patlabor221 | sure |
| 23:17.44 | Patlabor221 | that's valid |
| 23:17.57 | Patlabor221 | can we pick what document is show first? |
| 23:17.58 | blast007 | but I see build/install instructions on repos a lot |
| 23:19.52 | Patlabor221 | based on the user survey I don't think most people go to the source repo for stuff |
| 23:23.52 | zlsa | I do |
| 23:24.00 | zlsa | but obviously that's only me |
| 23:24.02 | Patlabor221 | becuase you are a developer |
| 23:24.14 | Patlabor221 | and what you want/need is dev info, not user info |
| 23:24.41 | zlsa | well I'd guess that most people who are on GitHub want dev-related info |
| 23:24.54 | zlsa | * at github.com/bzflag |
| 23:25.23 | Patlabor221 | given what I have seen, yes I think that is true |
| 23:25.32 | Patlabor221 | not many people build from source just to play |
| 23:48.20 | blast007 | except the linux people. oh right, not many people. |
| 23:48.22 | blast007 | ducks ;) |
| 23:49.12 | Patlabor221 | the data shows it :) |
| 23:49.23 | Patlabor221 | and honestly it seems a bunch of them use a tarbal |
| 23:49.31 | Patlabor221 | many are on 2.4.2 |
| 23:55.13 | blast007 | 2.4.2 is decently packaged in most distros |
| 23:56.25 | Patlabor221 | tarbal or package then |