Scott Erickson
|
58b1019934
|
Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.
|
2014-04-15 15:09:36 -07:00 |
|
Nick Winter
|
f762d95ab8
|
ModelModal and simple leaderboard pagination.
|
2014-04-15 15:01:54 -07:00 |
|
Scott Erickson
|
e06c3dbb0b
|
Fixed the thangs tab view preventing the new patches view from handling clicks correctly.
|
2014-04-15 13:21:33 -07:00 |
|
Scott Erickson
|
1efabc3738
|
Fixed the fix.
|
2014-04-15 12:31:35 -07:00 |
|
Scott Erickson
|
69fba34f64
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-15 12:27:46 -07:00 |
|
Scott Erickson
|
b238ccaf27
|
Fixed the context-menu preventer in the level editor.
|
2014-04-15 12:27:35 -07:00 |
|
Scott Erickson
|
bb53e963b6
|
Removed a hack no longer needed.
|
2014-04-15 12:27:11 -07:00 |
|
Nick Winter
|
e49344bd87
|
A few job profile fixes and cleanup.
|
2014-04-15 10:45:54 -07:00 |
|
Ting-Kuan
|
af399f4415
|
Merge branch 'master' into feature/loading-views
|
2014-04-15 13:34:20 -04:00 |
|
Nick Winter
|
9194f842e6
|
Added some job description fields.
|
2014-04-15 09:28:19 -07:00 |
|
Nick Winter
|
1239617bd4
|
Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.
|
2014-04-14 16:34:11 -07:00 |
|
Nick Winter
|
2b7e629c7f
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-14 14:49:42 -07:00 |
|
Nick Winter
|
e908ae2fb4
|
Fixed #772.
|
2014-04-14 14:49:38 -07:00 |
|
gosnat
|
ebddcb57a9
|
Update play_view.coffee
Adding the "Find the Spy" level to the user created list.
|
2014-04-14 15:43:23 -05:00 |
|
Nick Winter
|
1794e5e040
|
Fixed #813 (sort of).
|
2014-04-14 11:18:02 -07:00 |
|
Nick Winter
|
8aa36178af
|
Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.
|
2014-04-13 20:31:23 -07:00 |
|
dpen2000
|
2345a7d8e8
|
Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code
|
2014-04-13 19:58:50 -04:00 |
|
Nick Winter
|
af0b8aa5e2
|
A few fixes and cleanup for #831.
|
2014-04-13 15:28:16 -07:00 |
|
Nick Winter
|
3d945492b0
|
Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2
|
2014-04-13 14:48:45 -07:00 |
|
Nick Winter
|
a9725f2dc6
|
A bit of error handling.
|
2014-04-13 14:48:36 -07:00 |
|
Ting-Kuan
|
8e19d8b71f
|
Change some resource loading logic to fit new SuperModel.
|
2014-04-13 13:29:43 -04:00 |
|
Ting-Kuan
|
573a4ae847
|
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
Conflicts:
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
|
2014-04-13 10:37:35 -04:00 |
|
Ting-Kuan
|
4979344ee5
|
Remove schema loading code.
|
2014-04-13 10:36:09 -04:00 |
|
dpen2000
|
ec3c292b72
|
Implement simulators leaderboard
|
2014-04-13 02:35:58 +01:00 |
|
Nick Winter
|
08616def10
|
Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.
|
2014-04-12 14:53:09 -07:00 |
|
Ting-Kuan
|
77c4c586dd
|
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
Conflicts:
app/locale/en.coffee
|
2014-04-12 17:13:06 -04:00 |
|
Ting-Kuan
|
508b570fea
|
Merge branch 'master' into feature/loading-views
Conflicts:
.gitignore
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
|
2014-04-12 17:07:30 -04: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 |
|
Ting-Kuan
|
7ae3bd5a60
|
Fix style and supermodel based on #815.
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
|
2014-04-12 16:29:49 -04:00 |
|
Nick Winter
|
8349578057
|
Fixed #786.
|
2014-04-12 12:35:45 -07:00 |
|
Scott Erickson
|
30f785f7cf
|
Moved the model schemas into a models folder.
|
2014-04-12 10:51:02 -07:00 |
|
Scott Erickson
|
5a794306fe
|
Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas
|
2014-04-12 08:53:24 -07:00 |
|
Scott Erickson
|
6eab5003f8
|
Merge branch 'feature/jsondiffpatch'
|
2014-04-12 08:52:35 -07:00 |
|
Scott Erickson
|
10b1660419
|
Fixed the level editor so you can save again.
|
2014-04-12 08:48:49 -07:00 |
|
Aditya Raisinghani
|
e04787475c
|
Rebased master to get updated schemas and added patch schema
|
2014-04-12 15:16:42 +05:30 |
|
Aditya Raisinghani
|
b932bf1e7c
|
Deleted schemas from /server and modified files to point to /app/schemas
|
2014-04-12 14:45:59 +05:30 |
|
Aditya Raisinghani
|
6fb5b59a01
|
Refactored schemas to be in /app
|
2014-04-12 14:33:55 +05:30 |
|
Scott Erickson
|
35fe47bbac
|
Merge branch 'feature/jsondiffpatch'
|
2014-04-11 22:52:58 -07:00 |
|
Scott Erickson
|
53579b2632
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
|
2014-04-11 22:52:05 -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 |
|
Scott Erickson
|
0eb74ab287
|
Added buttons for performing actions on patches.
|
2014-04-11 22:33:09 -07:00 |
|
Nick Winter
|
a792286161
|
Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more.
|
2014-04-11 22:30:28 -07:00 |
|
Scott Erickson
|
34bf484bf2
|
Added data merge conflict handling.
|
2014-04-11 21:11:52 -07:00 |
|
Nick Winter
|
99ead5d193
|
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
|
2014-04-11 19:51:20 -07:00 |
|
Ting-Kuan
|
a6235842b6
|
Change populate model to accept resource name.
|
2014-04-11 22:35:20 -04:00 |
|
Nick Winter
|
f0aa5e1d5e
|
Fixed #681 by removing full-screen button in Safari.
|
2014-04-11 18:19:52 -07:00 |
|
Nick Winter
|
99b430c1b4
|
Fixed #714 with a hack.
|
2014-04-11 17:55:47 -07:00 |
|
Nick Winter
|
91c2f0fa33
|
Fixed #715, and some misc cleanup.
|
2014-04-11 17:36:15 -07:00 |
|
Nick Winter
|
97d4017869
|
Hacky way to get play background to fit with new loading image.
|
2014-04-11 16:15:26 -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
|
bbb9fb7a64
|
Added a patches view.
|
2014-04-11 14:19:17 -07:00 |
|
Nick Winter
|
10bb17c38a
|
Added getThangByID method to Thang. Handled a few error corner cases with the time popup.
|
2014-04-11 14:03:13 -07:00 |
|
Nick Winter
|
b330e783bf
|
Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons
|
2014-04-11 13:28:11 -07:00 |
|
Nick Winter
|
ae65f07e7e
|
Added some i18n and improved employer page.
|
2014-04-11 12:49:44 -07:00 |
|
Scott Erickson
|
e3a1f170cf
|
Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader
Conflicts:
app/views/kinds/CocoView.coffee
app/views/play/level/level_loading_view.coffee
|
2014-04-11 11:19:16 -07:00 |
|
Nick Winter
|
3751bf903e
|
Merge pull request #806 from 1c7/master
New features: chinese language version use Youku
|
2014-04-11 10:33:10 -07: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 |
|
Nick Winter
|
26266963f4
|
Updated to jQuery 2.1.
|
2014-04-11 10:12:39 -07:00 |
|
Nick Winter
|
a68f3efb99
|
Added specific job profile photo support. Improved right column design a bit.
|
2014-04-10 17:54:28 -07:00 |
|
Nick Winter
|
7a35a6248f
|
Adding contact form for employers to contact candidates.
|
2014-04-10 14:59:32 -07:00 |
|
Ting-Kuan
|
a5e6496a7c
|
Make resources as static class to avoid loading multiple times.
Clean debug message.
|
2014-04-10 16:59:08 -04:00 |
|
Scott Erickson
|
a3951b0fa7
|
Extended the save version modal to allow submitting patches.
|
2014-04-10 13:09:44 -07:00 |
|
Nick Winter
|
e9416ee128
|
Added some autocompleters for job profile Treema. Projects are now entirely links.
|
2014-04-10 11:58:51 -07:00 |
|
Michael Schmatz
|
a796d88967
|
Fixed tutorial modal for nonexistent tutorials
|
2014-04-10 11:42:22 -07:00 |
|
Scott Erickson
|
3c832d3707
|
Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.
|
2014-04-10 11:13:33 -07:00 |
|
Michael Schmatz
|
42bf2996af
|
Made Aether ignore variable hoisting
See #813
|
2014-04-10 10:36:32 -07:00 |
|
Scott Erickson
|
5629284c76
|
Added text diff library to delta view.
|
2014-04-10 10:24:14 -07:00 |
|
Scott Erickson
|
66d455285e
|
Integrated the delta view into the save view for levels.
|
2014-04-09 19:07:44 -07:00 |
|
Nick Winter
|
26cebf7e7e
|
Fixing some recruitment profile bugs.
|
2014-04-09 18:10:30 -07:00 |
|
Nick Winter
|
dd46f9d039
|
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
|
2014-04-09 16:46:44 -07:00 |
|
Scott Erickson
|
b15380047c
|
Tweak to view.
|
2014-04-09 16:09:53 -07:00 |
|
Scott Erickson
|
f2d21b960f
|
Added a delta subview for displaying deltas of schema'd data.
|
2014-04-09 16:09:35 -07:00 |
|
Nick Winter
|
f17775cc10
|
Implemented George's jobs page design.
|
2014-04-09 13:14:52 -07:00 |
|
Aditya Raisinghani
|
495d1be620
|
Added social buttons to Sign up modal
|
2014-04-10 01:01:30 +05:30 |
|
Nick Winter
|
76054345d7
|
Fixed #805.
|
2014-04-09 09:04:59 -07:00 |
|
1c7
|
56c18441e4
|
use youku for Chinese Version
|
2014-04-09 13:50:13 +08:00 |
|
Nick Winter
|
c226835ff2
|
Fixed a couple bugs in custom TreemaNodes.
|
2014-04-08 17:13:05 -07:00 |
|
Ting-Kuan
|
6729cfc292
|
First commit.
|
2014-04-08 12:03:03 -04:00 |
|
Nick Winter
|
b96bca8c18
|
Finished most of basic features for job profiles.
|
2014-04-07 17:58:02 -07:00 |
|
Nick Winter
|
9af6694054
|
More work on the job profiles.
|
2014-04-07 15:21:05 -07:00 |
|
Aditya Raisinghani
|
7cc9d22254
|
Moved nanoscroller to bower components and related fixes.
|
2014-04-08 03:04:36 +05:30 |
|
Nick Winter
|
1b79de0d86
|
Loading active candidate profiles from the database into a table for employers.
|
2014-04-06 17:01:56 -07:00 |
|
Nick Winter
|
13f34341b2
|
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
|
2014-04-06 14:55:14 -07:00 |
|
Ting-Kuan
|
ac51404d4c
|
remove debug msg.
|
2014-04-06 16:40:06 -04:00 |
|
Ting-Kuan
|
20c624e0b8
|
Refactor CocoView.
|
2014-04-06 16:37:00 -04: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 |
|
Ting-Kuan
|
4e41676219
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-05 10:51:40 -04:00 |
|
Scott Erickson
|
abaf32fc7a
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-04 14:57:55 -07:00 |
|
Michael Schmatz
|
2411269f2b
|
Added rank/number of sessions text
|
2014-04-04 14:55:55 -07:00 |
|
Michael Schmatz
|
0684bcff9c
|
Improved styling on graphs
|
2014-04-04 14:22:30 -07:00 |
|
Scott Erickson
|
2093049f5c
|
Fixed a bug with the profile view caused by the new page loading system.
|
2014-04-04 13:59:40 -07:00 |
|
Michael Schmatz
|
06f164525f
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/views/play/ladder/ladder_tab.coffee
|
2014-04-04 13:48:39 -07:00 |
|
Michael Schmatz
|
7019bb6dea
|
Added score histogram to ladder tab
|
2014-04-04 13:38:36 -07:00 |
|
Ting-Kuan
|
de9337820b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/assets/main.html
scripts/windows/coco-dev-setup/batch/config/finished_header.coco
scripts/windows/coco-dev-setup/batch/config/github_header.coco
scripts/windows/coco-dev-setup/batch/config/install_header.coco
scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
scripts/windows/coco-dev-setup/batch/config/readme.coco
scripts/windows/coco-dev-setup/batch/localisation/de.coco
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-HANS.coco
scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
scripts/windows/coco-dev-setup/batch/localisation/zh.coco
scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
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_array.bat
scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.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/get_var.ps1
scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
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/open_readme.bat
scripts/windows/coco-dev-setup/batch/scripts/open_text_file.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_file.bat
scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
scripts/windows/coco-dev-setup/batch/scripts/run_script.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
|
2014-04-04 14:32:42 -04:00 |
|
Scott Erickson
|
1971ddcefb
|
Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time.
|
2014-04-04 10:12:22 -07:00 |
|
Ting-Kuan
|
fe27756b06
|
Pull from upsatream.
|
2014-04-04 12:52:22 -04:00 |
|
Scott Erickson
|
978c84bc89
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-03 18:43:36 -07:00 |
|
Scott Erickson
|
3b3b825be0
|
Set up a new loading/progress system for views.
|
2014-04-03 18:43:29 -07:00 |
|
Nick Winter
|
9a70abb104
|
Don't need to explicitly skip Mobile Artillery's next level now.
|
2014-04-03 16:37:24 -07:00 |
|
Aditya Raisinghani
|
1c3117836f
|
Shifted nanoscroller to vendor.
|
2014-04-04 00:13:09 +05:30 |
|
Michael Schmatz
|
3aa31c7246
|
Graphs with D3!
|
2014-04-02 18:41:11 -07:00 |
|
Nick Winter
|
670f94cc22
|
Fixed #418, no more print/save dialogues evaaarr.
|
2014-04-02 14:42:34 -07:00 |
|
Aditya Raisinghani
|
44979c074d
|
Integrated nanoscroller.
|
2014-04-03 03:10:06 +05:30 |
|
Nick Winter
|
ae9769e3ce
|
Added read only notification in editors. Fixed #374.
|
2014-04-01 13:15:30 -07:00 |
|
Nick Winter
|
ba3c4af536
|
Fixed last piece of #673.
|
2014-04-01 10:51:03 -07:00 |
|
Nick Winter
|
b316a3e078
|
Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing
|
2014-04-01 09:44:06 -07:00 |
|
Nick Winter
|
785cb342a2
|
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
|
2014-04-01 09:12:48 -07:00 |
|
Ting-Kuan
|
e076440d1b
|
Move Noty to vendor folder.
|
2014-04-01 02:41:04 -04:00 |
|
Ting-Kuan
|
085d181ed3
|
Use Noty to produce warning message while adding component with not added system.
|
2014-04-01 00:47:50 -04:00 |
|
Nick Winter
|
8c013c1192
|
Fixed 101: added level completion status to /play.
|
2014-03-31 15:48:22 -07:00 |
|
Nick Winter
|
389323953b
|
Fixed #180.
|
2014-03-31 13:56:13 -07:00 |
|
Nick Winter
|
d8a194f895
|
Actually using loading screen template.
|
2014-03-31 13:21:08 -07:00 |
|
Dominik Kundel
|
1c6aea9c1c
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-31 20:35:32 +02:00 |
|
tmrdja
|
dfe6bce351
|
Added contextmenu
Added contextmenu
|
2014-03-31 18:33:14 +02:00 |
|
Nick Winter
|
cb27124285
|
Fixed #135.
|
2014-03-30 17:24:07 -07:00 |
|
tmrdja
|
f8de6162d1
|
Added contextmenu
Added contextmenu with Delete and Duplicate button
|
2014-03-30 19:38:54 +02:00 |
|
Nick Winter
|
6bff295d2e
|
Linking up Prabh's Coin Mania level.
|
2014-03-29 18:04:29 -07:00 |
|
Nick Winter
|
54f4e8d1e9
|
Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor
|
2014-03-29 17:38:14 -07:00 |
|
Nick Winter
|
a79fe37ca1
|
Merged; made a couple tweaks.
|
2014-03-29 17:30:12 -07:00 |
|
Dominik Maier
|
fb607d06fa
|
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
|
2014-03-30 00:38:45 +01:00 |
|
Nick Winter
|
c58a1682f4
|
Fixed #519 for real, I think.
|
2014-03-29 14:09:45 -07:00 |
|
Nick Winter
|
bd0ecd76e5
|
Fixed SearchView projections.
|
2014-03-29 13:22:21 -07:00 |
|
Ting-Kuan
|
130d322d60
|
Move error_view's dom to template file.
|
2014-03-28 23:51:15 -04:00 |
|
Nick Winter
|
5bcaf2c746
|
Fixed #64 (I hope; let's UX test.)
|
2014-03-28 17:06:21 -07:00 |
|
Nick Winter
|
cf81d51a89
|
Fixed #46.
|
2014-03-28 15:23:12 -07:00 |
|
Nick Winter
|
c4a56dc9a5
|
Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11.
|
2014-03-28 12:22:53 -07:00 |
|
Nick Winter
|
ff7e2d5d47
|
Fixed #728.
|
2014-03-28 11:02:23 -07:00 |
|
Nick Winter
|
62867534a7
|
Fixed #727.
|
2014-03-28 09:52:07 -07:00 |
|
Scott Erickson
|
84cb0bfd0d
|
Merge pull request #713 from Sighne/master
Migrate .on, .once - ThangTypeEditView
|
2014-03-28 09:34:29 -07:00 |
|
Dominik Kundel
|
267d033997
|
initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline
|
2014-03-28 14:42:08 +01:00 |
|
Dominik Kundel
|
35a16b47ff
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-28 14:37:14 +01:00 |
|
Nick Winter
|
b0b37aa9d8
|
Made play/pause and scrubber look even more disabled when disabled.
|
2014-03-27 15:07:37 -07:00 |
|
Nick Winter
|
2677751dc5
|
Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog
|
2014-03-27 14:58:06 -07:00 |
|
Nick Winter
|
31119f402a
|
Cleaned up readyToRank logic a bit.
|
2014-03-27 14:55:45 -07:00 |
|
Nick Winter
|
1cab83236c
|
Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master
|
2014-03-27 14:22:44 -07:00 |
|
Nick Winter
|
7ab5adcdac
|
Merge pull request #700 from pedrofgsrj/loginAutocomplete
Fixed issue #597
|
2014-03-27 14:20:58 -07:00 |
|
Nick Winter
|
127c4a4e0f
|
Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.
|
2014-03-27 13:36:33 -07:00 |
|
Laura Lebbah
|
5d894ea053
|
Migrate .on, .once - ThangTypeEditView
|
2014-03-27 21:33:59 +01:00 |
|
Ting-Kuan
|
6012a3ce9e
|
Show error message when editor fails to initiate.
|
2014-03-27 14:35:20 -04:00 |
|
Pedro Sobrinho
|
38bf27020a
|
Fixed issue #597
|
2014-03-26 20:55:03 -04:00 |
|
Jayant Jain
|
648df5eb41
|
Updated rank my game check, fixes #666
|
2014-03-27 03:36:27 +05:30 |
|
Scott Erickson
|
37beb1bc6b
|
Made the ladder tab better able to handle unloaded gplus and facebook apis.
|
2014-03-26 14:53:09 -07:00 |
|
Scott Erickson
|
fae9034dfc
|
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
Conflicts:
app/models/SuperModel.coffee
|
2014-03-26 14:29:16 -07:00 |
|
Scott Erickson
|
462d365ce0
|
Sorted the friend sessions a bit.
|
2014-03-26 14:22:04 -07:00 |
|
Scott Erickson
|
781b33092c
|
Added a google plus connect button.
|
2014-03-26 14:19:05 -07:00 |
|
Scott Erickson
|
132b22f14a
|
Got the gplus friends loading now.
|
2014-03-26 13:50:01 -07:00 |
|
Scott Erickson
|
ad70a7f0c6
|
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
|
2014-03-26 11:48:47 -07:00 |
|
Scott Erickson
|
3b8cba291d
|
Removed some unnecessary callbacks.
|
2014-03-26 11:48:40 -07:00 |
|
Jayant Jain
|
71294f14b2
|
Updates fb and g+ functions to be called on api load, fixes #695
|
2014-03-26 22:03:20 +05:30 |
|
swapnesh
|
1118324b41
|
Migrate from .on, .once to .listenTo, .listenToOnce
|
2014-03-26 03:25:11 +05:30 |
|
Dominik Kundel
|
fe8a4901de
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/locale/de.coffee
bower.json
|
2014-03-25 17:07:36 +01:00 |
|
Shrihari
|
aee18523b0
|
Fix for #506
|
2014-03-25 13:28:22 +05:30 |
|
Scott Erickson
|
bda499b561
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:43:08 -07:00 |
|
Scott Erickson
|
2c329a256f
|
Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.
|
2014-03-24 14:42:56 -07:00 |
|
Nick Winter
|
97613f12b4
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:38:35 -07:00 |
|
Nick Winter
|
a42e33764e
|
Merged, fixed.
|
2014-03-24 14:38:18 -07:00 |
|
Scott Erickson
|
53118984ff
|
Undid a listenTo on a jQuery elem.
|
2014-03-24 14:29:53 -07:00 |
|
Scott Erickson
|
57f6f4d244
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-24 14:27:28 -07:00 |
|
Scott Erickson
|
e9b3db2eb9
|
Fixed destroy to not break stopListening, which uses off.
|
2014-03-24 14:27:10 -07:00 |
|
Ruben Vereecken
|
3f3eeab02a
|
Fixed NaN in ladder in case a player has never played before
|
2014-03-24 19:46:50 +01:00 |
|
Michael Schmatz
|
83bfc28a9e
|
Partially refactored scoring callback pyramid of hell
|
2014-03-24 10:58:43 -07:00 |
|
Scott Erickson
|
f55cef5ced
|
Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents
|
2014-03-24 10:38:57 -07:00 |
|
Shrihari
|
093cc66fa0
|
Reverted few wrong migrations
|
2014-03-24 22:56:32 +05:30 |
|
Shrihari
|
f085b0d319
|
Refactored cast-button events
|
2014-03-24 22:41:27 +05:30 |
|
Shrihari
|
0160538b44
|
More migrations
|
2014-03-24 22:28:34 +05:30 |
|
Scott Erickson
|
bf039ed485
|
Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema)
Select dependents when a extant component is selected.
|
2014-03-24 09:31:27 -07:00 |
|
Shrihari
|
69ee16f77f
|
Fixed wrong migrations
|
2014-03-24 21:37:09 +05:30 |
|
Nick Winter
|
92c87dc4ad
|
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
|
2014-03-24 08:28:48 -07:00 |
|
Ting-Kuan
|
e9118142db
|
Fix issue #662
|
2014-03-24 10:54:59 -04:00 |
|
Shrihari
|
67f5270bfc
|
Migrate .on, .once - Batch 1
|
2014-03-24 12:23:41 +05:30 |
|
Nick Winter
|
5852b87aa3
|
A little longer debounce is better.
|
2014-03-23 18:55:44 -07:00 |
|
Nick Winter
|
808762c229
|
Merge pull request #663 from domenukk/master
fixes codecombat/codecombat#655
|
2014-03-23 18:11:40 -07:00 |
|
Dominik Maier
|
f66e210c73
|
regarding codecombat/codecombat#655 debounce debounces.
|
2014-03-24 01:18:36 +01:00 |
|
Nick Winter
|
dbeb3d445b
|
Give focus back to spell view on palette click.
|
2014-03-23 16:48:30 -07:00 |
|
Dominik Maier
|
dcbd55a864
|
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
|
2014-03-24 00:47:41 +01:00 |
|
Nick Winter
|
656b34fc34
|
Fixed comment gutter icons jumping all over the place.
|
2014-03-23 16:00:23 -07:00 |
|
Dominik Maier
|
0dee3d042f
|
fixes codecombat/codecombat#655 completely
Removes asynchronous name checking, though, if it ever worked.
|
2014-03-23 23:04:39 +01:00 |
|
Dominik Maier
|
459a1f9e48
|
fixes codecombat/codecombat#655
|
2014-03-23 18:41:15 +01:00 |
|
Nick Winter
|
7ba959045a
|
A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added.
|
2014-03-23 10:00:16 -07:00 |
|
Scott Erickson
|
8ca5f23749
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-23 09:30:46 -07:00 |
|
Scott Erickson
|
72b88a3ee9
|
First pass on setting up gplus friends on the ladder page.
|
2014-03-23 09:30:01 -07:00 |
|
dpen2000
|
970552a6d6
|
Fix "Simulating game between" line to only have one "and"
|
2014-03-23 13:35:24 +00:00 |
|
Nick Winter
|
fd2d9b6833
|
Merge pull request #658 from ItsLastDay/editor_tweaks
Added tooltip in level-editor (issue #174)
|
2014-03-22 17:30:52 -07:00 |
|
Mikhail Koltsov
|
2316773cb1
|
removed Label requierment
|
2014-03-22 23:25:18 +04:00 |
|
Mikhail Koltsov
|
36cfdfda46
|
Added labels above selected thangs in level-editor (issue #174)
|
2014-03-22 23:17:15 +04:00 |
|
Nick Winter
|
96fe1e42f0
|
Merge pull request #657 from adi2412/reloadCode
Made changes to reloadAllCode to reload only the team's code.
|
2014-03-22 10:36:17 -07:00 |
|
Aditya Raisinghani
|
bee5d528ec
|
Made changes to reloadAllCode to reload only the team's code.
|
2014-03-22 22:56:41 +05:30 |
|
Nick Winter
|
29e7b8e5c1
|
Fixed mail to correctly capture the matches.
|
2014-03-22 09:48:36 -07:00 |
|
Michael Schmatz
|
5141873725
|
Added resimulateAllSessions method
|
2014-03-22 09:07:01 -07:00 |
|
Scott Erickson
|
0df09f7f35
|
Fixed an ever-reloading bug.
|
2014-03-21 21:11:51 -07:00 |
|
Scott Erickson
|
2cdfbf1c48
|
Merged conflicts.
|
2014-03-21 19:56:25 -07:00 |
|
Scott Erickson
|
6445924598
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/templates/play/ladder/ladder_tab.jade
app/views/play/ladder/ladder_tab.coffee
|
2014-03-21 19:53:32 -07:00 |
|
Scott Erickson
|
14ee9c30ce
|
Added facebook friends to the ladder page.
|
2014-03-21 19:50:54 -07:00 |
|
Nick Winter
|
b91f3200c2
|
Merge pull request #649 from jayant1992/master
Fixes #641, the list of levels in editor reloads properly upon changing ...
|
2014-03-21 17:46:10 -07:00 |
|
Nick Winter
|
e101fb04eb
|
For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627.
|
2014-03-21 17:42:13 -07:00 |
|
Jayant Jain
|
860c3a34d3
|
Fixes #641, the list of levels in editor reloads properly upon changing language
|
2014-03-22 05:51:44 +05:30 |
|
dpen2000
|
a35d0cb651
|
Implement saving lastLevel in database re #627
|
2014-03-22 00:01:32 +00:00 |
|
Nick Winter
|
f0640dd2e8
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-21 16:22:51 -07:00 |
|
Nick Winter
|
ba66dbf5a1
|
Adding CLAs view.
|
2014-03-21 16:22:47 -07:00 |
|
dpen2000
|
b1b0579cb3
|
Save autocastDelay as a setting on User re #627
|
2014-03-21 22:46:14 +00:00 |
|
Ting-Kuan
|
0db309f526
|
Select dependents when a extant component is selected.
|
2014-03-21 12:19:47 -04:00 |
|
Nick Winter
|
b30bf35945
|
Fixed #638, I hope.
|
2014-03-21 08:09:08 -07:00 |
|
Nick Winter
|
a3dadd6a40
|
Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks
|
2014-03-21 07:25:33 -07:00 |
|
Mikhail Koltsov
|
45b87ed38e
|
finally got it right
|
2014-03-21 13:45:56 +04:00 |
|
Mikhail Koltsov
|
0ece400a18
|
Level editor: selecting a thang now moves the scroll in existant-thang list
|
2014-03-21 11:54:55 +04:00 |
|
Nick Winter
|
424390ae84
|
Moved antiscroll init; disabled it for now because of bugginess.
|
2014-03-20 22:00:34 -07:00 |
|
Nick Winter
|
ca1e3742c0
|
Added simulation counts.
|
2014-03-20 15:40:02 -07:00 |
|
Scott Erickson
|
22555790b5
|
Set up a trimmed down leaderboard showing just top players and your rank.
|
2014-03-20 14:40:17 -07:00 |
|
Scott Erickson
|
dbbf9ce8b3
|
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
|
2014-03-20 11:22:23 -07:00 |
|
Nick Winter
|
b7e8f2ecb5
|
Merge pull request #605 from kvasnyk/master
Fix for #272 bug.
|
2014-03-19 18:31:20 -07:00 |
|
Nick Winter
|
ff1e64e1f6
|
Less useless ladder refresh requests.
|
2014-03-19 18:26:38 -07:00 |
|
Scott Erickson
|
954a3ac4cb
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-19 17:11:53 -07:00 |
|
Scott Erickson
|
b6c9b6276c
|
Tweaked logging of sprite building.
|
2014-03-19 17:11:45 -07:00 |
|
iulianR
|
bfac03a73c
|
Rearranged play_view.cofee for consistency
|
2014-03-19 01:57:21 +02:00 |
|
Scott Erickson
|
74e068af0b
|
Fixed some bugs from the migration from _.cloneDeep to $.extend
|
2014-03-18 13:47:51 -07:00 |
|
Scott Erickson
|
a461a14d6e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-18 13:08:34 -07:00 |
|
Scott Erickson
|
37a9b7f319
|
Switching from the slow _.cloneDeep to the fast $.extend
|
2014-03-18 13:08:26 -07:00 |
|
Jayant Jain
|
80f53d2c6b
|
Adds search bar for adding thangs in level editor
|
2014-03-19 00:41:03 +05:30 |
|
Nick Winter
|
4355813d69
|
Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.
|
2014-03-18 11:26:15 -07:00 |
|
kvasnyk
|
5216432bf9
|
Fix for #272 bug.
|
2014-03-18 05:47:53 +01:00 |
|
Dominik Kundel
|
c55b608886
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/templates/play/level/modal/editor_config.jade
|
2014-03-17 19:39:38 +01:00 |
|
Aditya Raisinghani
|
b5bef94eb3
|
Fixed issue with video on multiplayer page modal
|
2014-03-17 19:52:03 +05:30 |
|
Nick Winter
|
6c2a78c060
|
Show videos in HD if possible. Use ready state on level loader.
|
2014-03-17 05:52:19 -07:00 |
|
Nick Winter
|
833c310a91
|
Merge pull request #579 from ItsLastDay/popover
Fix for issue #496
|
2014-03-17 04:30:57 -07:00 |
|
Mikhail Koltsov
|
df3739517d
|
fixed issue #496
|
2014-03-17 12:28:49 +04:00 |
|
Scott Erickson
|
db4ae0cd2d
|
Made some tips show up more rarely.
|
2014-03-17 00:12:11 -07:00 |
|
Scott Erickson
|
7555dce172
|
Tweaked the loading page progress bar.
|
2014-03-17 00:05:45 -07:00 |
|
Nick Winter
|
65c53a9e43
|
Check anonymous for clicking link.
|
2014-03-16 22:17:56 -07:00 |
|
Scott Erickson
|
dc4252a94d
|
Moved the tips into the level loader screen and gave them i18n.
|
2014-03-16 22:01:21 -07:00 |
|
Scott Erickson
|
5a8d1b0a2b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 21:43:21 -07:00 |
|
Scott Erickson
|
de34896a9a
|
Playback is now disabled during casting. Also cleaned out some remaining hover logic.
|
2014-03-16 21:43:14 -07:00 |
|
Nick Winter
|
f02f4e77d0
|
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
|
2014-03-16 21:33:46 -07:00 |
|
Scott Erickson
|
e88c79681d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 21:04:44 -07:00 |
|
Scott Erickson
|
c663bd74cf
|
Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.
|
2014-03-16 21:04:36 -07:00 |
|
Nick Winter
|
ffb9ec2908
|
Merged.
|
2014-03-16 20:36:18 -07:00 |
|
Nick Winter
|
9a64fb5dac
|
Work on /multiplayer modal.
|
2014-03-16 20:32:24 -07:00 |
|
Scott Erickson
|
296a7584a6
|
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
|
2014-03-16 20:28:02 -07:00 |
|
Dominik Kundel
|
6a983dcb8c
|
changed name of event triggered when config is changed and introduced new event when language is changed
|
2014-03-17 02:14:04 +01:00 |
|
Scott Erickson
|
e430a6c2de
|
Added multiplayer launch view.
|
2014-03-16 17:33:57 -07:00 |
|
Scott Erickson
|
3fa0124d7e
|
Removed wizard loading code from home view, for now anyway.
|
2014-03-16 17:21:17 -07:00 |
|
Scott Erickson
|
dd8ea18186
|
Merge remote-tracking branch 'origin/master'
|
2014-03-16 17:13:18 -07:00 |
|
Scott Erickson
|
f23e3285cd
|
Fixed a bug.
|
2014-03-16 17:12:55 -07:00 |
|
Nick Winter
|
b550708113
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 17:07:24 -07:00 |
|
Nick Winter
|
6db33fd967
|
Brawlwood protectAPI on!
|
2014-03-16 17:07:10 -07:00 |
|
Scott Erickson
|
eee8fbba2c
|
New level page with new artwork.
|
2014-03-16 16:59:48 -07:00 |
|
Nick Winter
|
aa4f1baf73
|
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
|
2014-03-16 13:23:01 -07:00 |
|
Dominik Kundel
|
ce6533de59
|
changing ace edit mode based on setting
|
2014-03-15 23:14:57 +01:00 |
|
Jayant Jain
|
91515b1cea
|
Clicking a thang in the left list automatically pans to the sprite on the editor map
|
2014-03-16 03:11:40 +05:30 |
|
Dominik Kundel
|
46133ab85d
|
added select statement for programming language
|
2014-03-15 22:00:29 +01:00 |
|
Nick Winter
|
b210423419
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-15 12:31:43 -07:00 |
|
Nick Winter
|
ca75cc4a1a
|
Fixed #405 with a sledgehammer--just loading all Components before loading level editor.
|
2014-03-15 12:31:39 -07:00 |
|
Michael Schmatz
|
efba8a0654
|
Fixed control bar leaderboard button for #429
|
2014-03-15 11:34:59 -07:00 |
|
Michael Schmatz
|
6dcbaddbbd
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/views/play/spectate_view.coffee
|
2014-03-15 09:20:44 -07:00 |
|
Michael Schmatz
|
2c6e667bb7
|
Added API for queue messages count
|
2014-03-15 09:20:13 -07:00 |
|
honam bang
|
e63e787a30
|
Removed spaces for coding convention
|
2014-03-15 08:30:47 -07:00 |
|
bang honam
|
70f3ca8f8e
|
Added a line for coding convention
|
2014-03-15 08:30:37 -07:00 |
|
Nick Winter
|
7b1f8d1114
|
Merge pull request #547 from jayant1992/master
Improved panning and zooming for editor
|
2014-03-15 08:05:02 -07:00 |
|
Nick Winter
|
95cd3782a1
|
Oops, don't keep sending ladder updates just to me.
|
2014-03-15 07:45:44 -07:00 |
|
Nick Winter
|
8276dbf2d1
|
Merge branch 'loading-view'
|
2014-03-14 19:44:33 -07:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|
Michael Schmatz
|
357b73be93
|
Fixed bug in next game button, fixed wizard positions
|
2014-03-14 16:14:35 -07:00 |
|
Michael Schmatz
|
075ea23be9
|
Fixed random sessions fetching
|
2014-03-14 12:54:54 -07:00 |
|
Scott Erickson
|
39ed6c3a43
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-14 11:58:42 -07:00 |
|
Scott Erickson
|
af8008596a
|
Made editing thangs in the level editor not so slow by avoiding calling level.serialize.
|
2014-03-14 11:58:29 -07:00 |
|
Michael Schmatz
|
71aa6cc2c6
|
Added random session pair choosing
Due to a bug I cannot test this immediately
|
2014-03-14 11:30:06 -07:00 |
|
Jayant Jain
|
ece932595c
|
Enables drag-panning for editor and region chooser
|
2014-03-14 23:57:00 +05:30 |
|
Nick Winter
|
5c76ca71e3
|
Added configuring of behaviors to the editor config.
|
2014-03-14 10:14:48 -07:00 |
|
Nick Winter
|
3c0b496033
|
Fix for if aceConfig doesn't exist yet.
|
2014-03-14 07:46:36 -07:00 |
|
Nick Winter
|
c28d2bb576
|
Merge pull request #545 from dkundel/master
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
|
2014-03-14 07:35:11 -07:00 |
|
Nick Winter
|
6e9945040f
|
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
|
2014-03-13 19:20:22 -07:00 |
|
Dominik Kundel
|
7e955c72b8
|
apply config to editor
|
2014-03-14 02:49:58 +01:00 |
|
Nick Winter
|
795bd8f63b
|
Moved Glen from Archmages to About.
|
2014-03-13 18:27:08 -07:00 |
|
Dominik Kundel
|
8a5aeb6227
|
save editor config to database
|
2014-03-14 02:09:11 +01:00 |
|
Nick Winter
|
42a8862fa9
|
Merge pull request #541 from dkundel/master
Easy use of coordinates as discussed in #10 and minor fixes
|
2014-03-13 18:05:04 -07:00 |
|
Dominik Kundel
|
6f2a04c5c0
|
added new editor config modal
|
2014-03-14 00:54:06 +01:00 |
|
Dominik Kundel
|
f618338d32
|
added button to access new modal for editor config
|
2014-03-14 00:53:29 +01:00 |
|
Dominik Kundel
|
4cbdc3cb4b
|
highlight lines after insertion
|
2014-03-14 00:52:18 +01:00 |
|
Nick Winter
|
8554de7c4b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-13 15:35:31 -07:00 |
|
Nick Winter
|
e2d2e96cf5
|
Fixed several bugs with Thang selection and the SpellView and HUD.
|
2014-03-13 15:35:28 -07:00 |
|
Michael Schmatz
|
3262ad81f2
|
Merge branch 'master' of github.com:codecombat/codecombat
Conflicts:
app/views/play/spectate_view.coffee
|
2014-03-13 15:24:04 -07:00 |
|
Michael Schmatz
|
7aa506e58c
|
Various changes to spectate view
|
2014-03-13 15:22:35 -07:00 |
|
Scott Erickson
|
b2e9768127
|
Set up a build queue for async sprite sheet building, which lessens blocking the main thread.
|
2014-03-13 13:25:03 -07:00 |
|
Scott Erickson
|
c238b49f52
|
Fixed initial wizard position.
|
2014-03-13 11:07:08 -07:00 |
|
Nick Winter
|
c8103154a9
|
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
|
2014-03-13 09:02:19 -07:00 |
|
Jayant Jain
|
c24469e86b
|
Minor UI updates to level editor's thang tab
|
2014-03-13 12:19:51 +05:30 |
|
Nick Winter
|
28d56f526e
|
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
|
2014-03-12 20:59:19 -07:00 |
|
Michael Schmatz
|
6eda2d24a5
|
Commented out line 133
|
2014-03-12 17:52:05 -07:00 |
|
Michael Schmatz
|
aea9e9d1a6
|
Spectate view is nearing completion
|
2014-03-12 17:51:13 -07:00 |
|
Dominik Kundel
|
8990b9d194
|
paste coordiante if click + shift
|
2014-03-13 01:50:59 +01:00 |
|
Nick Winter
|
7e16821743
|
Updates for /play levels list.
|
2014-03-12 16:41:09 -07:00 |
|
Nick Winter
|
ac8f12ef20
|
I don't think we need this template any more.
|
2014-03-12 16:03:32 -07:00 |
|
Nick Winter
|
ddea7d1531
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 15:44:33 -07:00 |
|
Scott Erickson
|
19184a88b0
|
Fixed showing the guide at the beginning of the level.... more.
|
2014-03-12 13:49:28 -07:00 |
|
Nick Winter
|
1ca9b2d3e5
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 12:45:46 -07:00 |
|
Scott Erickson
|
ed60f5932f
|
Fixed showing the guide at the beginning of the level.
|
2014-03-12 12:44:06 -07:00 |
|
Scott Erickson
|
853a80dd23
|
Fixed loading marks so they are positioned correctly when they load and the world is paused.
|
2014-03-12 12:43:51 -07:00 |
|
Nick Winter
|
77c9217357
|
Better handling of refreshing ladder and matches views depending on idle state.
|
2014-03-12 11:39:09 -07:00 |
|
Nick Winter
|
49ab47e3fe
|
Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.
|
2014-03-12 10:01:31 -07:00 |
|
Nick Winter
|
f83fe6ce14
|
Fixed bugs with sprite rotation updating.
|
2014-03-12 09:31:45 -07:00 |
|
Nick Winter
|
2e354a7f11
|
Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.
|
2014-03-12 09:10:36 -07:00 |
|
Nick Winter
|
da762fbc4f
|
Merge branch 'rubenvereecken-versions_modal'
|
2014-03-12 08:30:02 -07:00 |
|
Nick Winter
|
0125c46dc2
|
Resolved merge conflict.
|
2014-03-12 08:29:42 -07:00 |
|
Ruben Vereecken
|
4b72ee1d04
|
Clean up
|
2014-03-12 15:43:49 +01:00 |
|
Ruben Vereecken
|
ddae5d0763
|
Added Version History to Level Components
|
2014-03-12 15:32:55 +01:00 |
|
Michael Schmatz
|
a6fb2a3994
|
Various changes to spectate view
|
2014-03-12 07:32:30 -07:00 |
|
Ruben Vereecken
|
2a86daaa2a
|
Added Version History to Thang Types
|
2014-03-12 15:22:15 +01:00 |
|
Prabh Simran Singh Baweja
|
5e964cd6cf
|
Update play_view.coffee
New Level Added : Sword Loop
|
2014-03-12 15:58:33 +05:30 |
|
Scott Erickson
|
9cb80783ff
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 22:01:47 -07:00 |
|
Scott Erickson
|
8ddbb49845
|
Trying out promises to simplify view loading.
|
2014-03-11 22:01:38 -07:00 |
|
Nick Winter
|
b560827e32
|
Working on cleaning up some server errors.
|
2014-03-11 19:17:58 -07:00 |
|
Nick Winter
|
2b487eeed8
|
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
|
2014-03-11 18:30:25 -07:00 |
|
Nick Winter
|
40ea643f67
|
Merge pull request #523 from dkundel/master
Avoid flickering of editor when executing the script.
|
2014-03-11 18:07:17 -07:00 |
|
Nick Winter
|
8c57b31c54
|
Fixed a couple bugs with the matches tab.
|
2014-03-11 18:06:48 -07:00 |
|
Dominik Kundel
|
c7ca878c69
|
added class property that got missing
|
2014-03-12 01:26:11 +01:00 |
|
Nick Winter
|
392534878a
|
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
|
2014-03-11 16:31:39 -07:00 |
|
Dominik Kundel
|
714c6ddf9b
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-11 23:50:51 +01:00 |
|
Dominik Kundel
|
4c7da1ea69
|
update Gutter only if changed
|
2014-03-11 23:47:27 +01:00 |
|
Nick Winter
|
852b1c97ac
|
Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.
|
2014-03-11 13:59:12 -07:00 |
|
Michael Schmatz
|
4062bba245
|
Created initial spectate level view
|
2014-03-11 13:12:45 -07:00 |
|
Ruben Vereecken
|
8709cdc472
|
Finished Article History
|
2014-03-11 19:33:27 +01:00 |
|
Nick Winter
|
eac219a2be
|
Inserted score history graph into ladder update emails.
|
2014-03-10 22:03:33 -07:00 |
|
Nick Winter
|
32baf2ae79
|
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
|
2014-03-10 21:30:46 -07:00 |
|
Nick Winter
|
6ce65488aa
|
Added simple rank history graph. Improving ladder update mail.
|
2014-03-10 20:22:25 -07:00 |
|
Ruben Vereecken
|
af73e5a594
|
Added a versions modal for every type
|
2014-03-10 23:29:34 +01:00 |
|
Ruben Vereecken
|
8e989ec08f
|
Got the level history view set up as before, but better
|
2014-03-10 23:17:19 +01:00 |
|
Nick Winter
|
c4a3b71786
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 13:57:51 -07:00 |
|
Nick Winter
|
6055512ac7
|
Working on ladder updates.
|
2014-03-10 13:20:00 -07:00 |
|
Ruben Vereecken
|
68b10d9023
|
History now shows a loading bar upon opening
|
2014-03-10 20:06:36 +01:00 |
|
Nick Winter
|
77f7276759
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 11:29:47 -07:00 |
|
Ruben Vereecken
|
06ae06fa34
|
Used mix-ins to combine Modal and VersionView
|
2014-03-10 19:08:53 +01:00 |
|
Nick Winter
|
234b3f105d
|
Reworked ladder game victory modal main call to action to actually submit game for ranking.
|
2014-03-10 10:36:28 -07:00 |
|
Nick Winter
|
6a71e97204
|
Improvements to HUD actions.
|
2014-03-10 09:37:05 -07:00 |
|
Ruben Vereecken
|
f6ece2d63e
|
Created a modal version of Version History
|
2014-03-10 12:16:08 +01:00 |
|
Nick Winter
|
3d71fcbc70
|
Wins, losses, and realizing that I'm not doing server code right.
|
2014-03-09 18:46:11 -07:00 |
|
Nick Winter
|
2d32bc1ac4
|
Reduced unnecessary name fetching.
|
2014-03-09 13:22:22 -07:00 |
|
Nick Winter
|
3e82e0b599
|
Disallow submission of non-denormalized sessions to ladders.
|
2014-03-09 12:53:11 -07:00 |
|
Nick Winter
|
34983059aa
|
Fixed bug with trying to show challenger modals with no hash to indicate we should.
|
2014-03-09 11:52:05 -07:00 |
|
Nick Winter
|
39c4657204
|
Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.
|
2014-03-08 15:43:56 -08:00 |
|
Nick Winter
|
b3964571e1
|
Fixed bug importing animations into existing ThangTypes that had only containers.
|
2014-03-08 15:04:11 -08:00 |
|
Scott Erickson
|
afbe2200a6
|
Fixed a bug with the new race condition fix. Moving the schemas to the application would be good.
|
2014-03-08 13:52:34 -08:00 |
|
Nick Winter
|
b0238d74a4
|
Let's just show 200 leaderboard entries for now until we have paging.
|
2014-03-08 11:50:10 -08:00 |
|
Nick Winter
|
1c44e3df1e
|
Fixed bug with linking to #my-matches tab.
|
2014-03-08 11:37:33 -08:00 |
|
Nick Winter
|
68099bbd7c
|
Victory modal for ladder games takes you back to the ladder matches.
|
2014-03-07 21:20:09 -08:00 |
|
Michael Schmatz
|
2f378106ca
|
Added checking level ladder status before submitting
|
2014-03-07 18:16:50 -08:00 |
|
Alexei Nikitin
|
98b36d299c
|
Update article model
|
2014-03-08 05:05:35 +04:00 |
|
Nick Winter
|
b6ae73ef29
|
Merge pull request #492 from Shrihari/issue464
Fixed Spell Debug View width bug
|
2014-03-07 16:14:57 -08:00 |
|
Scott Erickson
|
8fa9c9c410
|
Set up the level play view to show the guide on startup based on the showGuide property.
|
2014-03-07 15:18:56 -08:00 |
|
Scott Erickson
|
13b9a9cb58
|
Added dungeon arena tutorial to a few hardcoded places.
|
2014-03-07 15:16:13 -08:00 |
|
Scott Erickson
|
17231bce06
|
Added showsGuide and type properties to level.
|
2014-03-07 13:13:58 -08:00 |
|
Scott Erickson
|
be03485538
|
Set up the ladder play modal to be more forthright getting new players to play the tutorial.
|
2014-03-07 12:58:17 -08:00 |
|
Scott Erickson
|
d8d917ecf9
|
Set up better teardown for the ladder view.
|
2014-03-07 12:15:16 -08:00 |
|
Scott Erickson
|
610fc0694b
|
Turning off view caching by default now. Should help lower the memory footprint.
|
2014-03-07 11:57:15 -08:00 |
|
Shrihari
|
5274f22467
|
Fixed Spell Debug View width bug
|
2014-03-08 01:10:12 +05:30 |
|
Scott Erickson
|
d14f862359
|
Ladder view can now be linked to to play against a specific team.
|
2014-03-07 11:23:06 -08:00 |
|
Nick Winter
|
6e47416d24
|
Fixed some level IDs.
|
2014-03-06 19:09:15 -08:00 |
|
Michael Schmatz
|
45cd7e31ca
|
Made simulator level-independent
|
2014-03-06 18:48:41 -08:00 |
|
Scott Erickson
|
a6c4fe8d02
|
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
|
2014-03-05 20:04:14 -08:00 |
|
Nick Winter
|
2d69abf674
|
Merge pull request #481 from dkundel/master
Proposed UX improvement for #6
|
2014-03-05 13:45:14 -08:00 |
|
Dominik Kundel
|
a033a80722
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-05 22:18:53 +01:00 |
|
Dominik Kundel
|
b0d571c7ad
|
highlight only the executing statement
|
2014-03-05 22:17:34 +01:00 |
|
Scott Erickson
|
0a8d5b5b97
|
Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master
|
2014-03-05 10:35:06 -08:00 |
|
Shrihari
|
f6324807b3
|
Moved "Skip (esc)" next to Continue button
|
2014-03-05 23:36:18 +05:30 |
|
Dominik Kundel
|
d16d024782
|
further changes in design of highlighting lines in code
|
2014-03-05 17:06:46 +01:00 |
|
Shrihari
|
0ec431f90a
|
Moved 'skip tutorial' text to locales.
|
2014-03-05 13:46:21 +05:30 |
|
Dominik Kundel
|
a0e39480e3
|
new UI design for executing and executed lines in ACE editor
|
2014-03-05 02:00:38 +01:00 |
|
Nick Winter
|
4556536df4
|
Hooked up new HUD icons.
|
2014-03-04 11:15:31 -08:00 |
|
Ruben Vereecken
|
d43ff5d217
|
Added an anonymous check on the Fork button
|
2014-03-04 11:24:38 +01:00 |
|
Nick Winter
|
65d9186ef1
|
Fixed actions showing up under dialogue bubbles on repeated toggling.
|
2014-03-03 16:55:36 -08:00 |
|
Nick Winter
|
7b25eeec47
|
HUD properties now flow into columns more evenly, have max styling.
|
2014-03-03 16:45:03 -08:00 |
|
Nick Winter
|
873c560a06
|
Added Alexandru's Bubble Sort Bootcamp Battle to /play.
|
2014-03-03 16:22:50 -08:00 |
|
Nick Winter
|
c944e78271
|
Ladder views now show level descvription content if present.
|
2014-03-03 14:59:39 -08:00 |
|
Ruben Vereecken
|
0aa8e7bb7d
|
Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet
|
2014-03-03 22:21:56 +01:00 |
|
Scott Erickson
|
d66a9d6be0
|
Set up a generic choose tab for root views so hash->tab behavior is baked in.
|
2014-03-03 13:21:05 -08:00 |
|
Nick Winter
|
0c45b6c0e3
|
Fixes for ladder refreshing.
|
2014-03-03 12:21:59 -08:00 |
|
Ruben Vereecken
|
ee920afea9
|
Disabled buttons for non-owners in Article Editor
|
2014-03-03 21:13:02 +01:00 |
|
Michael Schmatz
|
a5864c4f0c
|
Live leaderboard updating
|
2014-03-03 12:10:27 -08:00 |
|
Scott Erickson
|
fb75ad36e7
|
Added team icons to the ladder play view.
|
2014-03-03 12:04:31 -08:00 |
|
Ruben Vereecken
|
942b69ea9f
|
Created hasWriteAccess on Cocomodel, used it for level access
|
2014-03-03 20:41:35 +01:00 |
|
Scott Erickson
|
65d39e658d
|
Removed the old team view cruft.
|
2014-03-03 11:15:46 -08:00 |
|
Scott Erickson
|
0d054bec8e
|
Refactored the universal wizard loading to happen silently when you import ThangType.
|
2014-03-03 10:42:11 -08:00 |
|
Scott Erickson
|
feaeb1dc98
|
Made the wizard icons colored based on user settings.
|
2014-03-03 10:21:51 -08:00 |
|
Scott Erickson
|
d3b6836a06
|
Fixed some bugs with the new ladder view when you haven't played before.
|
2014-03-03 09:20:14 -08:00 |
|
Scott Erickson
|
5bb56ac818
|
Merge branch 'feature/new-ladder-view'
|
2014-03-03 09:05:52 -08:00 |
|
Scott Erickson
|
22e80f6d24
|
Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.
|
2014-03-03 09:03:44 -08:00 |
|
Nick Winter
|
20fb9ba5b4
|
Merge pull request #461 from rubenvereecken/master
Localization centred patches and additions
|
2014-03-03 07:37:46 -08:00 |
|
Nick Winter
|
86fd098159
|
Localized WizardSprite movement hey handling to WizardSprite file.
|
2014-03-03 07:28:40 -08:00 |
|
Nick Winter
|
f2f0a993af
|
Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat
|
2014-03-03 07:22:44 -08:00 |
|
Ruben Vereecken
|
b8b22bb739
|
Localized 'Create New ..' and 'Search .. Here'
|
2014-03-03 12:45:04 +01:00 |
|
Nick Winter
|
82b250b9a3
|
protectAPI off again for Brawlwood, too slow for now.
|
2014-03-02 17:51:57 -08:00 |
|
Nick Winter
|
a8ef87c9ea
|
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
|
2014-03-02 16:06:22 -08:00 |
|
Ruben Vereecken
|
c2d247e686
|
Editor tables now load i18n correctly after search.
|
2014-03-03 00:31:49 +01:00 |
|
Scott Erickson
|
956e2b3c40
|
Set up the my matches tab in the new ladder view.
|
2014-03-02 13:24:41 -08:00 |
|
Scott Erickson
|
d0f416f668
|
Rearranging the ladder view.
|
2014-03-02 12:43:21 -08:00 |
|
Muhammed Thanish
|
da2ebf857a
|
Increase delay
|
2014-03-02 14:02:30 +05:30 |
|
Nick Winter
|
6c48660922
|
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
|
2014-03-01 16:57:29 -08:00 |
|
Muhammed Thanish
|
d7e031fd00
|
Use key.isPressed() to get movement direction
|
2014-03-02 03:27:06 +05:30 |
|
Muhammed Thanish
|
7ea9260322
|
Use WizardSprite
|
2014-03-02 01:45:49 +05:30 |
|