« first day (115 days earlier)      last day (3746 days later) » 

01:32
@Phrancis Yeah just got your message!
And thanks for the edit
:)
This is not working @Marc-Andre
code {
    font-family: Monaco, Consolas, Courier New;
    font-weight: normal;
    background-color: #FFFFFF;
}
Background remains light-red on using <code>
I don't know if <code> uses something special
Do you have a live site that I could "debug" ?
Hm, let me commit it real quick, then I will
good thanks!
I hate almost 900 changes to pull from cardshifter.github.io (the website)... wtf
Looks like my local files were behind on updates of my local files. Whatever.
01:45
> Initial commit
> Hello World
What the...
> Saved and tested Bootstrap files.
> Restored dashboard.css file
> Made a template, and made Bootstrap query a CDN instead of storing local files.
> Integrated left nag menu
> Added Jay art images
> Created index.html file and made a few tweaks to CSS
> Made changes to CSS and HTML
> Website layout much improved.
> Small adjustments
> Added Excel file for contributor roles
I think it's right, now... @Marc-Andre
> Small fix on Excel doc
> Changes to how web page is displayed.
> Fixed some formatting
> Merge branch 'develop' of https://github.com/Cardshifter/Cardshifter into develop

# By Simon Forsberg (518) and others
# Via Simon Forsberg (63) and others
* 'develop' of https://github.com/Cardshifter/Cardshifter: (806 commits)
fixed sporadious bug in game test. Fixes #134
Renamed `CannotUseUnknownCards` to end with `System`
corrected `CannotUseUnknownCards` system
Fixed typos in exception messages in the XmlCardLoader class.
Removed debug strings in the XmlCardLoader class.
A...
dded CardInfo root element to all XML files, closes #136.
truncating the effect string to fix bad alignments
Spells now show their effect text. Currently this causes alignment issues because it is a long string of text
Added extra tests to verify that attributes are properly supported in the card loader, closes #130.
Added card id to the exception message when an error occured in the card loader.
A bug has been solved where inputting an integer value in an attribute field would caus...
e the field to be treated as a resource.
Disallowed different cards having the same id.
Fixed bug where a NPE could occur if ECSAttributeData was working with null elements.
The <Name>, <Image> and <CardType> tags are no longer mandatory on cards, instead an <Id> tag is now mandatory.
Fixed bug where a NPE could occur if ECSAttributeData was working with null elements.
Added javadoc to the getFor default method of ECSResource and ECSAttribute.
Added default methods to ECSResource ...
and ECSAttribute to obtain that resource or attributes value from an entity.
Refactored DeckBuilderWindow as per my Code Review answer: http://codereview.stackexchange.com/questions/68923/hearthstone-style-deck-stats-for-tcg/68958#68958
disabled performIncoming until the functionality is complete
Added initial support for attributes in the card loader.
...
> Fixing formatting stuff
@Duga WTF was that?
01:51
[[Cardshifter/Cardshifter](null)] build #658 for commit [778bd186](null/commit/778bd186c047e3ce4ccadbf8727775b652340a5f) on branch [develop](null/tree/develop) passed
@Phrancis you push to cardshifter/cardshifter ?
@SimonAndréForsberg Did I break something? AFAIK I've been on my website branch the entire time...?
[[Cardshifter/Cardshifter](null)] build #659 for commit [bf583025](null/commit/bf5830255186e0bf18e25125bdf5088e6807c8f5) on branch [develop](null/tree/develop) passed
@Marc-Andre Certainly not on purpose... TBH I have no idea what SourceTree/Git is trying to do right now
@Phrancis well the good thing is that it passed :P
01:53
I've been on cardshifter.github.io/develop the entire time
In any case, @Marc-Andre this is the version I just committed: cardshifter.github.io
yeah I'm on it!
The Inline { code() } is where I was trying to change the color
`code {
font-family: Monaco, Consolas, Courier New;
font-weight: normal;
}`
thats is what I got in cardshifter.css
Hm.
So if you change it to this, does it fix it?
code {
    font-family: Monaco, Consolas, Courier New;
    font-weight: normal;
    background-color: #FFFFFF;
}
#F9F2F4 and #FFFFFF are almost the same color if I'm not mistaken
One is white and the other one is white with a bit of red
02:03
...
0
Q: CSS Code styling - background color is missing on empty lines

