Timestamps are in GMT/BST.
| 00:24:06 | | Platskies has joined |
| 00:55:54 | | amgine123 Quit (Quit: Page closed) |
| 02:11:23 | | Platskies__ has joined |
| 02:13:42 | | Platskies Quit (Ping timeout: 250 seconds) |
| 02:20:41 | | phil__ has joined |
| 02:20:41 | | Platskies__ Quit (Read error: Connection reset by peer) |
| 03:11:08 | | phil__ Quit (Read error: Connection reset by peer) |
| 03:28:10 | | Darrel Quit (Ping timeout: 255 seconds) |
| 03:28:56 | | Darrel has joined |
| 06:17:46 | | Platskies has joined |
| 06:20:06 | | Platskies Quit (Client Quit) |
| 06:42:36 | | Platskies has joined |
| 08:09:52 | | Platskies Quit (Read error: Connection reset by peer) |
| 12:38:14 | | LordDVG has joined |
| 12:39:30 | | fordcars has joined |
| 13:36:16 | | fordcars Quit (Ping timeout: 246 seconds) |
| 14:09:23 | | Invisible has joined |
| 14:27:25 | | Invisible Quit (Ping timeout: 255 seconds) |
| 15:17:55 | | fordcars has joined |
| 15:28:04 | | -card.freenode.net- *** Looking up your hostname... |
| 15:28:05 | | -card.freenode.net- *** Checking Ident |
| 15:28:05 | | -card.freenode.net- *** Couldn't look up your hostname |
| 15:28:05 | | -card.freenode.net- *** No Ident response |
| 15:28:10 | | BFLogBot has joined |
| 15:28:10 | | -ChanServ- [#bitfighter] Welcome to #bitfighter. This is an IRC channel, many or all of the users may not be paying attention. Please have patience when waiting for a response. |
| 17:55:33 | | Invisible has joined |
| 17:58:27 | | Raven67854 Quit (Remote host closed the connection) |
| 17:59:48 | | LordDVG Quit (Remote host closed the connection) |
| 18:02:21 | | Raven67854 has joined |
| 18:33:34 | | Invisible Quit (Ping timeout: 255 seconds) |
| 19:46:15 | | Platskies has joined |
| 19:50:58 | | Platskies Quit (Ping timeout: 258 seconds) |
| 19:59:08 | | Platskies has joined |
| 20:21:22 | | Platskies Quit (Quit: Platskies) |
| 21:14:21 | | Invisible has joined |
| 21:36:35 | | Watusimoto has joined |
| 22:08:38 | | raptor has joined |
| 22:08:38 | | ChanServ sets mode +o |
| 22:08:44 | raptor | good evening! |
| 22:14:42 | raptor | sleepy... and good night! |
| 22:14:46 | | raptor Quit () |
| 22:26:13 | | Invisible Quit (Ping timeout: 255 seconds) |
| 22:28:46 | | Platskies has joined |
| 22:37:05 | | BFLogBot Commit: 3e00e16862 | Author: watusimoto | Message: Fix crash when placing turrets, refactor WallSegmentManager into oblivion... segments now managed internally by walls/polywalls |
| 22:37:07 | | BFLogBot Commit: 126f18fe4c | Author: watusimoto | Message: Fix crash when duplicating a BarrierX object |
| 22:37:08 | | BFLogBot Commit: 1af1f990d8 | Author: watusimoto | Message: Fix display of forcefields in editor |
| 22:37:10 | | BFLogBot Commit: f6aff7e852 | Author: watusimoto | Message: Merge!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 22:37:11 | | BFLogBot Commit: 3fd18de048 | Author: watusimoto | Message: Merge |
| 22:37:13 | | BFLogBot Commit: 1d1a2d7586 | Author: watusimoto | Message: Fix outstainding compilation errors... |
| 22:37:14 | | BFLogBot Commit: 08d815e571 | Author: watusimoto | Message: Merge |
| 22:42:03 | Watusimoto | This latest merge brings me back into the fold... finally. The merge was ugly, and I probably broke some stuff. Most of the tests are still broken; I'll work on fixing those next, along with any reported problems in my latest code |
| 22:44:07 | | raptor has joined |
| 22:44:07 | | ChanServ sets mode +o |
| 22:44:25 | raptor | hi Watusimoto |
| 22:44:29 | raptor | i just saw your merge... |
| 22:44:40 | Watusimoto | hi |
| 22:44:45 | Watusimoto | thought you were asleep! |
| 22:45:10 | Watusimoto | I was offline all weekend (by hapenstance, not design) so I didn't get this done sooner |
| 22:45:15 | raptor | i attempted to sleep, but the wife was still doing NaNoWriMo |
| 22:45:18 | Watusimoto | but it's done! |
| 22:45:28 | Watusimoto | even did a full recompile after the merge to make sure |
| 22:45:47 | raptor | ok... |
| 22:45:52 | raptor | ready for the bad news? |
| 22:46:05 | Watusimoto | ok |
| 22:46:06 | Watusimoto | sure |
| 22:46:15 | raptor | you redid 100% of my earlier merge work |
| 22:46:24 | raptor | and didn't merge with the right head |
| 22:46:27 | Watusimoto | what?!? |
| 22:46:35 | Watusimoto | how did that happen? |
| 22:46:39 | raptor | which probably would have saved you a lot of time |
| 22:46:46 | Watusimoto | no doubt |
| 22:47:09 | raptor | oh man, that would have been a nightmare |
| 22:47:19 | raptor | much worse than i thought, for you |
| 22:47:27 | raptor | i'm sorry |
| 22:47:39 | Watusimoto | no worries |
| 22:47:41 | Watusimoto | it's done |
| 22:47:50 | Watusimoto | so I should have merged with the 019d head?? |
| 22:47:54 | raptor | no |
| 22:48:01 | Watusimoto | is there yet another head? |
| 22:48:02 | raptor | well, actually |
| 22:48:35 | raptor | there would have been 3 heads on your clone: 019d, 020, 020+watusimoto's changes |
| 22:49:19 | raptor | the previous 020 head (bookmarked as 'main') I think, already did all the merge work up to about 3 weeks ago, minus your changes |
| 22:49:33 | Watusimoto | hmmm... perhaps they're not labeled as such in tortoise? |
| 22:49:47 | raptor | i could be that the bookmarks didn't get transferred |
| 22:50:02 | raptor | this was the revision i was hoping you'd merge with: e7dc414eb799 |
| 22:50:06 | Watusimoto | http://i.imgur.com/74plE3p.png |
| 22:50:17 | Watusimoto | well, in any event, what's done is done |
| 22:50:23 | raptor | ah.. it's that lower 'default' one |
| 22:50:29 | Watusimoto | I actually am being called to dinner |
| 22:50:33 | raptor | ok |
| 22:50:37 | raptor | my turn! :) |
| 22:50:39 | Watusimoto | so we can chat more tomorrow |
| 22:50:56 | Watusimoto | are we ok in the place we're in? |
| 22:50:59 | raptor | sure |
| 22:51:16 | Watusimoto | so other than what I screwed up in the merge, things are good |
| 22:51:19 | Watusimoto | right? |
| 22:51:32 | raptor | i haven't done a compile yet, but i think it'll be fine |
| 22:51:37 | Watusimoto | ok, great |
| 22:51:44 | Watusimoto | it was a big job :-) |
| 22:51:44 | raptor | the final merge will probably be cake compared to the last two |
| 22:51:49 | Watusimoto | talk to you tomorrow! |
| 22:51:52 | raptor | then i'll just keep working off of 019d... |
| 22:51:54 | raptor | ok |
| 22:51:55 | raptor | night! |
| 22:51:56 | Watusimoto | ok |
| 22:56:19 | | Watusimoto Quit (Ping timeout: 252 seconds) |
| 23:12:23 | | raptor Quit () |
| 23:23:38 | | Watusimoto has joined |
