Stefan Zermatten 042b67dd77 Fixed merge conflict

2016-12-20 13:58:32 +02:00

..

.meteor

Fixed merge conflict

2016-12-20 13:58:32 +02:00

client

Merge branch 'update-meteor-1.4' into update-meteor-1.4-polymer-1.0

2016-12-20 13:57:56 +02:00

lib

Added 'if' function for math.js to use whenever eval-ing input

2016-05-03 14:44:40 -05:00

Model

Merge pull request #40 from ThaumRystra/feature-coins-inc-default

2016-03-09 14:17:23 +02:00

packages

Removed Polymer 0.5, started implementing Polymer 1.0

2016-10-03 13:00:27 +02:00

private/changeLogs

Bumped changelog for webcomponentsjs update

2016-12-08 09:55:07 +02:00

public

Chrome 54 broke transitions again

2016-10-17 14:51:24 +02:00

Routes

Added fast render support to routes which have subscriptions

2015-10-13 08:22:00 +02:00

server

Removed useless Kadira

2016-12-08 13:52:04 +02:00

tests/mocha/server

Implemented a javascript code style

2015-04-22 12:44:25 +02:00

.bowerrc

Implemented Features and Items granting effects, actions, attacks and spells

2015-01-06 12:25:58 +00:00

.gitignore

Added bower

2016-09-07 10:04:21 +02:00

bower.json

Merge branch 'update-meteor-1.4' into update-meteor-1.4-polymer-1.0

2016-12-20 13:57:56 +02:00

config.vulcanize

Merge branch 'update-meteor-1.4' into update-meteor-1.4-polymer-1.0

2016-12-20 13:57:56 +02:00

package.json

Upgraded meteor

2016-12-08 13:51:35 +02:00