PaulI'm hoping this is simple. I'm not a CSS guy. I'm trying to make some code look a little better on a blog and I have the following <code> CSS style. code { display: block; white-space:normal; background-color: #eeeeee; font: 1em, 'Courier New', Courier, Fixed;...

@Phrancis html-color-codes.info try to see the difference there
If you use FFFFFF it's merging with the background color of the site
That's what I had intended to do, is that causing the issue?
@Phrancis Well if you add the background in the css of cardshifter it should work
02:20
@Marc-Andre Did it work for you?
Looks the same to me...?
Oh wait no
it's white
02:34
Doesn't seem to be working on my machine D:
linux say hello
can you commit your code
please :D
AWWWWWWW
I thought I already did
At least to develop... should I push to master?
the sit=e is sync with master i =think
soryy im limited on my keyboard atm
Is that what they call cat-typing?
02:47
[Cardshifter/Cardshifter] Phrancis pushed 15 commits to master
> Removed Jay artwork folder
> Merge branch 'develop'
> Merge branch 'develop'
I got my fingers crossed that I did not break the repo... but @Marc-Andre hopefully this works
> Merge branch 'master' of https://github.com/Cardshifter/Cardshifter

# By Simon Forsberg (394) and others
# Via Simon Forsberg (49) and others
* 'master' of https://github.com/Cardshifter/Cardshifter: (609 commits)
updated travis configuration to release 0.4
Updated version to 0.4
Removed @Deprecated on a method in CommandHandler, as it is still useful
Removed "SIMPLE" game mode
Made it possible to dynamically add systems, fixes #99
Made it possible to remove systems when game i...
s running
Modified initial life in PhrancisGame to 30
Added new game mode where damage is accumulating for each turn
Added MAX_HEALTH resource to PhrancisGame
Added system to heal taken damage at end of turn
Added a new Attack style system that accumulates damage
Added `findSystemsOfClass` and `removeSystem` to ECSGame
First player no longer draws an extra card
Fixed crash in ServerConnectionTest
Client now outputs a chat message when someone else has disconnected
Fixed bu...
g where Server would not realize a client has disconnected
Added date-time stamp to lobby chat messages. Fixes #89
Fixed inf-loop in ServerConnectionTest
Fixed client stuck in an inf-loop when server is shut down. Improves #70
Server is now shutting down properly. Fixes #82
...
[[Cardshifter/Cardshifter](null)] build #660 for commit [f0c5fd0d](null/commit/f0c5fd0d707c57934ef220fbeea369791ac5d626) on branch [master](null/tree/master) passed
ill work on the develop branch
I was sure you were working on the cardshifter-io website repo and not cardshifter
So was I... Now I'm perplexed...
Lol you may have break something :p
02:58
Well. If I did... Whoops...
2
TTGTB. Patting myself on the back for having achieved nothing and potentially broken something... Night @Marc-Andre
Night @Phrancis
03:21
@Phrancis My cat did go to sleep too
 
4 hours later…
07:47
@Phrancis @SimonAndréForsberg might need some cleaning up to do on the develop branch!
@Marc-Andre That's cute!
@Marc-Andre Also is that a Corsair K90 with Blue Cherry MX switches?
(The keyboard, not the cat)
 
