phoenixeliot
4a72ffc185
Implement all of teacher-dashboard
2016-04-04 15:19:27 -07:00
Scott Erickson
6a9342dcd7
Upgrade to jasmine 2.4.1
2016-01-25 13:03:29 -08:00
Imperadeiro98
ded6b14b6a
Better indented soundjs-NEXT.combined.js
2015-10-09 12:36:36 +01:00
Nick Winter
f1add14a27
Fix #2946 (one channel audio)
2015-09-20 16:23:47 -07:00
Nick Winter
37257d2477
Fixed particle by updating three.js and particle lib versions.
2015-06-19 14:55:14 -07:00
Matt Lott
896205bdf9
Use live version of Stripe checkout
...
Fixes #2639
2015-05-11 21:26:06 -07:00
Matt Lott
2231b70c19
Update Stripe checkout.js
2015-05-09 10:24:20 -07:00
Matt Lott
970dedbea5
Update Stripe checkout.js
2015-04-07 10:03:52 -07:00
Nick Winter
d6cba0de67
Enabled Alipay support. Updated to latest version of Stripe checkout.js.
2015-03-16 10:50:15 -07:00
Nick Winter
5addacddf0
First draft of ParticleMan particle emitters for showing hidden levels in CampaignView.
2015-01-29 16:11:13 -08:00
Scott Erickson
1446f77a17
Refactored away from having the underscore string library added to the String prototype.
2015-01-04 08:05:46 -08:00
Scott Erickson
0b36e15c50
Updated SoundJS again.
2014-12-09 17:59:34 -08:00
Scott Erickson
e86020f3a6
Tweaking responseType to be an empty string, because SoundJS uses it to determine how it treats XHR objects.
2014-12-09 15:58:25 -08:00
Scott Erickson
c6502f5dab
Updated SoundJS
2014-12-09 13:41:44 -08:00
Scott Erickson
46f7bbaaf5
Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks.
2014-12-09 13:41:44 -08:00
Scott Erickson
31327e4089
Updated soundjs to their classRearchitecture branch. Gotta have the latest!
2014-12-06 08:13:42 -08:00
Scott Erickson
3a4eaa718f
Did what I needed to do to get d3 to not be loaded during play: refactored the ladder views out of the play wad, and got the Router to handle viewClass being a string rather than a fully loaded module.
2014-11-29 16:46:51 -08:00
Scott Erickson
8ec016e4b2
Re-enabled RAF_SYNCHED, given the fix for https://github.com/CreateJS/EaselJS/issues/516
2014-11-18 15:56:33 -08:00
Scott Erickson
1444d84aea
Upgraded the CreateJS suite, handling its slight changes.
2014-11-18 15:42:11 -08:00
Scott Erickson
2e6f08f7d8
Added stripe checkout script.
2014-11-18 11:30:37 -08:00
Nick Winter
3d2e0c70c0
Added jQuery mobile events lib.
2014-10-27 13:33:22 -07:00
Matt Lott
511378465f
Fix WebGL check in SpriteStage.js
...
This was breaking us on IE10.
Fixes #1620
2014-10-01 11:58:25 -07:00
Scott Erickson
adbfa42f25
Merge branch 'master' into feature/webgl
2014-09-30 10:27:26 -07:00
Matt Lott
1e864d49e2
Box2D in own script, rename Vector
...
Renaming Vector to Box2DVector to avoid naming collisions when
including Box2D on the main thread. There may be a way to change how
scripts are built and included to avoid this rename, but it wasn’t
obvious.
Box2D declares a Vector in the global namespace, which conflicts with
the CodeCombat Vector.
2014-09-29 12:48:58 -07:00
Scott Erickson
06b106f42b
Merged from master.
2014-09-25 10:52:27 -07:00
Nick Winter
4cdff02a32
Implemented most of new inventory view.
2014-09-20 23:11:51 -07:00
Scott Erickson
3b7ce76d7d
Refactored WebGLLayer and SpriteContainerLayer/ContainerLayer into a single LayerAdapter class that has a Container or SpriteContainer.
2014-09-19 15:46:02 -07:00
Nick Winter
2ef7bff2c5
Fixed #886 .
2014-08-27 17:54:16 -07:00
Ruben Vereecken
672b0f54f6
Worked away our NotifyJS dependency - horrible lib
2014-08-11 14:11:26 +02:00
Nick Winter
855461a67e
Don't let test view interfere with normal body styles.
2014-07-16 16:01:37 -07:00
Michael Arnold
140541925e
Changed final_score to match coding style.
...
Extremely insignificant change, I just noticed that final_score was set as:
final_score = final_score / fuzzies;
compared to: "final_score /= fuzzies;" which is how the rest of your syntax is written.
(Ex: "+=" and "-=")
2014-06-14 15:43:59 -04:00
Scott Erickson
49c9c6bfc9
Built the client test view (rebased from feature/testclient).
2014-06-05 16:56:29 -07:00
Scott Erickson
3dc3f62473
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/views/editor/components/main.coffee
2014-04-25 14:31:58 -07:00
Michael Schmatz
81809956b8
hasChangedSignificantly async refactor
...
Still checking for bugs
2014-04-22 08:54:35 -07:00
Ting-Kuan
0e08a4106b
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
scripts/windows/coco-dev-setup/batch/localisation/fr.coco
scripts/windows/coco-dev-setup/batch/localisation/languages.coco
scripts/windows/coco-dev-setup/batch/localisation/zh.coco
scripts/windows/coco-dev-setup/batch/localization/de.coco
scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/setup.bat
scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
scripts/windows/coco-dev-setup/batch/setup.bat
scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
2014-04-12 16:52:14 -04:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
308adec7c7
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:00 -07:00
Nick Winter
1607790ea3
Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.
2014-04-11 14:59:09 -07:00
Scott Erickson
d11b6a5751
Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator
...
Conflicts:
bower.json
2014-04-11 12:44:29 -07:00
Ruben Vereecken
ba417630dc
Validated Backbone Mediator is now a fully functioning bower component
2014-04-11 20:05:48 +02:00
Scott Erickson
97a7bc7614
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Ruben Vereecken
f94dfeae6d
Reached a steady state without bower component backbone mediator
2014-04-11 15:00:16 +02:00
Ruben Vereecken
c2c0496883
Added schema stubs for about everything
2014-04-11 14:22:49 +02:00
Scott Erickson
5629284c76
Added text diff library to delta view.
2014-04-10 10:24:14 -07:00
Aditya Raisinghani
7cc9d22254
Moved nanoscroller to bower components and related fixes.
2014-04-08 03:04:36 +05:30
Nick Winter
d8999fb4f3
Got rid of the css of antiscroll in favor of nanoscroller.
2014-04-06 15:08:13 -07:00
Nick Winter
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07:00
Aditya Raisinghani
634ed82938
Fixed the background for spectate view
2014-04-07 01:00:35 +05:30
Nick Winter
5c8c7fff1d
Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.
2014-04-05 17:05:03 -07:00
