| 00:01.05 | *** join/#bzflag mebigfatguy_ (~dave@128.177.74.185) |
| 00:36.55 | *** join/#bzflag mc_spatula (~mc_spatul@unaffiliated/vito---/x-9059264) |
| 00:56.50 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 00:58.39 | swigg | JeffM: I believe torpedoes use hydrazine as fuel |
| 00:59.13 | swigg | and explosives, by nature are self oxiziding |
| 00:59.39 | swigg | hydrazine is highly toxic |
| 00:59.52 | swigg | but a very powerful fuel |
| 01:00.33 | swigg | I guess the question is whether the engines are turbine or piston, but I would guess turbine |
| 01:04.53 | swigg | It is a swashplate type engine which is much like the AC compressor in your car |
| 01:41.04 | spldart | :) wow |
| 01:41.40 | *** join/#bzflag ahs3- (~ahs3-@adsl-065-005-193-158.sip.rdu.bellsouth.net) |
| 01:43.03 | spldart | Every game needs a Fez.. Fez are cool. |
| 01:44.40 | spldart | turbine |
| 01:47.54 | spldart | lieutenant commander Montgomery Scott Would know.... ;) |
| 02:25.49 | *** join/#bzflag Foo_man_choo (~james@h138.213.130.174.dynamic.ip.windstream.net) |
| 02:31.10 | *** join/#bzflag swigg (~swigg@68-119-228-196.dhcp.ahvl.nc.charter.com) |
| 02:31.11 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 02:57.16 | *** join/#bzflag JeffM (~Jeffery@unaffiliated/jeffm2501) |
| 02:57.17 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 03:02.04 | *** join/#bzflag L4m3r (~l4m3r@bzflag/developer/L4m3r) |
| 03:02.05 | *** mode/#bzflag [+v L4m3r] by ChanServ |
| 03:10.42 | *** join/#bzflag jeffm (~jeffm@unaffiliated/jeffm2501) |
| 03:10.43 | *** mode/#bzflag [+v jeffm] by ChanServ |
| 04:22.40 | *** join/#bzflag JeffM (~JeffM@cpe-76-167-236-199.socal.res.rr.com) |
| 04:22.40 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 04:22.40 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 04:53.46 | JeffM | anyone awake for some GIT help? |
| 05:04.39 | mebigfatguy | wazzup |
| 05:07.10 | JeffM | I may have gotten it |
| 05:07.16 | JeffM | merges are wierd |
| 05:12.09 | JeffM | well merges are rebases I guess |
| 05:14.23 | khonkhortisan | rebases also move your commits last |
| 05:15.14 | mebigfatguy | clean history yes |
| 05:15.28 | mebigfatguy | remove the merge commit |
| 05:17.25 | JeffM | I just have a branch and want to apply a change that wa made in the master to the branch before I merge the branch back into the master |
| 05:18.50 | mebigfatguy | if you want the complete version of the master on the branch first, you can checkout branch, then checkout just the file on master, then commit on branch |
| 05:19.18 | mebigfatguy | pretty cool visual tutorial http://pcottle.github.io/learnGitBranching/ |
| 05:19.38 | JeffM | I typed some stuff, merged some conflicts and I think i got it |
| 05:21.26 | JeffM | I think it got complicated by the fact that it's all in a fork and there were some upstream changes that had to be put in too |
| 05:44.32 | JeffM | now to just make my branch be the master somehow |
| 05:47.28 | JeffM | so if I do a "pull request"from the master to the branch, will that take all the changes form the branch and make it master? |
| 05:48.28 | JeffM | no, I think that goes back upstream |
| 05:54.13 | khonkhortisan | you could checkout master, then merge branch |
| 05:55.24 | mebigfatguy | git checkout master; git merge branch |
| 06:02.31 | khonkhortisan | yes that |
| 06:02.57 | khonkhortisan | literally checkout then merge |
| 06:05.57 | JeffM | yeah it eventualy worked |
| 06:06.30 | JeffM | it got pissed that i had some files in there that were not in version controll, but that may be more of an issue with the github tools that are runing too |
| 06:08.28 | JeffM | still trying to understand the graph, https://github.com/JeffM2501/snis_rework/network |
| 06:13.05 | khonkhortisan | That graph likes to swap branches whenever there's a split |
| 06:47.49 | *** join/#bzflag Marzipan (~Marzipan@sign-4db6b068.pool.mediaWays.net) |
| 08:16.21 | *** join/#bzflag swigg (~swigg@68-119-228-196.dhcp.ahvl.nc.charter.com) |
| 08:16.22 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 08:19.33 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 08:28.33 | *** join/#bzflag McSpider (~McSpider@204.11.62.10) |
| 08:28.36 | *** join/#bzflag McYukon (~McYukon@204.11.62.10) |
| 08:28.49 | *** join/#bzflag khazhyk` (~khazhyk@204.11.62.10) |
| 08:28.49 | *** join/#bzflag khazhyk` (~khazhyk@bzflag/player/Me1) |
| 08:28.51 | *** join/#bzflag mrapple (~tony@204.11.62.10) |
| 10:50.27 | *** join/#bzflag Gnurdux (~gnurdux@EASTCAMPUS-THREE-FIFTEEN.MIT.EDU) |
| 12:08.50 | *** join/#bzflag joevano (~joevano@bzflag/developer/JoeVano) |
| 12:08.50 | *** mode/#bzflag [+v joevano] by ChanServ |
| 15:28.21 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 15:28.22 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 15:32.13 | *** join/#bzflag dcat (~dcat@c-98-244-106-246.hsd1.va.comcast.net) |
| 16:10.22 | *** join/#bzflag JeffM (~JeffM@107-209-61-105.lightspeed.irvnca.sbcglobal.net) |
| 16:10.23 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 16:10.23 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 16:54.48 | *** join/#bzflag L4m3r (~l4m3r@bzflag/developer/L4m3r) |
| 16:54.48 | *** mode/#bzflag [+v L4m3r] by ChanServ |
| 16:55.45 | *** join/#bzflag meeba (~lamer@c-75-71-180-64.hsd1.co.comcast.net) |
| 17:01.18 | *** join/#bzflag [dmp] (~dennis@users.d75.net) |
| 17:01.19 | *** join/#bzflag [dmp] (~dennis@unaffiliated/dmp/x-546784) |
| 17:29.03 | *** join/#bzflag swigg_ (~swigg@68-119-228-196.dhcp.ahvl.nc.charter.com) |
| 17:45.43 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 17:45.44 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 19:05.39 | *** join/#bzflag ruskie (ruskie@sourcemage/mage/ruskie) |
| 20:10.43 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 20:25.29 | *** join/#bzflag mrapple (~tony@unaffiliated/mrapple) |
| 20:36.12 | Notify | 03BZFlag:68.36.147.129 * 8652 /Flag_ideas: /* Good Flags */ |
| 20:40.11 | Notify | 03BZFlag:Allejo * 8653 /Flag_ideas: Undo revision 8652 by [[Special:Contributions/68.36.147.129|68.36.147.129]] ([[User talk:68.36.147.129|talk]]) |
| 20:43.20 | allejo | are these new additions real or is some one just adding them for the lulz? |
| 20:48.20 | Notify | 03BZFlag:Joevano * 8654 /Flag_ideas: Moved flags to the correct section because the submitter can't read instructions it seems |
| 20:50.05 | joevano | lulz i think... nothing good in them in my opinion, just need to move them to the rejected page now with reasons |
| 20:50.30 | joevano | maybe tonight when I am not working |
| 20:52.05 | JeffM | is it the same user who was posting to the talk page about them? |
| 20:53.41 | *** join/#bzflag Delusional (~delusiona@pool-108-17-117-49.pitbpa.fios.verizon.net) |
| 20:53.42 | *** join/#bzflag Delusional (~delusiona@unaffiliated/delusional) |
| 20:59.53 | allejo | JeffM, different IP according to Notify. History of the page shows a lot of recent revisions by that IP |
| 21:02.33 | JeffM | fun |
| 21:04.47 | JeffM | No Rico, Slow shot and radar are the only ones to keep in the unrated list joevano |
| 21:05.20 | JeffM | recoil has some promice |
| 21:12.35 | Notify | 03BZFlag:12.167.61.62 * 8655 /Flag_ideas: /* Unrated Flag Ideas */ Reject slew of lame flag ideas |
| 21:12.44 | Notify | 03BZFlag:12.167.61.62 * 8656 /Flag_ideas/Rejected: Reject slew of lame flag ideas |
| 21:12.52 | JeffM | bahh I forgot to login |
| 21:19.21 | blast007 | should we just lock that page and add a message that if someone has an idea they want to suggest that they should go through IRC or the forum to discuss it? |
| 21:21.09 | JeffM | I don't even know why it's there |
| 21:21.12 | JeffM | use SF |
| 22:04.10 | *** join/#bzflag Snake12534 (6317537c@gateway/web/freenode/ip.99.23.83.124) |
| 23:19.48 | *** join/#bzflag bulletmark (~bulletmar@ppp118-208-49-133.lns20.bne1.internode.on.net) |
| 23:50.56 | *** join/#bzflag bulletmark (~bulletmar@ppp118-208-49-133.lns20.bne1.internode.on.net) |