4 hours later…
11:23
Monking
@Phrancis I think I know what you have done. I think you have changed the remote url for the website repo to the url for the main repo.
hey @SimonAndréForsberg
no work today that is?
I am at work, but at lunch break :)
so essentially, the website repo has been merged into the main repo.
I will fix this mess when I get home
@SimonAndréForsberg Ah okay, nice :)
I looked at it briefly this morning, it's a real mess, right?
@Phrancis Most importantly, in your website repository do git remote set-url origin https://github.com/Cardshifter/cardshifter.github.io.git
@skiwi I think it might look messier than it is. But the mess that is there is undoubtedly real :)
It should be able to saved with some hard resets..
Ah, end of class, it is
11:28
@Phrancis whenever you have that many changes to pull, there is an indication that something is wrong!
@Phrancis @Marc-Andre The site is syncronized with master yes, but Cardshifter/cardshifter.github.io, not Cardshifter/Cardshifter.
When something doesn't look right in a git repo, it is most likely because it is not right.
In this case, git remote set-url origin https://github.com/Cardshifter/cardshifter.github.io.git should fix the main problem.
@Phrancis Do the git remote command I mentioned above and afterwards push again.
by the looks of the network graph of the website repo, there hasn't been a recent commit to it lately.
I'm starting to think that one of the most important git skills to have is to be able to know how to read a network graph...
@Phrancis Mess has been cleaned up. Now please use the git remote set-url command to not create the mess again :)
11:44
[[Cardshifter/Cardshifter](null)] build #661 for commit [34b7dd6e](null/commit/34b7dd6e8637e5fb51fb8c7bcf7e2b7eaeed80fe) on branch [master](null/tree/master) passed
And next time if something doesn't feel right: Stop and inspect the situation. Try to find out why it doesn't feel right.
3
And back for a bit
Looking at the chat here, there are several indications that something wasn't right:
10 hours ago, by Phrancis
I hate almost 900 changes to pull from cardshifter.github.io (the website)... wtf
10 hours ago, by Phrancis
Looks like my local files were behind on updates of my local files. Whatever.
10 hours ago, by Phrancis
What the...
10 hours ago, by Phrancis
@Duga WTF was that?
I think at some point he figured out he fcked up ;)
When something isn't right, STOP. Don't continue making a mess!
11:48
[[Cardshifter/Cardshifter](null)] build #662 for commit [2e8db88d](null/commit/2e8db88d72c23d4409521fc0837af7f937ac34e8) on branch [develop](null/tree/develop) passed
</yelling at Phrancis>
Unfortunately, that was after it happened!
I hope you'll learn from these mistakes, @Phrancis
1 min ago, by Simon André Forsberg
10 hours ago, by Phrancis
I hate almost 900 changes to pull from cardshifter.github.io (the website)... wtf
^^ that was before it happened
In Soviet Russia, commit pulls you.
if that pull wouldn't have been made, no mess would be made
This is not, nor will it ever be, Soviet Russia.
the mess was quite easy to clean up though
Now, BTW.Work as Malachi would have said.
 
2 hours later…
13:40
@SimonAndréForsberg Sorry :(
hey @Phrancis
Thanks for being so patient with me, all this is so new to me... I'll go ahead and do what you said and make it a point to pay attention for signs and check with someone here first if something looks odd
Hey
@SimonAndréForsberg :
Francis-Veilleux-Gabourys-MacBook:Cardshifter francisveilleux-gaboury$ cd /Users/francisveilleux-gaboury/cardshifter.github.io
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git remote set-url origin github.com/Cardshifter/cardshifter.github.io.git
@skiwi Cooler Master CM Storm Quickfire Ultimate Full LED Backlit Cherry Blue
I won't touch anything in the repo until tonight (10 hours or so) if there is anything else I need to do let me know
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean
@Marc-Andre Hmm ok, it looks very similar to the Corsair one
My bad, I have the K70
13:50
I switched to develop. Should I make it a point to use the console as much as possible and mostly just use SourceTree to look at the history and not push/pull stuff from there?
@Marc-Andre google.com/…
The bottom part is removable
@skiwi It's really similar but my cable is a mini usb instead of being directly linked.
They are very similar!
I am not going to push this, but I'm curious why the console says I'm up to date but SourceTree shows 1500+ changes to push...
2
But, TTGTW (yay) I'll log back in from there in a bit
13:59
@Marc-Andre Yup.. hence I was thinking ;)
14:41
And... back
welcome back
@Phrancis 1582 to push is not looking good... at all
It looks like you're ready to push Carshifter/Cardshifter in Cardshifter/cardshifter.github.io
I figured as much. Should I rule it out to a problem with SourceTree?
15:07
hey @all
Hey @bazola!
hey @bazola
my most recent mage deck won 7 in a row! down to rank 14 now
Nice!
@Phrancis I like the command line for pushing and pulling, and use the GUI to view the changes to the code
15:12
I think that's what I'm going to start doing, I got click-happy last night and f'ed up :o
@Phrancis 900 commits is like every commit for the history of the project
Damn
15:36
@Marc-Andre Did you make any changes to the website template?
@Phrancis No I've done nothing else than debug when you had questions
I see. Do you think the template is "clean" enough to start adding some actual content?
I need to fix the naming stuff again since I messed up, I'll do that tonight
Actually, I might just do it today since it's looking like it will be a boring day
15:57
Sure the template looks clean enough! Move the content of index in a template-preview.html so you can always have a view of what it looks like. And index will now be an actual index :P
16:14
Yeah that's the plan
Then you're good to go!
16:41
  <div>
    &copy; Copyright <script>new Date().getFullYear()>2014&&document.write("-"+new Date().getFullYear());</script>, Cardshifter.
  </div>
