Travis Weston f2b8ad6268 Merge remote-tracking branch 'upstream/master' into issue115 ...

Conflicts:
	script/outside.js
	script/path.js

2015-02-10 07:11:10 -05:00

..

events

Merge pull request #222 from anubisthejackle/issue80

2015-02-09 19:37:10 -05:00

Button.js

suite des trads

2014-02-07 18:26:03 +01:00

dropbox.js

Merge pull request 104 - Dropbox connector.

2014-07-16 18:57:50 -04:00

engine.js

Merge remote-tracking branch 'upstream/master' into issue115

2015-02-10 07:11:10 -05:00

events.js

Merge pull request #222 from anubisthejackle/issue80

2015-02-09 19:37:10 -05:00

header.js

Adding ADR to Github

2013-07-03 07:56:13 -07:00

localization.js

Add 'not enough sulfer' and 'bayonet' to localization

2014-10-28 09:58:14 -04:00

notifications.js

Low-risk fixes suggested by JSHint.

2015-02-09 19:20:29 -05:00

outside.js

Merge remote-tracking branch 'upstream/master' into issue115

2015-02-10 07:11:10 -05:00

path.js

Merge remote-tracking branch 'upstream/master' into issue115

2015-02-10 07:11:10 -05:00

prestige.js

Prestige shouldn't contain decimals

2014-11-19 23:28:13 -06:00

room.js

Merge pull request #222 from anubisthejackle/issue80

2015-02-09 19:37:10 -05:00

scoring.js

Update scoring.js

2015-01-28 21:58:36 +02:00

ship.js

suite des trads

2014-02-07 18:26:03 +01:00

space.js

Merge pull request #222 from anubisthejackle/issue80

2015-02-09 19:37:10 -05:00

state_manager.js

Add in doubleTime capabilities

2015-02-09 19:31:24 -05:00

world.js

Merge pull request #222 from anubisthejackle/issue80

2015-02-09 19:37:10 -05:00