[00:17:25] <-- brad_a has left IRC (Ping timeout: 252 seconds)
[01:17:02] --> brad_a has joined #gemrb
[01:58:21] <-- brad_a has left IRC (Quit: brad_a)
[02:14:52] --> brad_a has joined #gemrb
[03:00:15] <-- brad_a has left IRC (Quit: brad_a)
[03:05:51] --> Stefan80 has joined #gemrb
[03:09:23] <-- Kiranos has left IRC (Ping timeout: 252 seconds)
[03:11:21] --> brad_a has joined #gemrb
[03:12:17] <-- brad_a has left IRC (Client Quit)
[06:37:06] --> adominguez has joined #gemrb
[07:07:05] <-- |Cable| has left IRC (Remote host closed the connection)
[07:28:17] --> bar11 has joined #gemrb
[07:31:23] <-- bar11 has left #gemrb
[07:32:45] --> bar11 has joined #gemrb
[07:36:40] --> edheldil_ has joined #gemrb
[07:44:51] <-- edheldil_ has left IRC (Ping timeout: 260 seconds)
[07:57:16] --> lubos has joined #gemrb
[08:23:32] <edheldil> Hi all
[08:30:01] --> SiENcE has joined #gemrb
[08:53:22] --> edheldil_ has joined #gemrb
[13:15:59] --> |Cable| has joined #gemrb
[15:01:43] <-- bar11 has left IRC (Ping timeout: 250 seconds)
[15:19:24] --> brad_a has joined #gemrb
[15:30:08] <-- lubos has left IRC (Quit: Leaving.)
[15:43:26] --> barra_home has joined #gemrb
[15:49:03] <-- SiENcE has left IRC (Quit: @all: cya)
[16:10:45] <brad_a> if i accidentally added a change to a commit i can edit with git commit --amend and just delete the changes right?
[16:11:17] <-- adominguez has left IRC (Quit: Saliendo)
[16:11:20] <edheldil> brad_a: not if you have already pushed it to somewhere else
[16:23:06] <brad_a> nope just in my local repo and its the last commit
[16:28:00] <brad_a> one more question then. if i amend this commit and delete the changes i didnt want to be a part of it will those changes be lost? cuz i do want them they just shouldnt be committed yet
[16:56:02] <edheldil> I think that unless you want to hunt for them in .git/objects, they will be lost, but *maybe* you could get around that with stash.
[16:57:31] <-- edheldil_ has left IRC (Ping timeout: 255 seconds)
[16:59:33] <brad_a> yeah well i already mucked up the commit so i rolled it back and im going to just do it right this time :P
[17:03:34] <brad_a> ok im just going to backup all my changed files then reset to origin then merge my changes back in. bah. this is my own fault for not regularly making commits!
[17:06:38] <brad_a> ok got it! tht wasnt so bad
[17:06:56] <brad_a> git reset --soft HEAD^ is my friend
[17:14:47] --> lynxlynxlynx has joined #gemrb
[17:14:47] <-- lynxlynxlynx has left IRC (Changing host)
[17:14:47] --> lynxlynxlynx has joined #gemrb
[17:14:47] --- ChanServ gives channel operator status to lynxlynxlynx
[17:24:57] --> Maighstir has joined #gemrb
[17:29:33] <-- Maighstir has left IRC (Read error: Connection reset by peer)
[17:44:49] <lynxlynxlynx> bt
[17:44:52] <lynxlynxlynx> err
[17:45:21] <lynxlynxlynx> brad_a: in such cases, just undo the commit itself with: git reset --soft
[17:45:48] <lynxlynxlynx> then you can unstage the problematic file and readd it partially with git add -p
[17:58:54] <brad_a> good to know thanks!
[18:00:57] <brad_a> i dont know if this interests anybody but here is a patch to implement SDL 1.3 style mousewheel events, oth horizontal and vertical
[18:00:59] <brad_a> http://dl.dropbox.com/u/13866402/OnMouseWheelScroll.txt
[18:01:50] <brad_a> i needed this to do the touchscreen viewport scrolling just FYI
[18:05:38] <brad_a> :\ apparently i also added my patch to send key events to IE_GUI_WORLDMAP in there too
[18:05:59] <brad_a> i can fix that if its a problem but its just 1 line...
[18:10:20] <lynxlynxlynx> can you post it somewhere else, like a pastebin
[18:10:27] <lynxlynxlynx> none of your patches ever apply for me
[18:10:44] <brad_a> thats cuz i used to copy and paste
[18:10:52] <brad_a> this one is just output to a file
[18:11:10] <brad_a> if it doesnt work then ill gladly get a pastebin account or something
[18:42:08] <lynxlynxlynx> no account needed, but i'll try this first
[18:43:07] <lynxlynxlynx> yeah, this one applies
[18:43:27] <brad_a> sweet
[18:43:34] <brad_a> here is another :)
[18:43:35] <brad_a> http://dl.dropbox.com/u/13866402/SoftKeyboard.txt
[18:43:56] <brad_a> avenger asked me to fix the virtual keyboard stuff forever ago and this is it
[18:44:58] <brad_a> im doing one for the config files now that beholders touch areas stuff is implemented
[18:45:30] <brad_a> gemrb.cfg.noinstall.sample and cemrb.cfg.sample.in are the only 2 files right?
[18:57:42] --> SiENcE has joined #gemrb
[19:04:31] <brad_a> http://dl.dropbox.com/u/13866402/configOptions.txt
[19:04:46] <lynxlynxlynx> cool
[19:04:56] <lynxlynxlynx> i'll get started
[19:05:00] <brad_a> thank you
[19:07:25] <brad_a> http://dl.dropbox.com/u/13866402/mallocNotDeclared.txt
[19:15:46] <lynxlynxlynx> the first one contains all the touchscreen stuff too
[19:16:01] <lynxlynxlynx> i'll delete it, it should be in a separate commit
[19:23:01] <brad_a> how the f did that happen? :\
[19:23:12] <brad_a> that stuff was alreaddy commited by avenger yesterday
[19:23:30] <brad_a> i used git add -p!
[19:24:00] <brad_a> ill bet git show doesnt do what i thought it did
[19:26:50] <brad_a> this is driving me nuts that i keep just staging part with git addd -p then it looks right when i look at the stage then i do a commit and everything is commited what am i doing wrong?
[19:27:17] <wjp> how do you commit?
[19:28:25] <lynxlynxlynx> also, why the safety check removal in GameControl::OnSpecialKeyPress ?
[19:28:44] <brad_a> is it removed or just moved to onmousescroll?
[19:30:02] <brad_a> i honestly dont know the commit commad that this program is using it says it should just commit staged changes or whatever.
[19:30:21] <brad_a> so what should i be using git commit -a?
[19:30:42] <lynxlynxlynx> no
[19:30:48] <lynxlynxlynx> that's what would be causing the problem
[19:30:51] <brad_a> ah
[19:30:58] <brad_a> stupid lying program
[19:30:59] <lynxlynxlynx> git diff --cached shows what is in the stage
[19:31:09] <brad_a> then how do i commit only that?
[19:31:39] <lynxlynxlynx> also, please make that magic 10 a macro or global static
[19:31:50] <lynxlynxlynx> git commit #nothing extra
[19:32:23] <wjp> specifically, do _not_ specify filenames or -a
[19:32:25] <brad_a> well ideally that magic 10 should be getting the height in pixels for whatever is getting scrolled
[19:32:39] <lynxlynxlynx> re checks: i haven't read all yet, but part of the removal is definitely bad, since the pointer is accessed in one of the following lines (visible in the diff)
[19:33:36] <brad_a> so just git commit will commit what i have staged?
[19:33:44] <lynxlynxlynx> yes
[19:33:49] <brad_a> ok thank you so much
[19:33:54] <brad_a> that was killing me
[19:34:41] <lynxlynxlynx> if you rebase now, the touchscreen part will probably go away by itself
[19:35:07] <brad_a> just git rebase? or do i need an option?
[19:36:02] <lynxlynxlynx> a git pull would do too, but git fetch origin && git rebase origin # does it without a tracked merge
[19:36:20] <lynxlynxlynx> you have to have a clean tree for that though
[19:36:50] <brad_a> yeah i dont have a clean tree atm
[19:37:37] <brad_a> bah that focus stuff got in here too because of that
[19:38:35] <brad_a> good lord i should jsut redo all these except the config and malloc ones
[19:39:43] <brad_a> or can i just edit the txt files i sent?
[19:42:56] <brad_a> yeah throw out those first 2 patches and ill redo them usig git commit this time.
[19:42:58] <lynxlynxlynx> the second patch is some 5 things in one too
[19:43:07] <lynxlynxlynx> yeah
[19:43:11] <lynxlynxlynx> too late :P
[19:43:15] <brad_a> lol
[19:43:16] <brad_a> good
[19:43:37] <lynxlynxlynx> fix them up
[19:43:40] <brad_a> will do
[19:43:53] <brad_a> just give me a min
[19:43:57] <brad_a> or 15
[19:44:05] <lynxlynxlynx> no rush
[19:44:36] <brad_a> the last 2 are fine
[19:44:48] <lynxlynxlynx> the third one needs to wait
[19:45:15] <brad_a> at least redoing it i can get the worldmap thing in its own this time :P
[19:45:18] <brad_a> yes it does
[19:45:20] <lynxlynxlynx> has to also make chronological sense
[19:45:23] <brad_a> right
[19:50:18] <brad_a> http://dl.dropbox.com/u/13866402/worldmapkeyevents.txt
[19:50:36] <lynxlynxlynx> eeeh, git am doesn't find your mail valid
[19:50:43] <lynxlynxlynx> need to do it manually
[19:51:37] <brad_a> ? Brad Allred <firstname.lastname@example.org> isnt a vaild email address?
[19:51:49] <brad_a> should i just use email@example.com?
[19:52:46] <lynxlynxlynx> no idea why it doesn't like it, but i doubt it's the bloat around it
[19:53:08] <brad_a> i assure you it is a valid address!
[19:54:46] <lynxlynxlynx> probably a git bug
[19:55:26] <wjp> no, it's just not in am format
[19:55:27] <brad_a> which check in gamecontrol special key press did i remove that is still needed?
[19:55:45] <wjp> this is the output of git-show, not of git-format-patch
[19:56:33] <brad_a> should i be using git-format-patch then? i clearly have no idea what im doing
[19:56:41] <wjp> use 'git apply filename' to apply patches of this type
[19:56:49] <wjp> brad_a: no, this is fine
[19:56:52] <brad_a> ok
[19:57:32] <wjp> but I think I'm confusing myself now
[19:57:58] <brad_a> oh i see the check for game
[19:58:08] <brad_a> i need that back in there
[19:58:29] <lynxlynxlynx> at least game
[19:58:49] <lynxlynxlynx> btw, why is EventMgr::GetMouseFocusedControlType in the second new patch? it's unused
[19:59:16] <brad_a> it shouldnt be in there that was a case of git commit -a instead of git commit
[19:59:32] <brad_a> it is used in my version of sdlvideo
[19:59:55] <brad_a> the first 2 patches are garbage because of how i commited
[20:00:14] <lynxlynxlynx> yes
[20:00:23] <lynxlynxlynx> but it was also present in the new second patch
[20:00:29] <lynxlynxlynx> wmap stuff
[20:00:35] <brad_a> i havent given a new second...
[20:00:48] <brad_a> bah
[20:01:03] <brad_a> darn it i am throwing out this gui git interface
[20:04:13] <wjp> I guess git-format-patch is really the way to go for this
[20:04:38] <wjp> for some reason I thought you could apply the output of git-show directly, but either I'm confused or I'm looking in the wrong places now :-)
[20:04:54] <brad_a> ok so how do i do that?
[20:04:59] <lynxlynxlynx> i don't remember git apply ever working for me
[20:05:22] <lynxlynxlynx> run g-f-p after you nicely break up and commit everything locally
[20:05:33] <lynxlynxlynx> it will create a patch series for you
[20:06:16] <CIA-40> GemRB: 03bradallred * rf4ca99d08c00 10gemrb/gemrb/core/GUI/EventMgr.cpp: allows IE_GUI_WORLDMAP controls to receive special keyevents
[20:06:27] <CIA-40> GemRB: 03bradallred * rcc12395844b6 10gemrb/gemrb/core/System/String.cpp: Fixes 'malloc was not declared in this scope' when building non debug builds.
[20:07:20] <brad_a> eek you used the old file for that worldmap one
[20:07:33] <brad_a> the new one has just the switch addition
[20:10:03] <brad_a> -bash: git-format-patch: command not found
[20:11:16] <brad_a> ok so git format-patch is what i use i guess but how do i view it it just exits
[20:11:37] <wjp> it creates files with patches
[20:11:59] <lynxlynxlynx> oh, i thought the rest was related
[20:12:18] <brad_a> nope sorry if you redownload that file you will see the new version
[20:12:26] <brad_a> sorry for being such a git noob
[20:12:34] <brad_a> i really need to read a book
[20:13:06] <CIA-40> GemRB: 03lynxlupodian * rf0a1a4929839 10gemrb/gemrb/core/GUI/EventMgr.cpp:
[20:13:06] <CIA-40> GemRB: Revert "allows IE_GUI_WORLDMAP controls to receive special keyevents"
[20:13:06] <CIA-40> GemRB: mashup
[20:13:06] <CIA-40> GemRB: This reverts commit f4ca99d08c00283af566283c24e8fb643fd2d503.
[20:15:01] <CIA-40> GemRB: 03bradallred * r3711ebc80580 10gemrb/gemrb/core/GUI/EventMgr.cpp: Allows IE_GUI_WORLDMAP controls to receive special keyevent
[20:15:16] <brad_a> thank you!
[20:15:56] <brad_a> so what does format patch use for the file name? i didnt supply any options
[20:19:42] --> edheldil_ has joined #gemrb
[20:23:03] <lynxlynxlynx> first line? i don't remember
[20:25:17] <wjp> prefixed by the number of the patch
[20:36:36] <brad_a> im getting a blank file.... clearly im missing something
[20:37:38] <brad_a> i definately have a good commit this time tho :P
[20:41:29] <brad_a> i see my commit in master branch but git format-patch master --stdout does nothing
[20:44:25] <wjp> instead of master, you have to specify _since when_ you want the commits
[20:45:44] <brad_a> haza thank you
[20:46:18] <brad_a> http://dl.dropbox.com/u/13866402/newOnMouseWheelScroll.txt
[20:46:24] <brad_a> is that what we are looking for?
[20:48:20] <brad_a> except that check for game should be before the partysize!!!! im having a bad day
[20:48:36] <wjp> you could also push your git repo online somewhere and have us pull from it
[20:49:15] <brad_a> i may have to do that
[20:49:35] <brad_a> but im finally getting the hang of this git business so thats a plus
[20:49:47] <brad_a> hang on while i amend this commit and repproduce that patch
[20:52:57] <brad_a> there
[20:53:14] <brad_a> http://dl.dropbox.com/u/13866402/newOnMouseWheelScroll.txt
[20:55:31] <brad_a> i need to do a pull to get this touchscreenstuff in before i can patch out the softkeyboard stuff
[20:55:44] <lynxlynxlynx> take your time
[20:55:51] <lynxlynxlynx> commit everything separately
[20:56:12] <lynxlynxlynx> then just specify the first new commit and g-f-p will create all the patches for you
[20:57:27] <brad_a> yeah i noticed that
[20:57:32] <brad_a> thats nice of it
[20:57:44] <brad_a> much better than making separate files
[21:01:31] <brad_a> so to get a "clean" working directory without loosing my uncommited changes do i have to stash them or what?
[21:03:54] <brad_a> it looks like yes but then how do i unstachthem in order to apply them later?
[21:04:20] <brad_a> git stach apply?
[21:04:31] <wjp> stash
[21:05:03] <wjp> but, yes, git stash apply puts them back
[21:05:12] <brad_a> ok neat. thank you
[21:05:23] <wjp> you can also use git stash pop to apply and then remove the stash
[21:05:42] <brad_a> so pop is what i want
[21:07:18] <-- lynxlynxlynx has left IRC (Remote host closed the connection)
[21:23:00] <-- SiENcE has left IRC (Read error: Connection reset by peer)
[22:27:10] <brad_a> ill probably have to repost this when lynx is back tomorrow but here are all my commits in a nice patch. thanks again for all the git training everybody. it helped a lot. http://dl.dropbox.com/u/13866402/bradspatch.txt
[22:50:47] <-- brad_a has left IRC (Quit: brad_a)
[23:16:47] <-- Stefan80 has left IRC (Quit: No Ping reply in 180 seconds.)
[23:17:12] --> Kiranos has joined #gemrb