| 00:09.49 | Not-311d | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+1/-0/±1] 13http://git.io/1ykckw |
| 00:09.50 | Not-311d | [02bzflag-import-3] 07allejo 03e39868b - Fixed math for locating points inside of rotated rectangles and added sample map |
| 00:09.54 | allejo | no... |
| 00:10.05 | allejo | wrong repo -_- |
| 00:12.15 | Patlabor221 | that is what had me pondering if we could go pull request only |
| 00:12.26 | Patlabor221 | but I don't want to do a single mainainer thing |
| 00:13.31 | Not-311d | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+0/-1/±1] 13http://git.io/94LFtA |
| 00:13.32 | Not-311d | [02bzflag-import-3] 07allejo 03eb4dd68 - Revert "Fixed math for locating points inside of rotated rectangles and added sample map" This reverts commit e39868b01c7fa68e7407268b8519448575d1c3a1. |
| 00:13.36 | allejo | sorry about that |
| 00:13.59 | allejo | but a pull request only wouldn't really work out well, imo |
| 00:14.26 | Patlabor221 | it'd make it more work for the individual developer |
| 00:14.33 | allejo | yeup |
| 00:14.37 | Patlabor221 | and it would suck if they wern't accepted |
| 00:14.56 | Patlabor221 | hence the ponering |
| 00:15.01 | Patlabor221 | pondering |
| 00:15.27 | Patlabor221 | I think we'll all just have to get into some different habbits |
| 00:15.49 | Patlabor221 | I keep one folder I call "offical" that has the Bzflag-dev stuf in it, and another for my JeffM stuff |
| 00:16.05 | Patlabor221 | that's worked out a lot better for me |
| 00:19.25 | allejo | has 4 |
| 00:19.34 | allejo | i just typed it in the wrong terminal window... |
| 00:35.33 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 00:55.42 | allejo | when someone has a chance, https://github.com/BZFlag-Dev/bzflag-import-3/pull/14 |
| 01:01.49 | Patlabor221 | the description says custom map objects, but the code seems to only modify flag stay zones |
| 01:02.30 | allejo | using flag stay plugin as an example |
| 01:02.30 | Patlabor221 | ahh it's a mod to the flag stay zone, with a bad pull name :) |
| 01:02.37 | allejo | ye |
| 01:03.06 | Patlabor221 | I was thinking you were extendig the custom object system |
| 01:03.22 | Patlabor221 | if it's just that plug-in go for it |
| 01:03.26 | Patlabor221 | assuming you've tested it |
| 01:05.37 | allejo | updated the pull request name |
| 01:06.07 | Patlabor221 | I say merge it |
| 01:06.14 | allejo | and i have tested it. does it build on windows? i doubt i did anything platform dependent |
| 01:06.15 | allejo | k |
| 01:07.30 | Patlabor221 | I don't see anything that would prevent it from building |
| 01:10.36 | Not-311d | [02bzflag-import-3] 07allejo pushed 034 commits to 03v2_4_x [+2/-0/±5] 13http://git.io/GJgb5A |
| 01:10.37 | Not-311d | [02bzflag-import-3] 07allejo 03a206a75 - Attempted to add support for 'position' 'size' and 'rotation' options for the flagstayzone |
| 01:10.38 | Not-311d | [02bzflag-import-3] 07allejo 037924569 - Fixed math for locating points inside of rotated rectangles and added sample map |
| 01:10.39 | Not-311d | [02bzflag-import-3] 07allejo 0306795ff - Added notes and added test of cylinder zone to sample map |
| 01:10.40 | Not-311d | [02bzflag-import-3] ... and 1 more commits. |
| 01:12.17 | Flash | allejo: if you are cleaning up boolean return statements (not a bad thing) the next level of code quality improvement is to eliminate unneeded named temporary variables |
| 01:13.04 | Flash | for example, bzfs/Permissions.cxx lines 313-314 becomes: |
| 01:13.25 | Patlabor221 | I'd say the next level would be to split up large functions, the temps get optimized out ;) |
| 01:13.25 | Flash | return userDatabase.find(str) != userDatabase.end() |
| 01:13.45 | Flash | it's not about optimization, it's about code complexity |
| 01:13.58 | Patlabor221 | sometimes it's about readability |
| 01:14.09 | Flash | true, that's also a factor in complexity |
| 01:14.11 | Patlabor221 | complex one lineers suck |
| 01:14.20 | Patlabor221 | because someone didsn't want to use a variable |
| 01:14.52 | Flash | I don't think we are talking about complex one-liners |
| 01:15.17 | Patlabor221 | k |
| 01:15.34 | Patlabor221 | double float casts should be fixed too |
| 01:15.38 | Flash | assigning the results of the find() to a named temporary (itr) is no more readable than a direct comparison |
| 01:15.39 | Patlabor221 | reduces warnings |
| 01:15.49 | Flash | warnings == bad |
| 01:16.01 | Patlabor221 | yeah |
| 01:16.15 | Patlabor221 | ares is a mess of warnings on windows |
| 01:47.18 | allejo | only reason I was optimizing some return statements was because they were like "if (itr->second == "*" || itr->second == "") return false; else return true;" |
| 01:47.27 | allejo | makes more sense to just return the condition :p |
| 01:52.23 | Patlabor221 | yeah some people do some odd things |
| 02:01.04 | allejo | feels inclined to make a reference to "People are Strange" |
| 02:04.25 | Flash | allejo: I understand. I just suggested that you could go the next step and eliminate the unneeded named temporary |
| 02:04.45 | allejo | will do :D |
| 02:04.47 | Flash | multiple returns are bad |
| 02:05.11 | Flash | variables with larger scope than they need are bad |
| 02:07.32 | allejo | http://www.crosswayspreschool.com/wp-content/uploads/2012/12/iStock_000001843223Large.jpg |
| 02:08.44 | Flash | constructors should use the member initializer list and not init variables in the function body |
| 02:08.57 | BulletCatcher | One thing I can do in the svn->git conversion process is make unwanted commits disappear. Just ask. |
| 02:09.14 | Flash | we aren't done converting? |
| 02:09.44 | allejo | e39868b01c7fa68e7407268b8519448575d1c3a1 and eb4dd682da31bd7351087e0b80e8e0b11a9eaef7 are pointless after i merged my pull request :x |
| 02:10.01 | BulletCatcher | I am almost done, but have a few loose ends to tidy up. |
| 02:10.08 | Patlabor221 | Flash, no, "import 4" is not a final name :) |
| 02:10.35 | Flash | we've been working on import 3 for a while now |
| 02:10.37 | allejo | import 4 sounds like a cool name though! |
| 02:10.43 | Patlabor221 | yeah that's what you should be doing |
| 02:10.54 | Patlabor221 | everything in import 3 will be in he final import |
| 02:11.00 | Patlabor221 | import 4 was a test |
| 02:11.49 | BulletCatcher | There will be an import-5 that has changes from the import-4 feedback. |
| 02:11.50 | BulletCatcher | I think I'll be able to produce the final repo after that. |
| 02:12.41 | Patlabor221 | cool |
| 02:13.06 | allejo | cheers |
| 02:13.26 | BulletCatcher | One thing I still need to do is the validation, which compares the trees checked out from Git with the corresponding Subversion trees. |
| 02:15.38 | Patlabor221 | heh, bzflag is "verified virus free" on sourceforge |
| 02:16.14 | allejo | lol |
| 02:17.05 | BulletCatcher | It's good to know that the Windows executables, in particular, are clean. |
| 02:17.40 | Patlabor221 | ether that or I am super good at packing trogans in there |
| 02:17.51 | khonkhortisan | you can't say the same about bitcoin (dead virus traces were inserted to cause trouble) |
| 02:19.00 | Patlabor221 | It would be pretty easy to pack one in |
| 02:19.17 | Patlabor221 | swizzle one of the data files then extract at runtime |
| 02:40.10 | BulletCatcher | Okay, the "Fixed math..." commit will appear only once in future repos, allejo. |
| 02:42.21 | Patlabor221 | hmmm so you could remove the put he candle back commit :) |
| 02:48.52 | BulletCatcher | I could, but one of my goals is to import the old Subversion commits as faithfully as possible so there will be no incentive to consult the old Subversion repo for the "real" history. |
| 02:49.32 | Patlabor221 | yeah I it was just a joke |
| 02:49.44 | Patlabor221 | it's so far down the history chain nobody will ever see it |
| 02:50.34 | BulletCatcher | I know that commit without having to look. :-) |
| 03:27.01 | *** join/#bzflag Kutakizukari (~Kutakizuk@196.sub-70-210-5.myvzw.com) |
| 03:41.41 | *** join/#bzflag zlsa (~zlsa@c-98-224-90-205.hsd1.ca.comcast.net) |
| 03:41.41 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 03:57.10 | Patlabor221 | can anyone with access to the fourms get me the rank images? |
| 03:57.35 | Patlabor221 | I can't find the PSDs anymore :( |
| 04:04.07 | McSpider | Patlabor221: this? http://sourceforge.net/p/bzflag/code/HEAD/tree/trunk/web/art/bb/rankbase.psd |
| 04:04.23 | Patlabor221 | I checked it in? |
| 04:04.26 | Patlabor221 | wow |
| 04:04.36 | Patlabor221 | how forward thinking of me :) |
| 04:04.42 | McSpider | :D |
| 04:04.56 | Patlabor221 | thanks |
| 04:05.16 | McSpider | np |
| 04:12.41 | Patlabor221 | meh they are too smoonth, pribably shoul redraw them |
| 04:14.14 | *** join/#bzflag delusional (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 04:17.21 | *** join/#bzflag jomojo (~jaredneal@108.61.101.159) |
| 04:29.19 | *** join/#bzflag delusional (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 04:34.41 | BulletCatcher | If you want to make new commits to the web tree I can put the current bzflag-web repo on GitHub. |
| 04:35.07 | Patlabor221 | oh no, I need them for something else |
| 04:35.12 | BulletCatcher | k |
| 04:35.31 | Patlabor221 | thanks tho |
| 04:36.02 | *** join/#bzflag Kutakizukari (~Kutakizuk@196.sub-70-210-5.myvzw.com) |
| 04:37.50 | blast007 | I wouldn't bother with the web stuff |
| 04:38.15 | BulletCatcher | I'm putting it into git for completeness. |
| 04:38.17 | blast007 | they can stay in SVN until they are rewritten, and then they'll probably go into Mercurial repos |
| 04:38.39 | blast007 | main site is already in mercurial |
| 04:38.52 | blast007 | (and hosted at Bitbucket) |
| 04:39.20 | BulletCatcher | What's the Bitbucket URL? I was just looking and didn't find it. |
| 04:39.43 | blast007 | https://bitbucket.org/blast007/bzflag_main_website |
| 04:41.50 | BulletCatcher | Once I have the svn->git conversion done it should be much easier to do a git->hg conversion to make a repo for you that has full history. |
| 04:43.43 | Patlabor221 | the website is a seperate product now isn't it? I don't think it has any logical history links to the old website |
| 04:44.30 | blast007 | what history would I need from the old stuff? |
| 04:45.06 | Patlabor221 | all the stuff to make IE3 work! |
| 04:45.14 | BulletCatcher | It's not so much a need as having it all in one place. |
| 04:45.38 | Patlabor221 | I'd put the old web stuff in github as an archive only |
| 04:47.34 | blast007 | pretty much everything in trunk/web/ is either not used or needs to be replaced |
| 04:48.53 | Patlabor221 | hence archive only :) |
| 04:51.40 | *** join/#bzflag Kutakizukari (~Kutakizuk@196.sub-70-210-5.myvzw.com) |
| 04:55.30 | *** part/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 04:55.41 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 04:55.55 | BulletCatcher | If bzflag_main_website is not in any way descended from trunk/web then there would be no reason to merge the two repos. |
| 05:32.58 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 05:43.05 | *** join/#bzflag delusional (~delusiona@unaffiliated/delusional) |
| 06:12.37 | Constitution | yay, working repos :) |
| 06:54.03 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 10:14.32 | *** join/#bzflag TASAIRES (~TASAIRES@84.76.154.24) |
| 11:13.26 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 11:13.46 | *** join/#bzflag death__ (~I_Died_On@69.136.32.149) |
| 11:43.21 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 12:08.13 | *** join/#bzflag I_Died_Once (~I_Died_On@69.136.32.149) |
| 12:08.13 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 13:30.57 | blast007 | BulletCatcher: yeah, it's unrelated to anything in SVN |
| 14:54.14 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
| 15:46.42 | *** join/#bzflag Kutakizukari (~Kutakizuk@2600:1004:b114:d85b:f0eb:dc34:80fa:58f7) |
| 15:54.24 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 15:57.10 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 15:59.16 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 16:04.31 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 16:20.51 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 18:45.58 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:45a5:1911:6225:dee2) |
| 18:45.59 | *** join/#bzflag Patlabor221 (~JeffM@unaffiliated/jeffm2501) |
| 18:45.59 | *** mode/#bzflag [+v Patlabor221] by ChanServ |
| 18:55.20 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 19:15.25 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 19:28.00 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 19:35.01 | *** join/#bzflag JeffM (~Jeffery@2605:e000:7d02:c700:d7e:9d4c:fc12:18ff) |
| 19:35.16 | *** join/#bzflag Patlabor221 (~Jeffery@2605:e000:7d02:c700:d7e:9d4c:fc12:18ff) |
| 19:35.52 | *** join/#bzflag Patlabor221 (~Jeffery@unaffiliated/jeffm2501) |
| 19:35.52 | *** mode/#bzflag [+v Patlabor221] by ChanServ |
| 20:09.10 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 20:34.37 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 20:52.21 | *** join/#bzflag jpt9 (~jpt9@unaffiliated/jpt9) |
| 20:52.53 | jpt9 | Afternoon. |
| 20:53.22 | blast007 | hello |
| 20:54.24 | *** part/#bzflag jpt9 (~jpt9@unaffiliated/jpt9) |
| 20:54.31 | blast007 | goodbye |
| 20:56.30 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 21:26.15 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 21:56.48 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 22:06.58 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 22:17.19 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 22:19.40 | *** join/#bzflag Daddo (~David_Law@pool-173-62-219-238.phlapa.fios.verizon.net) |
| 22:24.09 | *** part/#bzflag Daddo (~David_Law@pool-173-62-219-238.phlapa.fios.verizon.net) |
| 22:24.37 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 22:27.21 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
| 22:50.35 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:d7e:9d4c:fc12:18ff) |
| 22:50.35 | *** join/#bzflag Patlabor221 (~JeffM@unaffiliated/jeffm2501) |
| 22:50.35 | *** mode/#bzflag [+v Patlabor221] by ChanServ |
| 22:55.46 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
| 22:58.25 | *** join/#bzflag rob1n (~rob1n@unaffiliated/rob1n) |
| 23:58.29 | *** join/#bzflag Kutakizukari (~Kutakizuk@20.sub-70-210-7.myvzw.com) |
