codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-04 12:51:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3925 commits 27 branches 0 tags 134 MiB
Commit graph

659 commits

Author SHA1 Message Date
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Nick Winter
9f18811701 Fixed logic for displaying runtime errors from last run based on code being the same as last cast. 2014-05-01 17:41:06 -07:00
Scott Erickson
26cafd2f19 Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too. 2014-05-01 16:38:27 -07:00
Nick Winter
5376a42f94 Fixed serialization of tracked property arrays. 2014-05-01 13:23:14 -07:00
Nick Winter
bebe5a0620 Improved hover debugger tokenization specificity to not extend past end of line. 2014-05-01 11:18:20 -07:00
Nick Winter
eca35ce371 Several minor bugfixes, and enabled API protection on all levels by default. 2014-04-29 15:25:59 -07:00
Nick Winter
40fbf336c2 Using new level loading sound. 2014-04-28 17:59:02 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Nick Winter
7e16fa5bd6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 14:01:43 -07:00
Nick Winter
6d75b5593a Fixed bug with pointer animation. 2014-04-28 14:01:33 -07:00
Scott Erickson
3a28f190a1 Merge branch 'master' into feature/loading-views 2014-04-28 11:55:17 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Nick Winter
4a2f2700bc Don't show tutorial level link if tutorial level doesn't exist for a ladder level. 2014-04-28 10:54:03 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Nick Winter
a7179ae3b2 Fixed some more gold view stuff. 2014-04-27 15:33:16 -07:00
Nick Winter
2ec225b0d0 Enabled API protection for Find the Spy. 2014-04-27 14:30:32 -07:00
Nick Winter
dac4f05fd9 Improved legibility of gold font. Moved Done button to not conflict with gold display. 2014-04-27 14:19:39 -07:00
Nick Winter
fa0e7f04f7 Fixed a thing. 2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
d8d2a57c38 Listed a few new levels. 2014-04-25 15:00:46 -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
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe Updated janky include_flow skip levels. 2014-04-23 16:11:47 -07:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Michael Schmatz
7419b269f1 Merge pull request #894 from codecombat/feature/worker-lint 
Background linting/transpilation/hasChangedSignificantly
 2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28 Removed web worker logging listener 2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a Renamed test_worker to aether_worker 2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d Removed superfluous comment 2014-04-22 11:51:51 -07:00
Michael Schmatz
3bbedbc100 Added background transpile 2014-04-22 11:46:17 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e Fixed race condition 2014-04-22 11:04:56 -07:00
Michael Schmatz
81809956b8 hasChangedSignificantly async refactor 
Still checking for bugs
 2014-04-22 08:54:35 -07:00
Michael Schmatz
0f435b41ae Merge pull request #885 from codecombat/master 
Merge master into worker-lint
 2014-04-21 14:13:43 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
7321052c18 Fix supermodel with resource value and fix ladder view under supermodel resource management. 2014-04-19 13:06:47 -04:00
Ting-Kuan
375aca2c0a Fix: Some level systems load forever. 2014-04-19 12:08:40 -04:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
Michael Schmatz
a7867e5e2d Added background linting 
Background hasChangedSignificantly is soon!
 2014-04-18 14:59:08 -07:00
dpen2000
b20f8fd260 Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee 2014-04-18 21:06:57 +01:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Ting-Kuan
fe96289bf6 debugging: ladder_view doesn't show loading bar. 2014-04-17 15:57:08 -04:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
dpen2000
a6ed7c9bff Fix players above the current player coming out in wrong order in original and simulators leaderboard 2014-04-16 18:20:59 -04:00
dpen2000
62e2de6cee Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now 2014-04-16 17:07:25 +01:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Ting-Kuan
c53eb562a3 Remove debug msg. 2014-04-16 02:31:18 -04:00
dpen2000
a74f89c30c Implement rank column in simulators leaderboard 2014-04-15 23:13:10 +01:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07: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
dpen2000
ec3c292b72 Implement simulators leaderboard 2014-04-13 02:35:58 +01: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
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
97d4017869 Hacky way to get play background to fit with new loading image. 2014-04-11 16:15:26 -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
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
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00
Michael Schmatz
a796d88967 Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07:00
Michael Schmatz
42bf2996af Made Aether ignore variable hoisting 
See #813
 2014-04-10 10:36:32 -07:00
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -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
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
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
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02: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
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
62867534a7 Fixed #727. 2014-03-28 09:52:07 -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
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
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
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
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
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
dbeb3d445b Give focus back to spell view on palette click. 2014-03-23 16:48:30 -07:00
Nick Winter
656b34fc34 Fixed comment gutter icons jumping all over the place. 2014-03-23 16:00:23 -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
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
dpen2000
a35d0cb651 Implement saving lastLevel in database re #627 2014-03-22 00:01:32 +00:00
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -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
Nick Winter
ff1e64e1f6 Less useless ladder refresh requests. 2014-03-19 18:26:38 -07:00
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07: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
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
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
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
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
Dominik Kundel
ce6533de59 changing ace edit mode based on setting 2014-03-15 23:14:57 +01:00
Dominik Kundel
46133ab85d added select statement for programming language 2014-03-15 22:00:29 +01: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
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
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
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