Skip to content

Develop #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
Parent: Errors and new API
merged 50 commits into from
Sep 18, 2015
Merged

Develop #104

merged 50 commits into from
Sep 18, 2015

Conversation

@acostarelli
Copy link
Contributor

updating errors

Zomis and others added 30 commits August 20, 2015 13:54
@Zomis
fixed Node.JS link markdown
99d5473
@Zomis
changed action buttons on cards to use <button> instead of `<input>…
f42661c 
…`, also added some classes to them
@Zomis
making the player-actions float left, to avoid jumping all other elem…
6475478 
…ents up and down which causes an annoying effect
Removed line breaks that were adding blank spaces on buttons
6c90055
merge changes from develop
c702e86
Converted a // ine comment to CSS syntax
8beea7a
@Zomis
Merge branch 'sections-layout' into develop
232f103
Fixed PICNIC issues.
e0c6453
@Zomis
Merge branch 'sections-layout' into develop
81489fa
@Zomis
added /test page to quickly test things about cards (such as the temp…
1f10486 
…late)

uses hard-coded card properties from `src/test/controller.js`
@Zomis
added more properties to test card
1cf559f
@Zomis
started to add animation support (work in progress)
9afb464
@Zomis
fixed up card-template. Matching divs correctly, using NG directive w…
472c2e6 
…ith replace
@Zomis
added animations for cards coming and going (animating opacity and he…
22dcbfa 
…ight)
@Zomis
working on adding an animation for when health changes
baac9e5
@Zomis
added health animations
82d548b
@Zomis
changed animation approach. removing the DOM element and the animatio…
2f062bf 
…n attribute in the model as soon as animation has ended
@Zomis
fixed 404 error for ngFitText
042bea8
removed hacky hack and fixed grammar in readme.md
42eac14
changed occurences of ^1.4.3 to 1.4.3 (without the ^) in dependencies
2722aa9
removed card_model.html spoof
85a00f7
card action section has been made, but alignment is wrong - opened is…
59de8b3 
…sue #80
add colored borders and started formatting divs
8d6ae3a
Removed colored borders and other inline css artifacts
884e25b
move player actions button into player info div, add CSS classes for …
4b50e78 
…zones
added height to sections
b6185a3
Move targetable player name into player info box, other small CSS adj…
0f48169 
…ustments
More work on alignment
11fdd3d
First satisfyingly playable game board so far
9798ae3
Removed border guidelines, small CSS adjustments, including a 10px ma…
c730210 
…rgin below each card, so the card below it doesn't overlap the action buttons
Francis Veilleux-Gaboury and others added 20 commits August 27, 2015 21:48
Everything is where it should be for the game to be playable. Added s…
123dc48 
…ome borders and colors also, for better visual look. Let's deploy this to live, shall we?
Added files and links for favicons in www/ for some reason they are n…
4aabbc9 
…ot displaying correctly on the page
add slash in front of image links
ae40571
@Zomis
Merge pull request #77 from The-Quill/develop
83c10e9 
removed hacky hack and fixed grammar in readme.md
@Zomis
Merge branch 'sections-layout2' into develop
3b3bffe
@Zomis
Merge branch 'game-board' into develop
39d9f73
Added images for Chinese cardset
f9456d1
@Zomis
Merge branch 'develop'
be991f4
@Zomis
Merge branch 'card-images' into develop
653f4e4
@Zomis
player-specific action buttons checks the player to determine visibility
4dcb224
@Zomis
fix a problem in moveCard (ZoneChangeMessage handler) when source z…
e933945 
…one doesn't exist
Added mythos/hindu/ images
75746d0
Merge branch 'card-images' of https://github.com/Cardshifter/HTML-Client
a0c5377 
 into card-images

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge remote-tracking branch 'origin/card-images' into card-images
65478a5
@Zomis
fixed issues with cards not found when UpdateMessage is sent before C…
6b84fe4 
…ardInfo, addressing #84
Add mythos/greek image files
91b0a58
Cropped bear.jpg correctly
60646a6
images/cards/mythos/common
4998a8d
merge card-images into develop
3664d72
@sirpython
only tries to display "from" in a chat message if it exists, cleaned …
c5f4041 
…up chat error grammar

Before, the error messages that are shown in chat from not selecting an opponent and/or a game type before using deck builder or staring a new game, the "from" field of the message would try to be displayed, so a funky space and a : would be shown in it's place. This is no longer there.
acostarelli pushed a commit that referenced this pull request Sep 18, 2015
@sirpython
Merge pull request #104 from Cardshifter/develop
a1b9848 
Develop
@acostarelli acostarelli merged commit a1b9848 into errors Sep 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@acostarelli @Zomis @sirpython