forge

mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00

Go to file

Hans Mackowiak a048ab3327 Merge branch 'assorted-fixes' into 'master'

Fixed CardState#copyFrom copying non-intrinsic abilities, minor card fix (Nissa, Steward of Elements)

See merge request core-developers/forge!148

2018-01-26 14:13:22 +00:00

.settings

Normalize line endings

2017-12-28 23:40:29 -05:00

forge-ai

- Don't order cards from Discard<0/Hand> if there's only one card going to graveyard.

2018-01-24 16:53:30 +03:00

forge-core

Merge branch 'patch-2' into 'master'

2018-01-26 01:51:30 +00:00

forge-game

- Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability).

2018-01-26 09:16:13 +03:00

forge-gui

- Fixed Nissa, Steward of Elements references and AI logic.

2018-01-26 13:36:48 +03:00

forge-gui-android

- Preparing Forge for Android publish 1.6.6.002 [hotfix].

2018-01-23 11:05:17 +03:00

forge-gui-desktop

TextUtil isn't needed here.

2018-01-21 04:46:22 +00:00

forge-gui-ios

- Preparing Forge for Android publish 1.6.6.002 [hotfix].

2018-01-23 11:05:17 +03:00

forge-gui-mobile

- Preparing Forge for Android publish 1.6.6.002 [hotfix].

2018-01-23 11:05:17 +03:00

forge-gui-mobile-dev

Manually update Pom files and release changes to be ready for next release

2018-01-15 13:57:46 -05:00

.checkstyle

In Eclipse, turn on CheckStyle plugin checks for any file opened in the editor, even if it is already in synch with the repository.

2011-08-28 13:42:22 +00:00

.classpath

fix eclipse issues

2013-11-08 18:39:59 +00:00

.fbprefs

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitattributes

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitignore

Update CHANGES.txt for release 1.5.57.

2016-10-27 02:43:15 +00:00

.project

- Reverted accidental commit of project file.

2014-11-01 14:40:31 +00:00

AppIcon.png

Work towards getting Android app to run

2014-04-23 22:02:51 +00:00

pom.xml

Manually update Pom files and release changes to be ready for next release

2018-01-15 13:57:46 -05:00