codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2640 commits 27 branches 0 tags 134 MiB
Commit graph

456 commits

Author SHA1 Message Date
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
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
Dominik Kundel
8a5aeb6227 save editor config to database 2014-03-14 02:09:11 +01:00