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

Archive Today Yesterday Tomorrow
GemRB homepage


[00:15:43] <-- wrotek has left IRC (Ping timeout: 245 seconds)
[00:35:35] <-- olathuss has left IRC (Quit: Page closed)
[01:43:17] <-- Drakkar has left IRC (Ping timeout: 244 seconds)
[01:45:10] --> Drakkar has joined #gemrb
[02:50:59] --> joneirik has joined #gemrb
[04:43:59] <-- joneirik has left IRC (Quit: Get used to disappointment.)
[04:46:25] --> wrotek has joined #gemrb
[07:36:54] <-- jeremyagost has left IRC (Quit: jeremyagost)
[07:37:03] --> lynxlynxlynx has joined #gemrb
[07:37:03] <-- lynxlynxlynx has left IRC (Changing host)
[07:37:03] --> lynxlynxlynx has joined #gemrb
[07:37:03] --- ChanServ gives channel operator status to lynxlynxlynx
[10:52:21] --> kettuz has joined #gemrb
[12:26:57] <-- kida_laptop has left IRC (Remote host closed the connection)
[12:32:57] --> kida_laptop has joined #gemrb
[12:43:28] <-- alexander__b has left IRC (Ping timeout: 244 seconds)
[12:53:32] --> alexander__b has joined #gemrb
[12:56:50] --- DrMcCoy is now known as DocMcCoy
[12:56:55] --- DocMcCoy is now known as DrMcCoy
[14:28:17] <-- kida_laptop has left IRC (Ping timeout: 246 seconds)
[14:39:25] --> kida_laptop has joined #gemrb
[15:32:36] --> |Blaze| has joined #gemrb
[15:38:27] --> Yoshimo has joined #gemrb
[16:34:06] <-- Yoshimo has left IRC (Quit: Yoshimo)
[16:43:51] --- lynxlynxlynx is now known as lynxlynx
[16:46:31] --- lynxlynx is now known as lynxlynxlynx
[17:06:01] <-- alexander__b has left IRC (Ping timeout: 265 seconds)
[17:14:07] --> alexander__b has joined #gemrb
[17:52:30] --> Yoshimo has joined #gemrb
[19:27:44] --> olathuss has joined #gemrb
[19:40:26] <olathuss> all right i cleaned this up: http://pastebin.com/vmmzFDHT
[19:41:08] <olathuss> and i redid the markerfeedback, and gotta say i really liked your way of doing it lynx much cleaner and doesn't need to mess with the ini settings
[19:41:30] <olathuss> http://pastebin.com/Kk0hAnyB
[19:42:11] <lynxlynxlynx> cool
[19:42:19] <olathuss> that one doesn't include the change from GUI Feedback Levels to just Level, I left that out.
[19:42:21] <lynxlynxlynx> also good news, the github setup was already fixed
[19:44:41] <lynxlynxlynx> both look good
[19:45:18] <lynxlynxlynx> do i need a large shield to see the issue before the patch?
[19:48:19] <lynxlynxlynx> using viconia and darksteel (medium or large shield), i don't see any drawing problems
[19:48:29] <lynxlynxlynx> she holds the shield by her side
[19:48:42] --> olahuss_ has joined #gemrb
[19:48:50] <olahuss_> ping
[19:49:13] <lynxlynxlynx> http://log.usecode.org/gemrblog.php
[19:49:23] <olahuss_> cool about github being fixed now :)
[19:50:04] <olahuss_> hmm
[19:50:15] <olahuss_> try attacking someone while you face up
[19:50:46] <olahuss_> or walking up
[19:50:51] <-- olathuss has left IRC (Ping timeout: 245 seconds)
[19:50:54] <olahuss_> if the shield is to the side it is not very noticeable
[19:51:19] <olahuss_> maybe it is another issue, i will take some screenshots and see
[19:52:15] <lynxlynxlynx> straight up as in north?
[19:53:36] <olahuss_> right
[19:54:05] <lynxlynxlynx> then i don't see anything wrong in this case
[19:54:12] <olahuss_> i was using khalid and branwen when i saw it
[19:54:40] <olahuss_> ok well don't worry about that one right now i will test it some more
[19:54:58] <olahuss_> that is why i put the note i didn't actually fix the bug, just corrected it
[19:55:24] <olahuss_> i think the problem is some characters maye have the zOrder wrong, but I don't really know what that means so it's a wild guess lol
[19:56:18] <lynxlynxlynx> ah, in bg1 i do see an issue, sometimes the shield goes through the char
[19:56:41] <olahuss_> yeah
[19:56:48] <olahuss_> it doesn't happen in bg2
[19:56:52] <olahuss_> i don't know about iwd2 or pst
[19:57:09] <lynxlynxlynx> i guess it depends on the animation type
[19:57:48] <lynxlynxlynx> i'm just worried that this change is too broad and could break something else
[19:59:03] <lynxlynxlynx> something to ask avenger about when he comes around
[20:03:32] <olahuss_> yeah i had the same worry and i agree it should be tested further out. might it be best to fix the actual zorder or order of animation layers?
[20:10:21] <-- alexander__b has left IRC (Ping timeout: 252 seconds)
[20:10:32] <lynxlynxlynx> of course
[20:10:46] <lynxlynxlynx> always try to remove the root cause
[20:14:01] <lynxlynxlynx> anyway, let's get the other one in
[20:14:17] <olahuss_> all right
[20:14:35] <lynxlynxlynx> did you create a commit yet?
[20:14:35] <olahuss_> do you want the patch it produced?
[20:14:43] <olahuss_> yeah i did a commit then a patch
[20:14:48] <lynxlynxlynx> yep
[20:15:05] <CIA-3> GemRB: 03avenger_teambg * r7936d4a47379 10gemrb/gemrb/core/Scriptable/Actor.cpp: fixed percentile damage
[20:15:07] <olahuss_> ok just a minute
[20:15:59] <olahuss_> want me to upload it somewhere or send it somewhere
[20:17:23] <lynxlynxlynx> upload is easier
[20:17:35] <lynxlynxlynx> i can just wget it and remove it afterwards without much dir changing
[20:18:04] <lynxlynxlynx> pastebins work fine if you have problems with that, just make sure you upload the file, not copy/paste, since that noms the tabs
[20:18:23] --> alexander__b has joined #gemrb
[20:19:06] <olahuss_> ok
[20:21:53] <olahuss_> http://tgull.php.cs.dixie.edu/gemrb/0002_Fixed_marker_feedback.patch
[20:21:56] <lynxlynxlynx> hah, we had taht percentile bug in there for ages
[20:22:43] <lynxlynxlynx> tsk tsk tsk
[20:22:54] <olahuss_> what?
[20:23:02] <lynxlynxlynx> it has whitespace noise right at the start :P
[20:23:17] <olahuss_> what do you mean sorry
[20:23:34] <tomprince> Although, if you are apply a patch, that gets fixed pretty much automatically.
[20:24:25] <lynxlynxlynx> will see what happens with --ignore-space-change
[20:24:41] <olahuss_> what me to try it again?
[20:25:03] <tomprince> 'git apply --whitespace=fix' ?
[20:25:24] <olahuss_> tomprince: is that for me?
[20:26:11] <tomprince> lynxlynxlynx
[20:26:25] <olahuss_> oh this SubOptionsWindow stuff, yeah I have NO idea how that happened I saw it in git diff and the git diff -w
[20:26:29] <olahuss_> didn't know it would put that in the patch
[20:26:41] <lynxlynxlynx> it's probably your editor
[20:26:41] <tomprince> Although, along with 'git add -p' it works wonders for cleaning up before comitting.
[20:26:48] <lynxlynxlynx> eol whitespace removal was done
[20:27:03] <olahuss_> oh... switch from windows to linux
[20:27:15] <olahuss_> since i had trouble with emacs i edited in code::blocks
[20:27:30] <olahuss_> and idle uses spaces for tabs so i didn't want to edit python scripts in that
[20:28:06] <olahuss_> is there a way to ignore that in git format-patch?
[20:28:43] <lynxlynxlynx> maybe, but you should be making sure you're doing the right thing(tm)
[20:28:53] <lynxlynxlynx> otherwise you're just adding extra hurdles
[20:30:55] <lynxlynxlynx> tomprince: unfortunately i get the same result with that
[20:32:20] <lynxlynxlynx> which is odd
[20:33:04] <olahuss_> does it work if you edit a file elsewhere and copy it over
[20:33:18] <olahuss_> like can i do it in notepad++ then just copy over the file?
[20:33:32] <lynxlynxlynx> error-all doesn't print anything, so it must think it is all legit
[20:35:13] <olahuss_> well i can redo it and try to get it right
[20:36:50] <lynxlynxlynx> that would be ideal, but i'm still investigating why this doesn't get fixed on apply
[20:37:18] <olahuss_> ok
[20:38:35] <lynxlynxlynx> i have a shortcut for applying the important stuff only, so you just have to pick what you want to learn first
[20:38:47] <lynxlynxlynx> about redoing commits or merge errors
[20:43:29] <olahuss_> do you know if emacs autofixes EOL
[20:43:56] <olahuss_> you mean with the revert/reset stuff?
[20:43:57] <lynxlynxlynx> i'm sure it can, but i have no idea what is the default
[20:44:31] <lynxlynxlynx> reset mostly, yes
[20:44:57] <lynxlynxlynx> you can use reset --soft HEAD^ to uncommit (but not unstage) stuff
[20:45:40] <lynxlynxlynx> a rebase would also work, but that's a tiny bit more involved
[20:46:34] <olahuss_> reset --soft HEAD^ ? all right i will write that one down
[20:49:08] <olahuss_> then make corrections and just commit again?
[20:50:43] <lynxlynxlynx> it's not so simple
[20:50:48] <lynxlynxlynx> if you check git status
[20:51:36] <lynxlynxlynx> you should see that some changes are staged (ready for commit), some are not and now you want to remove some of the marked for commit
[20:52:29] <lynxlynxlynx> eh nevermind, for this a normal git reset is better
[20:52:38] <lynxlynxlynx> it will unstage everything but not remove your changes
[20:52:53] <olahuss_> just do git reset?
[20:52:55] <lynxlynxlynx> do that and the git commit -p to pick the bits you want included
[20:53:13] <lynxlynxlynx> yes, it's the same as if you passed --mixed
[20:59:34] <olahuss_> want me to include the fix of that extra s in GUI Feedback Level in Interface while I am doing this?
[21:00:19] <tomprince> best to have seperate commits, probably. (smaller commits that do one thing are best)
[21:00:27] <lynxlynxlynx> yep
[21:02:35] <olahuss_> ok
[21:04:53] <lynxlynxlynx> makes it easier to find problems when you look back
[21:05:32] <tomprince> And makes it easier to review, first time around.
[21:22:00] <olahuss_> ok try this
[21:22:25] <olahuss_> http://tgull.php.cs.dixie.edu/gemrb/0002-Corrected-marker-feedback-circles.patch
[21:22:45] <olahuss_> oops
[21:22:48] <olahuss_> http://tgull.php.cs.dixie.edu/gemrb/0001-Corrected-marker-feedback-circles.patch
[21:22:49] <olahuss_> sorry
[21:23:27] <olahuss_> forbidden ugh
[21:23:41] <tomprince> You could fork gemrb/gemrb on github, and push there.
[21:23:51] <-- Yoshimo has left IRC (Quit: Yoshimo)
[21:25:21] <olahuss_> stupid school
[21:27:06] <olahuss_> there sorry had to chmod it
[21:27:31] <olahuss_> http://tgull.php.cs.dixie.edu/gemrb/0001-Corrected-marker-feedback-circles.patch <-- now it works
[21:28:44] <olahuss_> tomprince: yeah I can't push or upstream from my school computer though they block the uplink I think
[21:28:58] <olahuss_> actually it might work on the virtual ssh
[21:29:16] <olahuss_> it wouldn't let me git clone either but it let me do it inside the virtual machine
[21:32:50] <olahuss_> what is the gemrb github repo at
[21:33:31] <tomprince> https:/github.com/gemrb/gemrb
[21:33:48] <olahuss_> ok cool
[21:34:22] <olahuss_> there: https://github.com/awesomethomas/gemrb
[21:35:57] <olahuss_> ugh now i have to reset my ssh key lol eh no time i really need to get going on homework
[21:43:57] <olahuss_> just one more thing, until the GUI Feedback Levels is changed to GUI Feedback Level, the slider will show up as -1 so in the GUI it will be off the slider and a bit to the left
[21:44:13] <olahuss_> anyway i gtg
[21:44:27] <olahuss_> so if that works great if not sorry, let me know tomorrow and i will do it again lol
[21:44:30] <olahuss_> see you guys
[21:44:35] <-- olahuss_ has left IRC (Quit: Page closed)
[21:52:52] <-- lynxlynxlynx has left IRC (Remote host closed the connection)
[21:53:56] --> lynxlynxlynx has joined #gemrb
[21:53:57] <-- lynxlynxlynx has left IRC (Changing host)
[21:53:57] --> lynxlynxlynx has joined #gemrb
[21:53:57] --- ChanServ gives channel operator status to lynxlynxlynx
[21:54:12] <lynxlynxlynx> doh, killed kdeinit
[21:54:38] <-- wrotek has left IRC (Ping timeout: 240 seconds)
[22:02:48] <-- gembot has left IRC (Ping timeout: 245 seconds)
[22:05:55] --> gembot has joined #gemrb
[22:14:47] <-- kettuz has left IRC (Quit: Leaving)
[22:26:30] <CIA-3> GemRB: 03lynxlupodian * r6d090fb7d708 10gemrb/.mailmap: added mailmap entry for decker
[22:26:40] <CIA-3> GemRB: 03tgull1 * r34e9e386ea22 10gemrb/gemrb/ (6 files in 6 dirs):
[22:26:40] <CIA-3> GemRB: Corrected marker feedback (circles) so now uses the 1-5 values that IE uses, does not use 1-6 of BG2. Slider in Feedback Options will work properly now.
[22:26:40] <CIA-3> GemRB: Signed-off-by: Jaka Kranjc <lynxlupodian@users.sourceforge.net>
[22:45:20] <-- lynxlynxlynx has left IRC (Remote host closed the connection)
[22:46:55] <-- Kiranos_ has left IRC (Ping timeout: 252 seconds)
[22:47:02] --> Kiranos has joined #gemrb