| 00:09.09 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 00:09.11 | *** join/#bzflag death__ (~I_Died_On@2601:5:9b80:456f:96de:80ff:fe75:1ff7) |
| 00:34.28 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 00:58.59 | *** join/#bzflag tannerld (~tannerld@c-98-234-107-216.hsd1.ca.comcast.net) |
| 01:32.48 | *** join/#bzflag sirquine` (~quine@c-67-162-133-17.hsd1.co.comcast.net) |
| 02:15.59 | *** join/#bzflag tannerld (~tannerld@c-98-234-107-216.hsd1.ca.comcast.net) |
| 02:35.41 | *** join/#bzflag tannerld (~tannerld@c-98-234-107-216.hsd1.ca.comcast.net) |
| 06:45.56 | Notify | 03BZFlag:Allejo * 8860 /Functions(API): Add bz_getPlayerFlag() to the Flag Management zone too |
| 08:24.17 | allejo | is gonna merge his pull request |
| 08:25.32 | *** join/#bzflag Not-5450 (~notifico@198.199.82.216) |
| 08:25.32 | Not-5450 | [02bzflag-import-3] 07allejo pushed 034 commits to 03v2_4_x [+0/-0/±12] 13http://git.io/vv5zl |
| 08:25.34 | Not-5450 | [02bzflag-import-3] 07allejo 03d2c35eb - Move FlagStay's custom zones into the BZFS API |
| 08:25.36 | Not-5450 | [02bzflag-import-3] 07allejo 03f8fbc59 - Port KOTH to use new bz_CustomZoneObject |
| 08:25.38 | Not-5450 | [02bzflag-import-3] 07allejo 039c6becb - Port wwzones to use new bz_CustomZoneObject |
| 08:25.40 | Not-5450 | [02bzflag-import-3] ... and 1 more commits. |
| 08:33.20 | Not-5450 | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+7/-0/±4] 13http://git.io/vv5gM |
| 08:33.22 | Not-5450 | [02bzflag-import-3] 07allejo 037f88111 - Add custom zone sample plugin; Fix flagstay sample |
| 08:41.54 | allejo | I apologize in advance for the configure.ac and Makefile.am conflicts server hosts will be receiving... |
| 08:42.32 | allejo | is there any way to handle situations like this to avoid merge conflicts? |
| 08:42.49 | allejo | or did I add a new plugin wrong :x |
| 08:45.55 | allejo | on the bright side... build's not broken! |
| 11:25.12 | brad | ~beat allejo |
| 11:25.13 | infobot | ACTION beats allejo with a dripping-wet & less-than-fresh fish |
| 11:28.55 | blast007 | I don't think there should be any conflicts if you update the 'git way' |
| 11:33.13 | blast007 | wouldn't you either have your changes commited to your local repo and 'git pull --rebase', or stash your local changes with 'git stash', then 'git pull' (possibly with --rebase anyways), and then 'git stash apply'? (and perhaps in both cases backing up your local repo in case any of that decides to barf) |
| 11:41.04 | alezakos | ideally server owners won't have to edit files belonging in the git repo that might be modified |
| 12:07.32 | *** part/#bzflag jgorak__ (~jgorak@pool-100-34-10-79.phlapa.fios.verizon.net) |
| 15:03.34 | BulletCatcher | Evidence that Randall Munroe has seen the BZFlag source code: https://xkcd.com/1513/ |
| 15:04.47 | blast007 | ;D |
| 21:04.59 | allejo | lol |
| 21:05.36 | allejo | only reason I brought up conflicts was because of configure.ac and plugins/Makefile.am both files are changed by the linux build system when you add plugins to it |
| 21:05.54 | allejo | so... when i added the custom zone sample plugin, it added that plugin to those files |
| 21:06.06 | allejo | both of which should be modified by server hosts if they have custom plugins |
| 21:06.35 | alezakos | yes |
| 21:07.54 | allejo | yea, so is there any other way of handling that? |
| 21:15.09 | alezakos | put CustomZoneSample below customflagsample and not the SAMPLE_PLUGIN :) |
| 21:16.58 | allejo | and that'd help conflicts? |
| 21:17.41 | alezakos | it might, since newplug.sh throws everything just below "SAMPLE_PLUGIN \" |
| 21:18.35 | alezakos | at least it will keep the alphabetical order in the list :) |
| 21:22.44 | allejo | TimeLimit is also out of order... guess it could be updated lol |
| 21:32.15 | Not-5450 | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+0/-0/±2] 13http://git.io/vvNmU |
| 21:32.17 | Not-5450 | [02bzflag-import-3] 07allejo 0333e749b - Put plugins in alphabetical order |
| 21:38.47 | alezakos | that broke configure.ac merging :) |
| 21:39.30 | allejo | I figured... lol |
| 21:48.57 | BulletCatcher | The new .gitattributes file is inconsistent with the MSVC files that end in CRLF. |
| 21:52.05 | *** part/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 21:52.17 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 21:53.28 | BulletCatcher | I haven't found an easy way to see the immediate effect of .gitattributes changes without checking in and then doing another checkout. |
| 21:54.44 | BulletCatcher | For example, with a clean working tree do "git checkout v2_6_x" and then "git checkout v2_4_x ; git status". |
| 21:57.01 | BulletCatcher | We can fix most of it by adding a few lines like "*.vcxproj eol=crlf" to .gitattributes, but I'd like to see it all done in one commit to avoid unintentional changes to line endings. |
| 22:00.32 | BulletCatcher | "alphabetical order" for plugins seems to be case sensitive sometimes, but not other times. |
| 22:06.25 | BulletCatcher | Anyone see any reason not to do the following GitHub repo rename operations? |
| 22:06.30 | BulletCatcher | bzflag-archive-rc1 -> bzflag-archive |
| 22:06.34 | BulletCatcher | bzworkbench-rc2 -> bzworkbench |
| 22:06.39 | BulletCatcher | bzflag-web-rc2 -> bzflag-web |
| 22:06.40 | BulletCatcher | bzflag-tools-rc4 -> bzflag-tools |
| 22:07.25 | BulletCatcher | I want to a have a firm decision about issues and pull requests before doing the bzflag repo itself. |
| 22:07.42 | BulletCatcher | And no, I don't have a good suggestion about that. |
| 22:08.55 | alezakos | Is the name of the 'master' branch final? Wouldn't it be better to rename it to something like 'dev' so that people don't check it out only to see that something's wrong? |
| 22:09.36 | BulletCatcher | People who use Git expect there to be a branch named "master". |
| 22:10.18 | BulletCatcher | Developers are going to have to know which branch to choose, and sometimes it will be 2.4 and other times master. |
| 22:10.52 | BulletCatcher | There is no best choice for what is in the branch named "master". |
| 22:12.02 | alezakos | okay then |
| 22:12.58 | BulletCatcher | My solution was to have just a README in the master branch that tries to direct people to the branch they want, but no one else liked that approach. |