Scott Erickson
|
a633f6f82f
|
Built most of the WebGLSprite.
|
2014-09-15 13:53:20 -07:00 |
|
Scott Erickson
|
c96f5d7bcf
|
Merge branch 'master' into feature/webgl
|
2014-09-12 16:33:39 -07:00 |
|
Scott Erickson
|
08bdcb2cb6
|
Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it.
|
2014-09-12 16:33:01 -07:00 |
|
Nick Winter
|
1f6f2ebc94
|
Merge branch 'Titounkle-patch-4'
|
2014-09-12 10:22:43 -07:00 |
|
Nick Winter
|
7a76e9ac77
|
Fixed a couple formatting issues in es-ES.
|
2014-09-12 10:22:32 -07:00 |
|
Titounkle
|
9d731ae80e
|
Update es-ES.coffee
|
2014-09-12 19:06:49 +02:00 |
|
Nick Winter
|
8e55184448
|
Merge pull request #1547 from gutierri/master
translation pt-BR
|
2014-09-12 09:35:29 -07:00 |
|
Gutierri Barboza
|
7ac09d09f3
|
translation pt-BR
|
2014-09-12 13:31:50 -03:00 |
|
Nick Winter
|
d3245948e2
|
Sorting addable Thangs in a sensible order.
|
2014-09-11 13:34:15 -07:00 |
|
Michael Schmatz
|
c08c279f8b
|
Removed net neutrality banner
|
2014-09-11 16:13:06 -04:00 |
|
Nick Winter
|
e9968b648f
|
Fixed bugs with click coordinates messing up mouse-down targeting.
|
2014-09-11 13:05:31 -07:00 |
|
Scott Erickson
|
5551c622fa
|
Added a new test to webgl: making giant canvases.
|
2014-09-11 11:36:26 -07:00 |
|
Nick Winter
|
d5542ffbbc
|
Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open.
|
2014-09-11 11:24:06 -07:00 |
|
George Saines
|
11a734b001
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-09-11 11:08:29 -07:00 |
|
George Saines
|
040b901e41
|
removed merge junk
|
2014-09-11 11:08:25 -07:00 |
|
Nick Winter
|
9eb0dbc625
|
Fixed bug with creating new levels.
|
2014-09-11 10:50:23 -07:00 |
|
George Saines
|
b81288cf52
|
changing volume for some SFX
|
2014-09-11 10:16:56 -07:00 |
|
George Saines
|
f5a4442e8a
|
trying to change SFX volume
|
2014-09-11 09:59:50 -07:00 |
|
Nick Winter
|
8c37fabe79
|
Merge pull request #1537 from Imperadeiro98/patch-1
Update pt-PT.coffee
|
2014-09-11 08:45:36 -07:00 |
|
Nick Winter
|
35e1931fc3
|
Merge pull request #1534 from Titounkle/patch-3
Update es-ES.coffee
|
2014-09-11 08:43:59 -07:00 |
|
Nick Winter
|
ba554f3ff0
|
Fixed some indentation from #1532.
|
2014-09-11 08:43:36 -07:00 |
|
Nick Winter
|
0990a45802
|
Merge pull request #1532 from lukigno95/patch-1
Update it.coffee
|
2014-09-11 08:41:19 -07:00 |
|
Nick Winter
|
68808d0e07
|
Some fixes for how audio is triggered.
|
2014-09-11 08:38:30 -07:00 |
|
Imperadeiro98
|
74afea5efa
|
Update pt-PT.coffee
|
2014-09-11 14:38:11 +01:00 |
|
Nick Winter
|
851ad43b45
|
Made some more User properties private.
|
2014-09-10 21:56:21 -07:00 |
|
Nick Winter
|
f53f6bf0a3
|
Misc changes, wishing I could get sounds to work at lower volumes.
|
2014-09-10 19:55:00 -07:00 |
|
Imperadeiro98
|
10132c6fd1
|
Update pt-PT.coffee
|
2014-09-10 11:02:01 +01:00 |
|
Nick Winter
|
0b1f4ebada
|
Fixed two extra spaces in DE localizations.
|
2014-09-09 18:58:04 -07:00 |
|
Nick Winter
|
4a6077e0f5
|
Merge pull request #1536 from djsmith85/master
Updated German translations (de-DE & de-AT)
|
2014-09-09 18:56:29 -07:00 |
|
djsmith85
|
19d3a6cc9f
|
Updated German translations (de-DE & de-AT)
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
|
2014-09-10 02:57:47 +02:00 |
|
Nick Winter
|
8c0c09fc46
|
Merge pull request #1535 from djsmith85/patch-1
Updated URL for DB backup
|
2014-09-09 14:45:51 -07:00 |
|
Daniel James Smith
|
09bdb66538
|
Updated URL for DB backup
The old url seems to not exist anymore. Found the correct url in the dev-wiki.
|
2014-09-09 23:41:57 +02:00 |
|
Titounkle
|
d9ee5c248d
|
Update es-ES.coffee
Number 219 im not quite sure...I'll think about it.
|
2014-09-09 18:43:28 +02:00 |
|
Michael Schmatz
|
b35a0161e8
|
Inserted Battle For The Net banner
|
2014-09-09 12:34:30 -04:00 |
|
Nick Winter
|
2396f9c26d
|
Updates to go along with latest iPad app spell palette loading.
|
2014-09-08 21:40:52 -07:00 |
|
lukigno95
|
fa7f827fcb
|
Update it.coffee
|
2014-09-09 01:10:24 +02:00 |
|
Nick Winter
|
dd2cdf3ef9
|
Fixed bugs with forking ThangTypes.
|
2014-09-08 16:03:29 -07:00 |
|
Nick Winter
|
c64c391d74
|
Workaround for missing document.location inside child window in Windows Chrome.
|
2014-09-08 14:31:52 -07:00 |
|
Nick Winter
|
8dad2bf12d
|
Fixed some typo.
|
2014-09-08 14:26:17 -07:00 |
|
Scott Erickson
|
6c12384fe9
|
Reenabling on surface mouse moved.
|
2014-09-08 14:13:19 -07:00 |
|
Nick Winter
|
eb4293fee5
|
Temp: ThangTypes don't require kind.
|
2014-09-08 13:02:39 -07:00 |
|
Nick Winter
|
6ed89a2d79
|
Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView.
|
2014-09-08 12:29:49 -07:00 |
|
Nick Winter
|
ffdf48dadb
|
Fixed typo in spell palette event.
|
2014-09-08 09:01:34 -07:00 |
|
Nick Winter
|
211fca46f6
|
Fixed #1528 by updating desired Mongo version to v2.6.4.
|
2014-09-07 20:58:12 -07:00 |
|
Nick Winter
|
1bd1ca0ced
|
Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app.
|
2014-09-07 20:54:25 -07:00 |
|
Nick Winter
|
40c37a8be1
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-09-07 20:48:36 -07:00 |
|
Nick Winter
|
6ac8dc1d2d
|
Merge pull request #1531 from gutierri/master
more translations of phrases
|
2014-09-07 20:47:57 -07:00 |
|
Nick Winter
|
4908cb4d0a
|
Merge pull request #1529 from MajkPascal/patch-2
Polish translation
|
2014-09-07 20:47:38 -07:00 |
|
Nick Winter
|
25334d59a0
|
Merge pull request #1527 from Titounkle/patch-2
Update es-ES.coffee
|
2014-09-07 20:46:51 -07:00 |
|
Nick Winter
|
68812eef0a
|
Fixed a couple types in new ar.coffee.
|
2014-09-07 20:41:47 -07:00 |
|