@Marc-Andre I can't seem to get this to work...
Can you add a bit on what is not working ?
> © Copyright , Cardshifter.
I'm trying to get it to display the current year
> © Copyright 2014, Cardshifter.
^^ Like that
Well why do the JavaScript is suppose to do ?
I'll be back in 30 minutes! Jsut leave me a description of the problem and I'll help when I get back.
Sure
I had originally wrote it like this, which hid the fact that it did not work:
<br />&copy; Copyright 2014<script>new Date().getFullYear()>2014&&document.write("-"+new Date().getFullYear());</script>, Cardshifter.
The idea was to avoid going into every page when the year is 2015 and change the footer manually
17:08
@Marc-Andre It's taken care of
in The 2nd Monitor, 9 mins ago, by CodeX
@Phrancis try this: <script type="text/javascript">var year = new Date();document.write(year.getFullYear());</script>
17:26
@Phrancis nice ! I wanted to know exactly what you were trying to achieve!
I think my CSS got pretty much all bases covered, what do you think @Marc-Andre ?
I've used things like this to position stuff, I think that's good
div.copyright {
    padding-top: 20px;
    padding-left: 15px;
}
Hello dear savior @SimonAndréForsberg
4
looks good to me!
Monkernoon
@Phrancis Using the console instead of sourcetree might increase your knowledge of git.
@Phrancis You are right that something is indeed wrong right now, when it says that you have 1500+ commits to push. I think I know how we can solve this...
@Phrancis do this: git log --branches --graph --decorate --oneline and copy one screen of the output and show me.
It'll have to wait until tonight I'm at work currently
If you have a set of instructions you're welcome to email them to me instead of posting here though
17:42
You think email bots are not smart enough to read that? ;)
Bah, I got a good spam filter ;p
I am not 100% sure how to fix it yet, but this SO answer seems relevant:
107
Q: How do you remove a specific revision in the git history?

1800 INFORMATIONSuppose you git history looks like this: 1 2 3 4 5 Where 1-5 are separate revisions. You need to remove 3 while still keeping 1, 2, 4 and 5. How to do it? Is there an efficient method when there are hundreds of revisions after the one to be deleted?

In this case we need to remove two commits: The one which merges Cardshifter/master into cardshifter.github.io/master, and the same for develop.
18:00
Should we make a Twitter account for Cardshifter?
I would at least reserve the name if possible
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@StackCodeReview" />
<meta name="twitter:domain" content="codereview.stackexchange.com"/>
Can you check if it's available? I can't from here (blocked)
TFL
There is a Carshift but I did not find Cardshifter
18:17
Think you can nab it?
Or I can from home tonight
Great, now I'm a person without profile picture on FB...
I should really just take one
Decided it probably isn't that professional if you have a picture of you at an army base holding a gun ;-)
2
And when deleting it, I realized that I had uploaded it on 11 September 2011
I feel hearthless now
18:34
@SimonAndréForsberg I noticed the pinned post with the links has become unpinned
@Phrancis it does that every 2 weeks. me fix
18:53
What's this Waffle thing?
Oh I see now, an issue manager. Nice
@Phrancis yes, directly linked to the github issues. Changes on one place reflects the other
> Template is done.
> The landing page needs to have interesting content with a high-level overview of the project, and links to some other sections of the site. It needs to be concise and attractive.
> Self-explaining
19:36
@SimonAndréForsberg When did the work on this Cardshifter project begin, approximately?
@Phrancis I assume when the first messages started to appear in the chatroom?
I was looking for when the Cardshifter repo was created but could not find that
@Phrancis At the time of the first commit that should be
19:54
Think you could tell me real quick @skiwi? This stupid browser is taking forever to look through pages and pages and pages of commits
@Phrancis I think that was august 17
commit 268ce636453c878ec2509b0f6e755fcb26007f83
Author: Zomis <[email protected]>
Date:   Mon Aug 18 11:30:31 2014 +0200

    Initial commit
