00:32.22 | *** join/#bzflag spldart (ac380f1d@bzflag/contributor/spldart) |
00:32.22 | *** mode/#bzflag [+v spldart] by ChanServ |
01:21.17 | allejo | would a poll api be useful? so plug-ins can start their own polls and not require any custom logic |
01:21.43 | allejo | as an example, a map change plug-in would create a poll on whether or not to switch to a map |
01:22.33 | Patlabor221 | polls are lame, but if they are going to stay then yes they should have an API |
01:23.51 | allejo | feasible for a 2.4.x feature? |
01:25.53 | Patlabor221 | sure |
01:25.58 | Patlabor221 | it doesn't break anything |
01:27.38 | allejo | woo |
02:05.33 | *** mode/#bzflag [-v Foo_man_choo] by ChanServ |
02:21.26 | *** join/#bzflag Kutakizukari (~Kutakizuk@169.sub-70-210-6.myvzw.com) |
02:47.35 | *** join/#bzflag Patlabor221 (uid48618@gateway/web/irccloud.com/x-flhlvrkjxtdilzcm) |
03:33.18 | *** join/#bzflag Patlabor (~JeffM@2605:e000:7d02:c700:f5d5:434:8ecb:5f99) |
03:37.30 | *** join/#bzflag Patlabor (~JeffM@2605:e000:7d02:c700:f5d5:434:8ecb:5f99) |
03:42.55 | *** join/#bzflag Patlabor (~JeffM@unaffiliated/jeffm2501) |
03:42.55 | *** mode/#bzflag [+v Patlabor] by ChanServ |
04:08.38 | *** join/#bzflag EvilJStoker_ (jstoker@unaffiliated/jstoker) |
04:10.36 | *** join/#bzflag therealtbe (~AresHandl@pool-74-109-244-171.pitbpa.fios.verizon.net) |
04:28.30 | *** join/#bzflag Kutakizukari_ (~Kutakizuk@25.sub-70-210-6.myvzw.com) |
04:29.36 | *** join/#bzflag 7GHAARBRB (~Kutakizuk@25.sub-70-210-6.myvzw.com) |
04:29.48 | *** join/#bzflag Kutakizukari__ (~Kutakizuk@93.sub-70-210-6.myvzw.com) |
04:37.17 | *** join/#bzflag Kutakizukari (~Kutakizuk@93.sub-70-210-6.myvzw.com) |
04:40.07 | *** join/#bzflag Kutakizukari_ (~Kutakizuk@93.sub-70-210-6.myvzw.com) |
05:53.52 | *** join/#bzflag Kutakizukari (~Kutakizuk@93.sub-70-210-6.myvzw.com) |
06:35.03 | *** join/#bzflag Kutakizukari_ (~Kutakizuk@93.sub-70-210-6.myvzw.com) |
07:24.52 | Not-311d | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+0/-0/±2] 13http://git.io/rbT5rg |
07:24.53 | Not-311d | [02bzflag-import-3] 07allejo 0349d9ccd - Simplified some return statements and cleared up some comments |
09:25.52 | *** join/#bzflag khonkhortisan (~Khonkhort@c-24-18-42-215.hsd1.wa.comcast.net) |
15:37.16 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
16:44.16 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:8967:79d4:a9cb:6b1c) |
17:50.38 | *** join/#bzflag zlsa (~zlsa@unaffiliated/zlsa) |
18:36.48 | Patlabor221 | so I have additonal git questions. If I Have commits on local machine A, and want to get those commits into local machine B but I don't want to push to github first, I should be able to have B pull from A direclty right? |
18:40.53 | BulletCatcher | Yes, as long as you have a file sharing mechanism. |
18:41.09 | Patlabor221 | thankfully windows comes with one of those :) |
18:41.24 | Patlabor221 | I'm looking for laptop to desktop sync |
18:41.35 | Patlabor221 | thanks |
18:48.24 | BulletCatcher | If one of those computers is where you do most of the work, then it would may be convenient to have the other be a clone of the first. |
18:48.25 | BulletCatcher | That way, only the primary computer would push directly to GitHub and you could more easily combine the two computers' work before publishing. |
18:48.54 | Patlabor221 | that is a possiblity |
18:49.00 | Patlabor221 | have to see how this desktop works out |
18:49.10 | Patlabor221 | it's been a while since it was turned on |
18:49.13 | Patlabor221 | it's still doing updates :) |
18:49.55 | Patlabor221 | and every reboot it picks a random number of monitors to display on |
18:51.58 | BulletCatcher | If the laptop is more reliable then it would make sense for it to be the primary in the configuration I described above. |
18:52.09 | Patlabor221 | possibly |
18:52.52 | Patlabor221 | so desktop is a clone of laptop, if desktop has changes, push to laptop, and all pushes to github go up via laptop? |
18:53.05 | BulletCatcher | You've got it. |
18:53.13 | Patlabor221 | who'da thunk it |
18:53.52 | Patlabor221 | network debuging is much easier with 2 seperate computers :) |
18:54.18 | BulletCatcher | That would give you the opportunity to rebase away unnecessary merges resulting from parallel commits. |
18:57.14 | Patlabor221 | soooo many updates..... |
18:57.39 | Patlabor221 | this is what I get for using laptop for schoolwork :) |
18:59.48 | BulletCatcher | You just need a personal sysadmin to manage all of your computers for you. :-) |
19:00.20 | Patlabor221 | no,I'm done with school now, so I have time to use the desktop |
19:09.19 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
19:10.02 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:8967:79d4:a9cb:6b1c) |
19:10.03 | *** join/#bzflag Patlabor221 (~JeffM@unaffiliated/jeffm2501) |
19:10.03 | *** mode/#bzflag [+v Patlabor221] by ChanServ |
19:19.14 | Patlabor221 | finaly, 3 monitors, no updates, AND a mouse that works... |
21:30.49 | Patlabor221 | ` |
21:32.10 | allejo | ` |
21:32.27 | zlsa | ` |
21:33.26 | Patlabor221 | cat |
21:34.04 | allejo | dog |
21:34.08 | zlsa | cow |
21:34.19 | Patlabor221 | you have some odd pets |
21:34.32 | zlsa | well it lets me moove quickly |
21:34.39 | allejo | lol |
22:04.18 | Patlabor221 | ahha it seems I can't have the desktop and the laptop use the same branch |
22:04.45 | Patlabor221 | I had the dekstop make it's own branch from the laptops master, then I can push to that branch and merge into the real master on the laptop |