Coding Projects and Duga Heaven :)

« first day (166 days earlier) ← previous day next day → last day (3694 days later) »

Duga

00:01

RELOAD!

[Vogel612/JavaBot] 7 commits. 0 issues opened and 0 closed

[skiwi2/HearthMonitor-LogReader] 3 commits. 0 issues opened and 0 closed

[retailcoder/Rubberduck] 3 commits. 0 issues opened and 0 closed

[Cardshifter/Cardshifter] 8 commits. 0 issues opened and 0 closed

[Cardshifter/cardshifter.github.io] 1 commits. 0 issues opened and 0 closed

[Cardshifter/cardshifter.github.io] Phrancis pushed commit ca04b959 to develop

> Fixed Prettify issue, added more code examples

Phrancis

@Marc-Andre See ^^ Prettify is working correctly now. Time to play around with CSS :D

1 hour later…

Marc-Andre

01:08

@Phrancis nice!

I still can't solve my issue on my end

Phrancis

Try StackOverflow maybe?

Marc-Andre

01:31

maybe

I'll try it!

tomorrow :P

Duga

01:51

[Cardshifter/cardshifter.github.io] Phrancis commented on issue #19: Start testing Google Code Prettify

> Got Prettify to work and pushed it today. Now to test making a customized style.

Phrancis

02:42

So, I need to learn how to resolve Git conflicts now... :

> Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Untracked files:
(use "git add <file>..." to include in what will be committed)

prettify-test/

nothing added to commit but untracked files present (use "git add" to track)
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git merge develop

Was trying to merge develop into master, it's not letting me... anyone?

6 hours later…

skiwi

08:35

@SimonAndréForsberg On a 10.1 inch tablet it played fine though a bit smallish, but that's an old tablet and it can barely run it (takes about 2 mins to load a game?)

3 hours later…

Simon André Forsberg

11:34

inside the conflicted files you will notice some lines like this:

<<<<<<<<<<<<xxxxxxxxxx
yadayada
=================
yadayadayada
>>>>>>>>>>>xxxxxx

the top of ========= will show one version, below it will show another.

remove the <<<<<<<<<<<xxxxxxxxx and >>>>>>>xxxxxxx lines, and decide what version of the file you want to keep. fix the file up so that it looks the way it is supposed to.

then add the file to the staging area, then commit (as usual)

@skiwi it is the "smallish" part that I'm complaining about.

skiwi

@SimonAndréForsberg Yeah, but on what inch tablet did you play?

Simon André Forsberg

@skiwi 7 inch

skiwi

That probably explains, I don't think that's exactly playable

1 hour later…

Simon André Forsberg

12:45

it's playable...

Duga

12:56

Monking!

Test

Marc-Andre

Morning everyone!

2 hours later…

Phrancis

14:51

Morning!

Marc-Andre

Hey @Phrancis !

skiwi

hey @Phrancis

Phrancis

@SimonAndréForsberg Will it be in the conflicted files on master or on develop?

Simon André Forsberg

15:19

@Phrancis they will be merged

Phrancis

I'm not sure I'm following :(

I don't have access to the files ATM though (at work) so maybe I'll talk to you about it again later

skiwi

I'm done!

►

Simon André Forsberg

@skiwi done with what?

skiwi

15:35

University project

With a group

Simon André Forsberg

@Phrancis it is a "merge conflict", the conflict happened when you tried to merge two branches. now you will resolve the conflict and therefore choose how the result should be.

skiwi

Now I can finally ~~play HearthStone all day!~~ program again

Simon André Forsberg

Was it the Unity project, @skiwi? Looks impressive.

skiwi

Yup @SimonAndréForsberg, that's Unity

With a load of work done in the last days...

Most of it is peer-programmed via Skype ftw

github.com/Frankly-Three/Serious-Game/commits/master

1. Close Unity 2. Never touch again (jk)

Unity has a load of weird quirks though

HearthStone is also made in Unity, you know?

bazola

@skiwi looks good!

skiwi

15:49

@bazola Assets wasn't really what I've done, but still thanks :)

Marc-Andre

@skiwi Are you the one playing in the video ?

skiwi

Yea.. I was literally playing bad there, but it's nice that you see that kind of stuff in a video

One where I would speedrun in 17 seconds would be a bit boring :P

Phrancis

@skiwi That's pretty freaking cool!

Simon André Forsberg

@skiwi yup, I know

Marc-Andre

16:04

@skiwi Yeah I hope it was intentional :P ahaha My first thought was how one of the dev could have a difficulty playing his own game :P on such an easy level :P !

skiwi

16:15

@Marc-Andre It actually wasn't! It's a hard game

Marc-Andre

@skiwi You made it look easy then :P

Duga

16:47

[Zomis/Connecting-Blocks] Olleorm starred us

skiwi

@Duga Who is that? @SimonAndréForsberg

Phrancis

17:00

Must be a new user, their only repo is empty and no activity

Simon André Forsberg

17:19

@skiwi a friend of mine who is learning programming

Marc-Andre

17:42

I got the feeling that you're converting all your friends to programming :P

Phrancis

@SimonAndréForsberg Are they learning JAVA?

skiwi

@SimonAndréForsberg Aw, still no random users :p

Duga

18:11

[Vogel612/testclient_javabot] Vogel612 pushed commit 87610f4b to development

> Added ASL 2.0 to the repository and added LICENSE and NOTICE, see #5
- also applied license through additional README section.
- TBD: Explicitly license MessageTracker under CC-BY-SA

[Vogel612/testclient_javabot] Vogel612 pushed commit 5dcb2f42 to development

> Removed obsolete Timestamp-class

[Vogel612/testclient_javabot] Vogel612 pushed commit 978eb6fe to development

