| 00:48.17 | KaadmY | oh darn |
| 00:48.21 | KaadmY | forgot to play duc |
| 00:48.28 | KaadmY | having a busy day :/ |
| 00:49.07 | Zehra | only had one match for me :P |
| 02:07.52 | *** join/#bzflag ukiki (~ukiki_@99-29-155-149.lightspeed.bcvloh.sbcglobal.net) |
| 02:08.48 | *** join/#bzflag ukiki (~ukiki_@99-29-155-149.lightspeed.bcvloh.sbcglobal.net) |
| 04:58.53 | *** join/#bzflag a_meteorite (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 05:08.38 | *** part/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 05:08.49 | *** join/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 06:46.21 | *** join/#bzflag a_meteor_ (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 10:40.09 | *** join/#bzflag a_meteorite (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 15:42.51 | *** join/#bzflag cods (~fred@rsbac/developer/cods) |
| 15:52.48 | *** join/#bzflag Zehra (~Zehra@unaffiliated/zehra) |
| 16:26.53 | *** join/#bzflag KaadmY (uid135503@gateway/web/irccloud.com/x-fdeyznjlvkplcpmq) |
| 16:44.26 | cods | Hi. I've uploaded an image to images.bzflag.org ten days ago, which is waiting moderation. Do I need to ping someone about that? |
| 16:51.35 | macsforme | all done, cods |
| 16:51.58 | cods | heh, thanks :) |
| 16:54.17 | KaadmY | btw the bzflag image hosting is a bit annoying |
| 16:54.27 | KaadmY | if uses the first letter of your first name plus the last name |
| 16:54.33 | KaadmY | instead of your callsign/forum name |
| 16:54.41 | KaadmY | so my images are hosted under kdmy |
| 16:54.42 | KaadmY | ' |
| 16:55.27 | allejo | hey, I have "allejo" and "alejo", and that's annoying :p |
| 16:55.34 | blast007 | yeah, some idiot make that system |
| 16:55.36 | blast007 | made* |
| 16:56.49 | allejo | i also have "hshot" |
| 16:57.45 | allejo | if it were actually used, it'd be worth the effort of updating it |
| 16:58.04 | blast007 | that's a pretty blanket statement for all of BZ ;) |
| 16:59.20 | allejo | hehe |
| 17:00.50 | blast007 | I never actually *finished* the images.bzflag.org site |
| 17:01.36 | blast007 | when you approve/reject an image, it just var_dumps the contents of a variable instead of showing a status page |
| 17:02.03 | KaadmY | sounds quite complete |
| 17:02.17 | blast007 | oh it's the best |
| 17:02.38 | blast007 | definitely some of my best code</sarcasm? |
| 17:02.48 | blast007 | s/?/>/ |
| 17:05.54 | allejo | does it have enough usage to merit a quick rewrite, blast? |
| 17:07.57 | blast007 | it should get replaced with a properly designed asset management system |
| 17:08.09 | blast007 | not a reimplementation of what we already have |
| 17:08.30 | blast007 | so no |
| 17:08.50 | allejo | figured |
| 17:09.16 | blast007 | main thing I'd change with the current one just using PHP templates |
| 18:00.38 | JeffM | i made that system |
| 18:00.46 | JeffM | the idea was that you can not copyright things under your "handle" |
| 18:00.55 | JeffM | so you are supposed to use your friggin name ;) |
| 18:01.35 | *** join/#bzflag a_meteorite (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 18:02.01 | macsforme | there are worse examples of that, like https://github.com/BZFlag-Dev/bzflag/blob/2.4/misc/bzls.lua#L7 |
| 18:02.35 | JeffM | yeah, there is no legal entity that goes by a callsign |
| 18:03.32 | JeffM | unless you all formed corporations ;) |
| 18:03.50 | JeffM | if you did, the great state of wyoming thanks you |
| 18:04.15 | JeffM | what's the cheapest place in Europe for form a corp? |
| 18:10.08 | blast007 | JeffM: I wrote the code for it |
| 18:10.18 | JeffM | didn't I do one of htem? |
| 18:10.38 | JeffM | if it works it makes sense that you wrote or rewriote it :) |
| 18:11.03 | blast007 | it works by minimal definition of "works" |
| 18:11.10 | JeffM | I recall the idea of making them use first/last names tho |
| 18:11.29 | JeffM | if it's php and does not set your computer on fire, then it is not code that I wrote ;) |
| 18:12.00 | blast007 | it is PHP - the second part is debatable :) |
| 18:12.19 | JeffM | all my php is embarasing |
| 18:13.03 | JeffM | even the crap I submitted for my capstone. |
| 18:13.36 | blast007 | maybe you had written the image submission system prior to this one |
| 18:13.43 | blast007 | pretty sure mine was a rewrite/replacement |
| 18:13.55 | JeffM | that is probable |
| 18:14.05 | JeffM | I just remember making a really crappy one once |
| 18:14.20 | JeffM | like it's the entire reason weblogin was made and all that |
| 18:14.22 | *** join/#bzflag Zehra_ (~Zehra@2601:58b:c401:df8:65e8:dd06:351e:7cfe) |
| 18:14.22 | *** join/#bzflag Zehra_ (~Zehra@unaffiliated/zehra) |
| 18:14.28 | JeffM | andI remember working on that |
| 18:14.39 | blast007 | yeah, some of that was pretty horrid ;) |
| 18:14.44 | JeffM | so maybe image stuff was multiple idiots :) |
| 18:15.22 | KaadmY | well if it uses your first/last name, there should at least be a notice saying how it's used |
| 18:15.37 | JeffM | that sounds reasonable :) |
| 18:15.38 | blast007 | KaadmY: it sends it all to the RIAA/MPAA |
| 18:15.46 | blast007 | that's how it's used |
| 18:37.28 | *** join/#bzflag a_meteorite (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 19:26.29 | *** join/#bzflag Void7 (~nullified@205.157.147.198) |
| 19:34.05 | allejo | should the motd be updated for 2.4.8? |
| 19:34.37 | *** topic/#bzflag by allejo -> http://BZFlag.org || http://ohloh.net/p/bzflag || https://wiki.bzflag.org/Getting_Help || Channel Logs: http://infobot.rikers.org/%23bzflag/ || 2.4.8 released! https://forums.bzflag.org/viewtopic.php?f=62&t=19294 |
| 19:58.43 | blast007 | MOTD updated |
| 20:45.37 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.46) |
| 20:45.38 | BZnotify | [13bzflag] 15macsforme pushed 1 new commit to 062.4: 02https://git.io/vP1Yf |
| 20:45.38 | BZnotify | 13bzflag/062.4 14126fcbf 15Joshua Bodine: Implemented multisampling support under SDL 2. It requires a client restart to go into effect.... |
| 20:45.38 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.46) |
| 21:26.23 | *** join/#bzflag allejo (~allejo@bzflag/developer/allejo) |
| 21:26.23 | *** mode/#bzflag [+v allejo] by ChanServ |
| 21:26.31 | *** join/#bzflag kierra (~quassel@00.alucard.sujevo.io) |
| 21:29.33 | *** part/#bzflag Guest52431 (~quassel@00.alucard.sujevo.io) |
| 21:30.48 | *** join/#bzflag moriah (~quassel@unaffiliated/kierra) |
| 21:46.50 | the_map | every time the topic is changed I immediately wonder what it was before / what was changed |
| 21:53.10 | Zehra | lol same here |
| 21:57.51 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 21:57.51 | BZnotify | [13bzflag] 15macsforme closed pull request #54: Add some visual enhancements (062.4...062.4) 02https://git.io/vo54g |
| 21:57.51 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 22:00.04 | alezakos | macsforme: FYI, there is an effects option that can disable/control the density of the grass in that PR |
| 22:00.43 | macsforme | oh |
| 22:01.58 | alezakos | also, the grass texture is a separate .png file |
| 22:04.21 | macsforme | what do you mean? |
| 22:05.18 | macsforme | I saw that much |
| 22:05.42 | alezakos | ah, okay then |
| 22:09.09 | macsforme | it's still not nearly dense enough at the highest density |
| 22:09.28 | macsforme | thanks for catching that, though |
| 22:11.04 | macsforme | names alezakos his personal error catcher |
| 22:11.58 | alezakos | yay, another responsibility! |
| 22:15.04 | macsforme | I guess his color wasn't too far off from the standard ground texture, either... but there is still an obvious edge to it |
| 22:15.41 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 22:15.41 | BZnotify | [13bzflag] 15khonkhortisan opened pull request #58: -noSelfKills (062.4...06noselfkills) 02https://git.io/vP10w |
| 22:15.41 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.41) |
| 22:22.29 | *** join/#bzflag Carioca (bb690810@gateway/web/freenode/ip.187.105.8.16) |
| 22:28.53 | macsforme | we owe khonkortisan a response to his several pending pull requests... I'm no familiar enough with VS to be helpful with that one, and I don't have a triple monitor setup to test that one either |
| 22:30.21 | allejo | I believe the VS version the project is using is 2010 |
| 22:36.15 | the_map | so was the grass updated or rejected? |
| 22:37.11 | allejo | if #58 is merged, then the commits need to be cleaned up. no need for the merging commits |
| 22:37.52 | allejo | or, squash it all together |
| 22:38.46 | allejo | the_map, rejected |
| 22:38.57 | allejo | it's #54 up above |
| 22:40.39 | *** part/#bzflag Carioca (bb690810@gateway/web/freenode/ip.187.105.8.16) |
| 22:44.37 | macsforme | hmm, is that a bad practice? I did the same thing for the MPL license PR (merged 2.4 in a few times to fix conflicts) |
| 22:45.05 | macsforme | should I rebase it instead? |
| 22:47.22 | allejo | I wouldn't say it's a bad practice, it just clutters the git history with useless commits that |
| 22:48.21 | the_map | ...that what? |
| 22:49.00 | the_map | ...that leave you waiting for the rest of the sentence? |
| 22:49.02 | allejo | that are just you "rewriting" content that's already there |
| 22:49.23 | alezakos | git usually do have an option that ignores merge commits, but yeah, they're just meaningless clutter that means nothing and can be easily avoided |
| 22:49.37 | alezakos | s/git/git tools |
| 22:51.11 | allejo | like if you merge the MPL PR as is, you'd get two "Update COPYING" commits that add nothing meaningful to git history and then your merge of 2.4 which is essentially you rewriting the changelog with content that was already there |
| 22:51.23 | allejo | which btw, isn't clean: https://github.com/BZFlag-Dev/bzflag/pull/56/commits/bad46cf34c6ee78427090676da703c6486bb228b#diff-02f0b547c2779d25cff89672135f20e3R21 |
| 22:51.27 | allejo | :) |
| 22:51.30 | macsforme | I'm not sure how they can be avoided if the upstream is changing while your pull request is open, unless you rebase... but then don't you have to force push? |
| 22:53.14 | allejo | what I've seen done in other projects and do myself is by the time I merge, I download the changes as a patch and apply it to the latest code base and commit that referencing the PR or create a new PR entirely meant just to merge |
| 22:53.48 | allejo | and that new PR would be against the latest code base too |
| 22:55.23 | macsforme | oh, oops |
| 22:57.05 | allejo | oh, and you're right. a rebase and force push is another approach and that'll automatically update the PR |
| 22:57.39 | allejo | and since it's just a branch on a fork that isn't meant to be used, then it wouldn't affect anyone else |
| 22:58.45 | macsforme | well, I would understand keeping merges out of history if it can be done (maybe just one merge at the end that fixes all conflicts... I think Tim himself has to do that in this case, though)... but we can't help how developers break up their actual content changes into different commits |
| 23:05.33 | *** join/#bzflag Shuist (~Shuist@ppp203-122-213-220.static.internode.on.net) |
| 23:31.17 | *** join/#bzflag Zehra (~Zehra@unaffiliated/zehra) |
| 23:53.20 | *** join/#bzflag Void7 (~nullified@205.157.147.198) |