| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** bddebian has quit IRC | 00:49 | |
| *** Erroneous has quit IRC | 01:04 | |
| * llnz wanders off | 01:16 | |
| llnz | later all | 01:16 |
|---|---|---|
| *** llnz has quit IRC | 01:16 | |
| CIA-32 | victor.ivri gencon-rfts-ai * r835cab3d5b14 /gencon/ (4 files in 4 dirs): Fixed null-pointer that pops up when the bot is defeated. | 01:52 |
| *** nash has quit IRC | 03:25 | |
| *** Demitar has joined #tp | 03:58 | |
| *** peres has left #tp | 04:07 | |
| *** zzorn_laptop has joined #tp | 04:30 | |
| *** Demitar has quit IRC | 06:44 | |
| *** Demitar has joined #tp | 06:45 | |
| *** mithro has quit IRC | 07:19 | |
| *** Demitar has quit IRC | 07:24 | |
| *** mithro has joined #tp | 07:43 | |
| *** Iwanowitch has joined #tp | 07:52 | |
| *** Iwanowitch has quit IRC | 07:56 | |
| *** Iwanowitch has joined #tp | 07:57 | |
| *** Iwanowitch has quit IRC | 08:37 | |
| *** Iwanowitch has joined #tp | 09:31 | |
| *** zzorn_laptop has quit IRC | 09:35 | |
| *** zzorn_ has quit IRC | 10:06 | |
| *** bddebian has joined #tp | 11:01 | |
| bddebian | Heya | 11:02 |
| *** Demitar has joined #tp | 11:34 | |
| *** Iwanowitch has quit IRC | 12:33 | |
| *** Iwanowitch has joined #tp | 12:35 | |
| *** zzorn_laptop has joined #tp | 12:40 | |
| *** zzorn_laptop has quit IRC | 12:47 | |
| *** zzorn_ has joined #tp | 14:15 | |
| *** CIA-32 has quit IRC | 16:14 | |
| *** Erroneous has joined #tp | 16:27 | |
| *** greywhind has quit IRC | 16:36 | |
| *** CIA-33 has joined #tp | 16:42 | |
| *** bddebian has quit IRC | 16:45 | |
| *** Iwanowitch has quit IRC | 17:31 | |
| *** jsmiller has joined #tp | 17:46 | |
| jsmiller | Hi all. Peeking in for a bit. | 17:50 |
| jsmiller | I'm noticing that some of people reprojecting textures onto planetary disks are using PovRay -- a free ray tracing engine. It's possible that might be a good basic engine, if I don't stick with a simple hand-rolled reprojector. It's probably best to give the simple hand-rolled approach another try before picking up the big toolset. | 17:54 |
| *** JLafont-laptop has joined #tp | 18:00 | |
| jsmiller | Ducking out now. | 18:07 |
| *** jsmiller has left #tp | 18:07 | |
| *** greywhind has joined #tp | 18:22 | |
| *** Demitar has quit IRC | 18:45 | |
| *** llnz has joined #tp | 18:54 | |
| *** peres has joined #tp | 18:59 | |
| *** nash has joined #tp | 19:14 | |
| *** greywhind has quit IRC | 19:22 | |
| *** zzorn_ has quit IRC | 19:22 | |
| *** mithro has quit IRC | 19:22 | |
| *** CIA-33 has quit IRC | 19:22 | |
| *** Guest3209 has quit IRC | 19:22 | |
| *** greywhind has joined #tp | 19:22 | |
| *** CIA-33 has joined #tp | 19:22 | |
| *** zzorn_ has joined #tp | 19:22 | |
| *** mithro has joined #tp | 19:22 | |
| *** Guest3209 has joined #tp | 19:22 | |
| mithro | be back in 15 minutes | 19:44 |
| *** Alklomion has joined #tp | 19:44 | |
| *** bddebian has joined #tp | 20:03 | |
| *** mithro has quit IRC | 20:03 | |
| *** nash has quit IRC | 20:03 | |
| *** mithro has joined #tp | 20:04 | |
| mithro | hey Alklomion | 20:05 |
| Alklomion | hi mithro | 20:05 |
| Alklomion | So I need to do another checkout to test that git is working properly | 20:05 |
| Alklomion | is that what you said? | 20:05 |
| mithro | yes | 20:06 |
| mithro | you need to do a fresh checkout | 20:06 |
| mithro | and then make a small change and see if it works | 20:06 |
| mithro | Alklomion: has there been any other progress? | 20:14 |
| Alklomion | not since... wednesday? | 20:14 |
| mithro | okay | 20:19 |
| mithro | You have gotten so far along, it would be really sad to not see you finish it | 20:20 |
| Alklomion | Yeah, Week four is a bad week for assignments :( | 20:23 |
| Alklomion | I'm doing another programming assignment for Chris for another subject currently, can't wait til that's out the way | 20:23 |
| mithro | okay | 20:24 |
| Alklomion | Interesting - cvs is trying to send j4me as a text/ascii format | 20:25 |
| CIA-33 | alklomion /tmp/xiiqMDoJ5H/qvqiESV75x-midp * ra631892d5346 /src/net/thousandparsec/util/J4ME.jar: via git-CVS emulator | 20:29 |
| CIA-33 | alklomion /tmp/J4bf7FiATh/aMcKEqcHWw-midp * r1beef082c728 /src/net/thousandparsec/util/J4ME.jar: | 20:30 |
| CIA-33 | J4ME jar file, deleted and replaced with binary version. | 20:30 |
| CIA-33 | via git-CVS emulator | 20:30 |
| mithro | they both seemed to work | 20:31 |
| Alklomion | seems to be working now mithro | 20:31 |
| CIA-33 | alklomion /tmp/V3JOlsB5pv/MAs3dY5CaP-midp * r383c2cfc01e5 /src/net/thousandparsec/netlib/Client/ (logo.png placeholder.png): | 20:34 |
| CIA-33 | replacing corrupted images with fresh, uncorrupt ones. | 20:34 |
| CIA-33 | via git-CVS emulator | 20:34 |
| *** JLafont-laptop has quit IRC | 20:35 | |
| mithro | Actually they where fine on this side | 20:37 |
| Alklomion | the images? | 20:38 |
| Alklomion | they weren't working on my end for some reason | 20:38 |
| mithro | yeah - it's probably the stupid CVS line ending conversion | 20:38 |
| mithro | tim@vaio:~/oss/tp/libtpproto-java$ file `find -name *.png` | 20:39 |
| mithro | ./src/net/thousandparsec/netlib/Client/logo.png: PNG image data, CORRUPTED, | 20:39 |
| mithro | ./src/net/thousandparsec/netlib/Client/placeholder.png: PNG image data, CORRUPTED, | 20:39 |
| *** nash has joined #tp | 20:41 | |
| mithro | hey nash | 20:41 |
| Alklomion | have you got a link to that git thing ? | 20:41 |
| mithro | http://code.google.com/p/msysgit/ | 20:42 |
| tpb | Title: msysgit - Google Code (at code.google.com) | 20:42 |
| mithro | it's not as easy to use as TortoiseCVS but it's much more reliable | 20:42 |
| Alklomion | which one am I getting? I'm assuming i don't want to 'hack' on git? | 20:44 |
| mithro | yes you want the first download button | 20:44 |
| Alklomion | Ok, so how do i use this tool? Do I need to create a repository, or something else? | 20:54 |
| mithro | Alklomion: start up the git-gui | 20:58 |
| mithro | and checkout the repository using git+ssh://[email protected]/git/libtpproto-java.git | 20:58 |
| mithro | Alklomion: can you try doing a fresh checkout with cvs and see if those files are still corrupted? | 21:01 |
| Alklomion | jar file is 1kb again | 21:03 |
| Alklomion | i click git gui, it comes to a welcome style screen with three options, new, open, clone | 21:06 |
| mithro | Alklomion: after a fresh checkout? | 21:06 |
| mithro | Alklomion: you want "clone" | 21:06 |
| Alklomion | ok so the url is that statement and then i just set a folder i want to put it in to | 21:07 |
| mithro | yes | 21:08 |
| Alklomion | working.. please wait | 21:08 |
| Alklomion | seems to be hanging at this point | 21:09 |
| mithro | just trying to reproduce here | 21:14 |
| mithro | on the setup screen | 21:16 |
| mithro | did you choose plink or ssh? | 21:16 |
| Alklomion | ssh, reinstalling | 21:16 |
| Alklomion | I don't have plink either, only pageant | 21:18 |
| mithro | can you install the full putty pack? | 21:18 |
| mithro | "A Windows installer for everything except puttytel" | 21:19 |
| Alklomion | I just downloaded the plink.exe from putty, I already have other parts | 21:21 |
| Alklomion | pageant gen and putty | 21:21 |
| mithro | okay | 21:21 |
| mithro | so you will have to select plink for you ssh key to work | 21:22 |
| *** Erroneous has quit IRC | 21:22 | |
| Alklomion | ok - it's downloading | 21:25 |
| mithro | yay! | 21:26 |
| mithro | once it has downloaded you probably want to create a shortcut on your desktop | 21:27 |
| Alklomion | should the main interface be populated at this point? | 21:27 |
| mithro | while that is working | 21:27 |
| mithro | can you right click on the png file | 21:27 |
| mithro | and go to the "CVS" tab | 21:28 |
| mithro | and tell me what it says under "Fiile format: " | 21:28 |
| Alklomion | in the git client? I don't think it worked | 21:28 |
| mithro | as I just did a checkout with TortoiseCVS and it worked file | 21:28 |
| mithro | Alklomion: no in explorer | 21:28 |
| Alklomion | can't see a file format option | 21:30 |
| mithro | on the CVS tab? | 21:31 |
| mithro | can you take a screenshot? | 21:31 |
| Alklomion | http://img386.imageshack.us/img386/2458/nooptiondv4.jpg | 21:32 |
| tpb | <http://ln-s.net/2+cO> (at img386.imageshack.us) | 21:32 |
| mithro | oh | 21:33 |
| mithro | right click on the file | 21:34 |
| mithro | go properties | 21:34 |
| mithro | then go to the cvs tab | 21:34 |
| Alklomion | text/ascii | 21:35 |
| mithro | and you just did a fresh checkout right? | 21:35 |
| Alklomion | I've no idea why it keeps putting it in that format either | 21:35 |
| Alklomion | yep | 21:35 |
| mithro | hrm... | 21:36 |
| mithro | WTF, I just did a fresh checkout using tortoisecvs and it's showing as binary here | 21:36 |
| Alklomion | *chuckle* | 21:36 |
| mithro | okay | 21:37 |
| mithro | can you remove every local version you have | 21:37 |
| mithro | then | 21:37 |
| mithro | do a fresh checkout into a totally different directory | 21:38 |
| mithro | on the git front | 21:38 |
| mithro | you should have three panels, a red one, a green one and a yellow one | 21:38 |
| mithro | go to the "branch" menu and click create | 21:38 |
| mithro | then click on the "Match Tracking Branch Name" in the "Branch Name box" | 21:39 |
| mithro | in the Starting Revision box | 21:39 |
| mithro | click the "tracking Branch" | 21:39 |
| mithro | and select origin/master | 21:39 |
| mithro | then click create | 21:39 |
| mithro | Alklomion: that all okay? | 21:41 |
| mithro | JLafont: ping? | 21:41 |
| Alklomion | mithro: done, should i see anything change? | 21:43 |
| mithro | not quite yet | 21:43 |
| mithro | then go | 21:43 |
| mithro | Branch -> CHeckout | 21:44 |
| mithro | and select the midp branch and click checkout | 21:44 |
| Alklomion | so change to tracking branch then origin/midp? | 21:44 |
| mithro | no | 21:44 |
| Alklomion | there's no midp, only master | 21:45 |
| mithro | did you just create the branch as I mentioned above? | 21:45 |
| Alklomion | yep | 21:45 |
| mithro | oh wait | 21:45 |
| Alklomion | needed to name it too? | 21:45 |
| mithro | "and select origin/master" should have read "and select origin/midp" | 21:45 |
| mithro | :/ | 21:45 |
| mithro | btw - you only have to do this once | 21:46 |
| Alklomion | checked out midp and current branch: midp | 21:46 |
| Alklomion | and whatever git checked out, it checked them out correctly | 21:46 |
| Alklomion | logo and placeholder.png are fine.. and | 21:47 |
| Alklomion | j4me jar is correct | 21:47 |
| mithro | okay | 21:47 |
| mithro | so now make a change to the readme file | 21:47 |
| mithro | then go back to the git-gui and press F5 | 21:47 |
| mithro | you should now need "README" in the red box | 21:48 |
| Alklomion | yep | 21:49 |
| mithro | is you select the README | 21:49 |
| mithro | you should see a diff in the yellow box | 21:49 |
| mithro | right? | 21:49 |
| Alklomion | yep | 21:50 |
| Alklomion | after the setup, this actually seems nicer than tortoise :) | 21:50 |
| mithro | okay, now right click on the stuff in the yellow box and do "stage hunk for commit" | 21:50 |
| mithro | and it should now have moved to the green box | 21:51 |
| Alklomion | yep | 21:51 |
| mithro | Now you type a commit message into the "Commit message box" | 21:51 |
| mithro | and then click the commit button | 21:51 |
| Alklomion | yep | 21:52 |
| mithro | unlike tortoise, committing is a local operation, we don't see the change until you click the "push" button, you can commit a whole bunch of stuff locally before pushing | 21:52 |
| mithro | git-gui is kind of like a "review" process | 21:53 |
| mithro | it lets you see what you have changed | 21:53 |
| Alklomion | aah | 21:53 |
| mithro | and select only specific bits for commit | 21:54 |
| mithro | say for example you accidently made a change to README | 21:55 |
| mithro | you can go to the | 21:55 |
| mithro | Commit->Revert Changes | 21:55 |
| mithro | to restore back to the last committed version | 21:55 |
| mithro | make sense? | 21:56 |
| mithro | did you want to try pushing? | 21:56 |
| Alklomion | sure | 21:56 |
| Alklomion | so If i go to commit -> revert changes, all changes are reverted? | 21:57 |
| mithro | I think only the selected file will be reverted | 21:59 |
| mithro | once you have committed something it's a little harder | 21:59 |
| mithro | you have to go "Repository -> Visulize midp's History" | 22:00 |
| mithro | which brings up a local version of git-web like tool | 22:00 |
| CIA-33 | Brendan libtpproto-java-midp * rad2e7ebde101 /README: Readme changed to test the git-ui client for windows. | 22:03 |
| mithro | yay! | 22:04 |
| Alklomion | I should head off, I've got some uni work to get out of the way, then I might get to do some project work over the weeked, woo | 22:21 |
| Alklomion | see ya | 22:21 |
| Alklomion | cheers for setting up git client for me | 22:21 |
| *** Alklomion has quit IRC | 22:21 | |
| mithro | JLafont: ping? | 22:59 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!