> Added javadoc to public core API

Phrancis

@Marc-Andre See this?

Duga

[Vogel612/testclient_javabot] Vogel612 pushed commit c3f18dca to development

> Added CC-BY-SA License and explicit License notice in MessageTracker, fixes #5

[Vogel612/testclient_javabot] Vogel612 pushed 4 commits to master

[Vogel612/testclient_javabot] Vogel612 closed issue #5: Add Licensing to the Repository

[Vogel612/testclient_javabot] Vogel612 added label closed-as:completed to issue #5: Add Licensing to the Repository

Marc-Andre

@Phrancis ncie

nice *

Duga

18:29

[Vogel612/testclient_javabot] Vogel612 pushed commit b3da8bcd to master

> Added CC-BY-SA License and explicit License notice in MessageTracker, fixes #5

Vogel612

hmm... damn windows default encoding..

2 hours later…

Duga

20:08

[skiwi2/HearthMonitor-LogReader] skiwi2 pushed commit ee5f7634 to develop

> Renamed EntryReader to EntryParser.

[[skiwi2/HearthMonitor-LogReader](null)] build #30 for commit [ee5f7634](null/commit/ee5f7634accc03e4240595ff86cf93dcb3712de4) on branch [develop](null/tree/develop) passed

skiwi

@Duga @SimonAndréForsberg null again?

Simon André Forsberg

@Marc-Andre I am doing nothing, they just want to learn :)

@Phrancis not sure yet if it's Java or JAVA. Good question. We will see.

@skiwi I might have deployed the wrong version of @Duga... I will fix after RELOAD!

skiwi

@SimonAndréForsberg Okay, no problem

skiwi

20:55

1 hour later…

Marc-Andre

22:10

@Phrancis You'll be glad to hear that I've finally found my issue and it was soooooooooooooooooooo dumb

bazola

@Marc-Andre thats my favorite kind of bug

Marc-Andre

It was not even in the code, the java builder was ticked off for the project and I don't know why

Simon André Forsberg

@Marc-Andre I hate it when that happens.

Marc-Andre

@SimonAndréForsberg 2 days lost and I've tried a lot of things, but it's the first time it happened to me.

Simon André Forsberg

@Marc-Andre I've had some issues when importing LibGDX gradle projects into IntelliJ some times. Quite annoying.

Phrancis

22:16

@Marc-Andre Hahaha, glad to hear it!

So, what does the app actually do?

Marc-Andre

the wep app ? It will take care of generating the html and all the stuff. So we will be templating all the stuff. The html for the navbar will be in his own file and we will "inject" it in all the page that need it, etc.

Phrancis

That's gonna make it much easier to maintain and update!

When do you expect it will be ready to roll out?

Marc-Andre

Exactly !

Phrancis

(also, are you going to put it up for review? ;-)

Marc-Andre

Depends how fast I can go tonight at replacing the existing stuff, but now that everythings works I will advance that by Sunday I could have finish ;) :D

Sure I will ! But some stuff we be hyper dependant on Spring and I've not seen so much expert here!

Phrancis

22:25

That's awesome

Simon André Forsberg

@Marc-Andre I know Spring quite well, and I think janos knows it well.

Marc-Andre

@SimonAndréForsberg Good then expect to review some Spring code soon

Phrancis

Looks like the monkey does too

Simon André Forsberg

@Marc-Andre yay!

Marc-Andre

I always wanted to have some feedback on the type of configuration I use (no xml )

Phrancis

22:27

Sometimes I wonder if there's anything the monkey doesn't know in programming!

Simon André Forsberg

@Marc-Andre Spring and no XML? Sounds like something I might want to start using!

@Phrancis Monkeys love spring. That's when the bananas are the best.

@Phrancis There's always something you don't know!

Marc-Andre

@SimonAndréForsberg Yep ! Spring web MVC, I'm not sure if the equivalent could be done with a normal Spring project (but I'm positive it could be done)

Simon André Forsberg

to me, Spring Web MVC is "normal" Spring project.

never used it without Web MVC.

Duga

[Cardshifter/cardshifter.github.io] marcandregirard pushed commit 02fccf4a to java-web

> added the home page to the app

[Cardshifter/cardshifter.github.io] marcandregirard pushed commit 4d4ed0d0 to java-web

> Fix the css and other resources not being loaded by the app

Phrancis

Yay, more commits :D

Marc-Andre

22:34

I will fix the html too :P There is a lot of close unclose div and it's weird a bit ! :P

Phrancis

lol whoops.

Marc-Andre

22:49

Yep I break the layout by adjusting the html ... damn :P

Phrancis

Don't break my fragile little layout!!

(especially the Twitter one, that one threw me for a loop)

Marc-Andre

ahaha nah the twitter layout is ok

the main layout though

ouch :P

Phrancis

If it's not broken, ~~don't fix it~~ improve it!

Marc-Andre

Well it was broken :P

Phrancis

Fair enough :p

Marc-Andre

22:53

No in fact it was not broken ... It's just it was not ready to be seperated in smaller element !

bazola

@Phrancis fragile is a bad sign, you want things to be as robust as possible

Phrancis

HTML and robust don't get along very well, often I find ;)

Marc-Andre

BURN

Phrancis

Which section are you trying to fix?

Marc-Andre

Nah it's ok the fault was just me ! Being a long time since I've wokred on the project and I had forgotten how the layout worked. It still a bit not quite what I wanted but I will get better at re-arranging things.

Phrancis

23:03

Going home, back in a bit. I might tinker with Prettify a bit tonight.

Phrancis

23:46

Back

« first day (166 days earlier) ← previous day next day → last day (3694 days later) »

all rooms