Timestamps are in GMT/BST.
| 00:04:42 | | Darrel Quit (Read error: Connection reset by peer) |
| 00:04:49 | | Darrel has joined |
| 00:50:33 | | raptor Quit () |
| 01:02:10 | | Watusimoto has joined |
| 01:29:37 | | Nothing_Much Quit (Ping timeout: 265 seconds) |
| 01:46:03 | | BFLogBot_ Commit: 43bd38a441 | Author: watusimoto | Message: Updated boop |
| 01:46:04 | | BFLogBot_ Commit: 49471fec3f | Author: watusimoto | Message: Use Ctrl+Shift-3 (or ctrl-#, as you wish), to toggle display of all user-assigned ids in the editor |
| 01:46:06 | | BFLogBot_ Commit: f414abf2af | Author: watusimoto | Message: Add missing controls to editor help |
| 01:46:07 | | BFLogBot_ Commit: cf23f83974 | Author: watusimoto | Message: Add to keycodes to support display of # and ! as keys in editor help |
| 02:05:42 | | Nothing_Much has joined |
| 02:11:40 | | Nothing_Much Quit (Ping timeout: 265 seconds) |
| 03:16:54 | | Nothing_Much has joined |
| 03:53:43 | | Nothing_Much Quit (Ping timeout: 256 seconds) |
| 06:00:19 | | LordDVG has joined |
| 06:55:47 | | LordDVG Quit (Remote host closed the connection) |
| 08:09:35 | | Darrel Quit (Read error: Connection reset by peer) |
| 10:09:10 | | Darrel has joined |
| 10:34:10 | | koda has joined |
| 11:26:49 | | Watusimoto Quit (Ping timeout: 264 seconds) |
| 12:05:21 | | raptor has joined |
| 12:05:21 | | ChanServ sets mode +o |
| 12:08:28 | raptor | good morning! |
| 12:13:15 | raptor | watusimoto1: I think you're somehow force-pushing commits again... a new head was created (unless that was intentional?) |
| 13:20:19 | | watusimoto1 is now known as watusimoto |
| 13:20:19 | watusimoto | hi |
| 13:20:19 | watusimoto | no |
| 13:20:19 | watusimoto | I did force it |
| 13:20:19 | watusimoto | but didn't realize I created a new head |
| 13:20:20 | watusimoto | dang! |
| 13:20:20 | watusimoto | I thought the forcing thing was required because of our multiple heads |
| 13:20:20 | watusimoto | I probably misintrepreted the error message I got when I pushed without force |
| 13:20:20 | raptor | we do not have multiple heads |
| 13:20:20 | raptor | my workflow has been this: |
| 13:20:20 | raptor | 1. switch to the latest 019 bugfix revision |
| 13:20:20 | watusimoto | don't we? a 19x and a 020 head? |
| 13:20:20 | raptor | nope |
| 13:20:21 | raptor | 2. add commits to that revision (creating another head locally) |
| 13:20:21 | raptor | 3. switch to latest 020 revision |
| 13:20:21 | raptor | 4. merge in 019 changes, thereby having only one head again |
| 13:20:21 | raptor | 5. hg push |
| 13:20:21 | raptor | sam686 has been doing the exact same thing |
| 13:20:38 | raptor | we've been doing this so you can continue working on 020, never having to worry about 019 and always just merging with the one upstream head |
| 13:20:54 | raptor | hopefully making it easier for everyone involved... hopefully :) |
| 13:21:38 | watusimoto | everyone except you |
| 13:21:49 | raptor | yes |
| 13:21:52 | watusimoto | ok, I will renew my vow never to force |
| 13:22:00 | watusimoto | I'm sorry I lapsed |
| 13:22:11 | raptor | i was willing to take on the complexity for other's (hopefully,) simplicity |
| 13:22:15 | raptor | heh |
| 13:22:26 | raptor | no problem... you can merge with what's there anytime you want |
| 13:22:34 | watusimoto | but I need to figure out why hg wouldn't let me check in on the 020... tendril? |
| 13:22:53 | raptor | no... you just needed to do a pull and merge with what was there |
| 13:23:01 | watusimoto | yes, that's what I tried |
| 13:23:05 | raptor | oh? |
| 13:23:06 | | LordDVG has joined |
| 13:23:08 | raptor | what was the issue, then? |
| 13:23:13 | watusimoto | well, that's what I *think* I tried |
| 13:23:34 | watusimoto | but I am clear now that I can work on any of the streams of development without using force |
| 13:23:41 | raptor | yes |
| 13:23:45 | watusimoto | so if I think I need to use force, my error is elsewhere |
| 13:23:54 | raptor | I want it to be easy for you... leave the housekeeping to crazy people like me |
| 13:24:04 | watusimoto | (Don't) Use The Force, Luke. |
| 13:24:10 | raptor | hah! |
| 13:24:54 | watusimoto | so a question: I added a minor feature last night to show all ids of objects in the editor; worth backporting to 019? |
| 13:25:16 | watusimoto | If we do another 019 release, it could be a new feature, which we're usually lacking |
| 13:25:38 | watusimoto | but it would be (a small amount of) work, and is not terribly compelling |
| 13:25:41 | raptor | I can do the backport |
| 13:25:53 | raptor | if it works well enough - it's the IDs thingy? |
| 13:26:00 | raptor | if it touches too much code, then I won't |
| 13:26:06 | watusimoto | press ctrl#, and all objects show their ids |
| 13:26:13 | watusimoto | press ctrl# again, and they go away |
| 13:27:01 | watusimoto | it's mostly editor code (minor), and new renderUtils function (trivial), and, if you want to show things in the help, a help change and some supporting keycode changes |
| 13:27:16 | raptor | ok |
| 13:27:21 | watusimoto | pretty simple all around, probably touches 5 files |
| 13:27:36 | raptor | i've been keeping an eye on your commits to see if there is stuff worth backporting... |
| 13:27:50 | raptor | I have a few 019 fixes to do and bring into 020, as well |
| 13:28:00 | watusimoto | I am trying to mark those that should be backported (i.e. fix bugs) with a [B] to make it clearer |
| 13:28:12 | raptor | ok |
| 13:28:15 | watusimoto | this one I was less sure about |
| 13:28:18 | raptor | that's be easy then :) |
| 13:28:24 | raptor | *that'll |
| 13:28:46 | watusimoto | the problem is when I have a series of commits leading to a new functinoatly; marking all of them is more challenging |
| 13:29:00 | watusimoto | but I am trying to be aware of it |
| 13:32:57 | | LordDVG Quit (Remote host closed the connection) |
| 13:33:02 | raptor | if you don't want to mark them, that's ok, just tell me |
| 13:33:16 | raptor | i usually compress multiple revisions into one working one, anyways |
| 13:33:24 | raptor | for the backport.. |
| 13:34:33 | | Watusimoto_ has joined |
| 13:35:53 | raptor | oh, speaking of which, one revision had some odd changes so I only backported it partially (it still worked): https://code.google.com/p/bitfighter/source/detail?r=ecea0137159b |
| 13:36:33 | raptor | ^^ that was yours. this is the backport: https://code.google.com/p/bitfighter/source/detail?r=76538506da |
| 13:37:14 | raptor | specifically, the ClientGame.cpp and UIEditor.h changes seemed odd |
| 13:37:21 | raptor | were those intentional? |
| 13:44:02 | | kaen_mbp has joined |
| 13:48:24 | watusimoto | if you look at this block: https://code.google.com/p/bitfighter/source/detail?r=ecea0137159b |
| 13:48:34 | watusimoto | I think only the very last section was required to fix the bug |
| 13:48:42 | watusimoto | if I recall |
| 13:49:13 | raptor | yes, i only took bits from UIEditor |
| 13:49:15 | raptor | .cpp |
| 13:49:31 | watusimoto | uhoh... bad news when you see a "//{P{P" |
| 13:49:54 | raptor | haha... i wondered about that... it looked dangerous, so i ignored it |
| 13:50:43 | watusimoto | also some of the .isValid() things in UIEditor might have been changed to fix a weird bug |
| 13:51:28 | watusimoto | if it works... it works |
| 13:52:36 | | raptor Quit (Read error: Connection reset by peer) |
| 13:54:58 | | raptor has joined |
| 13:54:58 | | ChanServ sets mode +o |
| 13:55:30 | raptor | sorry, graphics chip crash |
| 14:17:28 | | Watusimoto_ Quit (Ping timeout: 245 seconds) |
| 14:50:23 | | Watusimoto_ has joined |
| 15:52:51 | | Watusimoto_ Quit (Ping timeout: 265 seconds) |
| 16:45:59 | | Watusimoto_ has joined |
| 16:59:42 | watusimoto | visual basic, how I hate thee. Let me count the ways! |
| 17:36:44 | | Nothing_Much has joined |
| 17:45:47 | | Invisible has joined |
| 17:51:54 | | Watusimoto_ Quit (Ping timeout: 246 seconds) |
| 18:47:46 | | Watusimoto_ has joined |
| 19:01:54 | | Watusimoto_ Quit (Ping timeout: 246 seconds) |
| 19:10:33 | watusimoto | raptor: I lost your list of outstianding editor errors... are there any that you have? |
| 19:11:02 | watusimoto | if not, I'll try to chip away at our google bug list |
| 19:20:36 | raptor | list is on another computer, but I remember one from the forums: add a polywall, put all 4 corners on top of each other, test game... all other barriers are gone |
| 19:21:45 | raptor | heading home! |
| 19:21:47 | | raptor Quit () |
| 19:25:14 | | koda Quit (Quit: koda) |
| 19:31:16 | | Watusimoto_ has joined |
| 19:39:25 | | Invisible Quit (Ping timeout: 264 seconds) |
| 21:46:56 | | watusimoto Quit (Quit: Leaving.) |
| 21:49:20 | | Nothing_Much Quit (Quit: Konversation terminated!) |
| 22:12:41 | | koda has joined |
| 22:12:49 | | koda Quit (Client Quit) |
| 22:15:05 | sam686 | http://sam6.25u.com/bitfighter/bf_upload_to_db_bug_019d.avi (viewable in VLC player or with ffdshow/lav/k-lite codecs) |
| 22:15:07 | sam686 | Editor fails on asking to save and just reverts everything like if the level reloaded. |
| 22:15:25 | | Watusimoto_ Quit (Ping timeout: 264 seconds) |
| 22:15:42 | sam686 | the worst part is when changing filename in editor, then trying to upload to DB without saving, the editor just blanks out. |
| 22:33:25 | | Watusimoto has joined |
| 22:33:36 | | Nothing_Much has joined |
| 23:02:42 | | Watusimoto Quit (Ping timeout: 246 seconds) |
| 23:03:59 | | Invisible has joined |