00:38:13 | | BFLogBot Commit: 6204d2e130 | Author: buckyballreaction | Message: Use native OSX icns pack instead of setting the icon via SDL |
00:39:36 | | Invisible Quit (Quit: Invisible) |
00:50:45 | | BFLogBot Commit: 742c121854 | Author: buckyballreaction | Message: Pull out build version from version.h for use in CMake |
00:50:47 | | BFLogBot Commit: 1884a59ebc | Author: buckyballreaction | Message: Fix OSX plist creation |
00:51:07 | raptor | getting better! |
00:51:10 | raptor | ok good night |
00:51:40 | | raptor Quit () |
01:30:15 | fordcars | Night! |
01:30:21 | | fordcars Quit (Quit: Page closed) |
04:34:33 | | raptor has joined |
04:34:43 | | ChanServ sets mode +o |
05:08:17 | | raptor Quit () |
05:18:53 | | LordDVG has joined |
07:28:33 | | Canseco has joined |
08:53:57 | | Darrel Quit (Ping timeout: 240 seconds) |
09:28:02 | | Darrel has joined |
10:10:27 | | Canseco Quit (Quit: No Ping reply in 180 seconds.) |
10:14:50 | | LordDVG Quit (Remote host closed the connection) |
10:18:20 | | Canseco has joined |
10:22:10 | | Canseco Quit (Remote host closed the connection) |
10:44:14 | | LordDVG has joined |
12:31:55 | | LordDVG Quit (Remote host closed the connection) |
15:36:52 | | sam686 Quit (Ping timeout: 256 seconds) |
17:15:11 | | raptor has joined |
17:15:11 | | ChanServ sets mode +o |
17:15:18 | raptor | good day! |
17:23:38 | raptor | funny thing - i was at the university today and an old friend of mine that happens to work there came up to me and offered a part-time job on his team as I go to school |
17:23:58 | raptor | so i won't have to deplete savings so fast |
18:31:38 | watusimoto1 | hi |
18:31:47 | watusimoto1 | excellent! |
18:31:52 | | watusimoto1 is now known as watusimoto |
18:32:08 | watusimoto | I found a great way to make progress on my merge |
18:32:40 | watusimoto | I open up your copy of the file I am merging, and look at annotations, which show me when the last time something changed |
18:32:54 | watusimoto | if the last change happend < 10000, I will use my change |
18:33:14 | watusimoto | and 9999 has fewer digits than 10000, so it is very quick to scan through a file |
18:33:31 | watusimoto | I wish I had thought of that earlier when I made some dubious decisions |
18:33:47 | watusimoto | but I'm more than half-way done with the merge, I think |
18:38:16 | raptor | hi |
18:38:28 | raptor | oh good |
18:38:50 | raptor | i'm trying to think if that is a guaranteed method... |
18:47:55 | raptor | it probably is since those revision numbers are for your clone only so any other revisions you've pulled would be incremented later |
19:27:46 | watusimoto | 10000 was before the great rift, so I think it is save |
19:27:47 | watusimoto | safe |
19:42:48 | | raptor Quit () |
19:43:19 | | amgine123 has joined |
19:43:29 | amgine123 | hello |
19:43:33 | amgine123 | !bugs |
19:43:33 | BFLogBot | To enter a bug: http://tinyurl.com/bfnewbug -- To view all bugs: http://tinyurl.com/bfbugs |
20:56:35 | | watusimoto Quit (Read error: Connection reset by peer) |
21:36:19 | | sam686 has joined |
21:36:19 | | ChanServ sets mode +v |
21:38:35 | amgine123 | hello sam are you afk ? |
21:48:02 | sam686 | kindof |
21:51:13 | amgine123 | any word on that darned asteroid bug ? |
21:52:54 | amgine123 | !bugs |
21:52:54 | BFLogBot | To enter a bug: http://tinyurl.com/bfnewbug -- To view all bugs: http://tinyurl.com/bfbugs |
21:53:18 | amgine123 | see issue https://code.google.com/p/bitfighter/issues/detail?id=483&start=100 |
23:17:07 | | BFLogBot Commit: 550d5f0438 | Author: buckyballreaction | Message: Use different Sparkle update URLs for different OSX architectures |
23:30:04 | | amgine123 Quit (Ping timeout: 246 seconds) |
23:38:59 | | raptor has joined |
23:38:59 | | ChanServ sets mode +o |