#gemrb@irc.freenode.net logs for 11 Jun 2012 (GMT)

Archive Today Yesterday Tomorrow
GemRB homepage


[00:49:58] <-- Drakkar has left IRC (Ping timeout: 246 seconds)
[01:05:06] --> Drakkar has joined #gemrb
[01:54:42] <-- alexander__b has left IRC (Ping timeout: 246 seconds)
[02:02:14] --> alexander__b has joined #gemrb
[04:31:14] --> CIA-3 has joined #gemrb
[04:35:19] <-- CIA-33 has left IRC (Ping timeout: 244 seconds)
[05:13:33] --> wrotek has joined #gemrb
[05:31:35] <-- brad_a has left IRC (Quit: brad_a)
[05:33:10] --> gnoll4 has joined #gemrb
[05:34:05] <-- gnoll4 has left IRC (Client Quit)
[07:07:54] --> lynxlynxlynx has joined #gemrb
[07:07:55] <-- lynxlynxlynx has left IRC (Changing host)
[07:07:55] --> lynxlynxlynx has joined #gemrb
[07:07:55] --- ChanServ gives channel operator status to lynxlynxlynx
[11:24:38] <-- lynxlynxlynx has left IRC (Ping timeout: 245 seconds)
[11:45:46] --> lynxlynxlynx has joined #gemrb
[11:45:46] <-- lynxlynxlynx has left IRC (Changing host)
[11:45:46] --> lynxlynxlynx has joined #gemrb
[11:45:46] --- ChanServ gives channel operator status to lynxlynxlynx
[14:17:05] --> kettuz has joined #gemrb
[16:42:52] --> Yoshimo has joined #gemrb
[17:02:01] --> brad_a has joined #gemrb
[17:14:23] --> decker^ has joined #gemrb
[17:22:10] <decker^> hello
[17:27:34] --> decker^_ has joined #gemrb
[17:28:21] <-- decker^ has left IRC (Ping timeout: 245 seconds)
[17:28:35] <decker^_> i have some new stuff for you guys
[17:28:41] --- decker^_ is now known as olathuss
[17:29:01] <olathuss> feet circles slider does not change the level of highlighting <- i corrected this
[17:29:33] <olathuss> also implemented the IE feature of flashing the target reticle on highlighting
[17:29:55] <olathuss> and I didn't fix it but I made a correction of the shield displaying in front of an actor when they are facing up...
[17:31:09] <olathuss> some of it might not have been the best methods so any feedback on what i could do better is appreciated ;)
[17:31:16] <olathuss> i will post it here in a while
[18:25:11] <olathuss> i have a question about git diff
[18:28:02] <olathuss> does the output need to be exact
[18:28:16] <olathuss> do you guys run the output into a script that puts it in or do you go type it in manually
[18:28:26] <olathuss> just wondering cause i tend to has it up pretty bad
[18:28:59] <olathuss> So can I just cut anything extraneous from the output or should I do a clean cut on it
[18:29:07] <olathuss> if that makes sense
[18:42:46] <wjp> the best thing would be to do a commit, and then use git-format-patch to turn it into a patch file
[18:48:08] --> kingron has joined #gemrb
[18:51:50] <-- alexander__b has left IRC (Ping timeout: 260 seconds)
[18:57:23] <olathuss> can i perform a commit on a read-only checkout?
[18:57:32] <lynxlynxlynx> yes
[18:57:43] <olathuss> oh ok
[18:57:49] <lynxlynxlynx> it's readonly only wrt to pushing it upstream
[18:58:23] <lynxlynxlynx> before committing, put the diff somewhere
[18:58:40] <lynxlynxlynx> makes no sense to do it until you're satisfied
[18:58:57] <lynxlynxlynx> it can be easily reversed, but if you're not careful, you can also lose work
[18:59:44] --> alexander__b has joined #gemrb
[19:00:24] <olathuss> what do you mean put the diff somewhere, make a copy of my different files or a copy of my git? I usually do git diff >> somefile
[19:01:21] <olathuss> oh do you mean the patch
[19:02:00] <olathuss> ah
[19:02:03] <olathuss> When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, "git diff" without the --raw option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file.
[19:03:52] <lynxlynxlynx> i meant online, so we can take a look first
[19:04:05] <lynxlynxlynx> as for the git-diff-*, you can forget about them
[19:04:26] <lynxlynxlynx> git diff is their main interface
[19:04:49] <olathuss> what is the patch file called
[19:05:18] <olathuss> i see you mean the pastebin
[19:05:54] <lynxlynxlynx> git format-patch will name them sequentially, with most of the name being the first line of the commit message
[19:07:41] <olathuss> all right
[19:07:47] <olathuss> thanks a bunch
[19:11:00] <lynxlynxlynx> the diff and patch format is the same
[19:11:34] <lynxlynxlynx> but git extends the patch one, so it can convey author/committer/date info
[19:29:05] <olathuss> any -options to use with format-patch you prefer?
[19:37:30] <lynxlynxlynx> not really
[19:37:39] <lynxlynxlynx> oh
[19:37:48] <lynxlynxlynx> don't forget to set up your name and email
[19:38:11] <olathuss> yeah i just did, with git config user.name and user.email right?
[19:38:32] <lynxlynxlynx> one of the ways, yes
[19:39:40] <olathuss> ok :)
[19:40:46] <olathuss> is it best to do a seperate commit and diff for each portion (like different bug) or just do one for all?
[19:50:57] <lynxlynxlynx> separate
[19:58:16] <-- Yoshimo has left IRC (Quit: Yoshimo)
[20:00:04] <-- alexander__b has left IRC (Read error: Connection reset by peer)
[20:01:01] --> alexander__b has joined #gemrb
[20:03:50] <olathuss> all right
[20:04:04] <olathuss> i am just trying this out and seeing if i can do it
[20:04:17] <olathuss> but when i do git format-patch nothing is produced
[20:09:29] <olathuss> oh well i will play with it
[20:09:35] <olathuss> i gtg so thanks again for the help
[20:09:39] <olathuss> see you guys later
[20:09:50] <-- olathuss has left IRC (Quit: Page closed)
[20:57:53] <-- kettuz has left IRC (Quit: Leaving)
[21:29:29] <-- kingron has left IRC (Quit: Leaving)
[21:57:02] <-- wrotek has left IRC (Ping timeout: 244 seconds)
[22:07:18] <-- lynxlynxlynx has left IRC (Remote host closed the connection)
[22:23:43] --> Kiranos_ has joined #gemrb
[22:29:38] <-- Kiranos has left IRC (Read error: Connection reset by peer)
[23:40:29] <-- brad_a has left IRC (Quit: brad_a)