When in doubt, ask git.
This chat room was created on August 1st.
20:10
August 1st feels like ages ago
@all Thoughts on this ^^ so far? Sorry the layout is borked
@Phrancis I'm not sure if we will use JavaFX for mobile and tablets. We might go with LibGDX for that. (I think that's what me and @bazola prefers, correct me if I'm wrong @bazola). I'm not completely sure how @skiwi feels.
You might want to mention something about the moddability aspect of it
i don't yet see a way to use JavaFX for mobile or tablets, so libGDX is pretty much the only choice apart from directly porting to iOS (or Android or GWT)
Moddability is next :)
I have also not yet seen much proof of JavaFX for mobile or tablets.
20:15
Going to make several other headers with buzzwords and a short explanation
Is it spelled LibGDX or libGDX, officially?
ok, cool
libGDX, apparently.
I have not yet thoroughly tested Java 8 and libGDX though. I think some aspects of it will work (LAMBDAS!) but some will not (stream API, time API...)
Do you all think the paragraph text should be slightly bigger?
I think it's OK as-is.
@all Thoughts on moddability?
(and also any other buzzwords you would like to see)
20:30
@Phrancis sounds reasonable for now
The link does not show in the browser as I hover over the buttons (unlike the other links) is this the correct way of doing this, or should the <a> but outside of the <button>?
    <div style="padding-top: 5px;">
      <button type="button" class="btn btn-success csh-button"><a class="csh-nav-link" href="mods.html">Learn more »</a></button>
    </div>
@SimonAndréForsberg don't have any particular feelings about it at this moment
aka I'm fine with it
ok, thanks @skiwi
@Phrancis Not sure but I think you can just make it a <a href="mods.html" class="btn btn-success csh-button">Learn more</a>
I.e. not have a <button> element, just have it a button by using the CSS classes for buttons.
20:49
Hah that worked, handy. Let me update my template too, then
21:09
> In college you procrastinate, spend a lot of time on computers, and pay a lot of money to do so. In adult life you procrastiante, spend a lof of time on computers, and get paid. Adult life > College, IMO
21:22
^^ That
21:40
@all I'm thinking of leaving it at that for now on the home page
@Phrancis Not sure if the headers should end with dots
TTGTB though!
On the last section, the blue button goes to Github repo, the green one comes here to the chat room. Not sure if that's idea or not.
Night @skiwi
@SimonAndréForsberg is target="_blank" still used in modern HTML? Is there a better CSS way to do it?
22:22
> Page is made and will be committed tonight.
> This page will contain details about the different tools and technologies used to put the game together. Will need assistance from @SimonAndréForsberg and @bazola principally. It will also contain links to external pages about the various technologies.
> This page will contain various (voluntary) information about the project contributors, including links to profile on Github, StackExchange, Twitters or whatever else is desired, as well as a summary of the type of work each participant contributes to the project.
> This page will contain information about modding in general, and about the only current mod, Cyborg Chronicles. General instructions (as they are made available throughout development) will be added. Eventually, this page should become its own sub-site with a detailed guide about modding.
> This page should give potential contributors some information about the various ways they can become involved in Cardshifter, including:
- Playing the game
- Contributing to the repo(s)
- Joining the chat room
- Reporting bugs & requesting features
- Modding (linking back to the mods.html page)
That should be enough issues to keep me occupied for a while ;)
23:17
TTGH

« first day (115 days earlier)      last day (3746 days later) »