codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1578 commits 27 branches 0 tags 134 MiB
Commit graph

301 commits

Author SHA1 Message Date
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -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
Alexei Nikitin
535881b637 Update ambassador.jade 2014-03-07 12:20:17 -08:00
Alexei Nikitin
b002ae376b Update counselor.jade 2014-03-07 12:19:14 -08:00
Alexei Nikitin
317ae5cc32 Update scribe.jade 2014-03-07 12:17:32 -08:00
Scott Erickson
cf2a0a999e Set up the ladder play modal to point to the tutorial level dynamically. 2014-03-07 11:57:31 -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
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
Scott Erickson
1b257252f9 Merge branch 'production' 2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47 HUD properties now flow into columns more evenly, have max styling. 2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661 Reworked the victory modal styling a bit. 2014-03-03 16:39:56 -08:00
Nick Winter
c944e78271 Ladder views now show level descvription content if present. 2014-03-03 14:59:39 -08:00
Ruben Vereecken
b7fbf67e89 Enabled Fork button again. Previous commits solve issue #455 2014-03-03 22:52:37 +01: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
Nick Winter
461d66c795 Typo in my matches team ranking. 2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b Multiplied visible scores by 100 for more awesome. 2014-03-03 12:27:32 -08:00
Ruben Vereecken
05b4f536c1 Fixed a link to point correctly 2014-03-03 21:22:04 +01:00
Ruben Vereecken
ee920afea9 Disabled buttons for non-owners in Article Editor 2014-03-03 21:13:02 +01:00
Scott Erickson
1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
 2014-03-03 12:08:11 -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
ff3f3e5a07 Removed a link to the old team view. 2014-03-03 11:11:27 -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
Karthig
b04d63d5bf - create sass file to center 404 image on page 2014-03-03 11:42:07 -05:00
Karthig
357ef45cb0 - insert random error image into 404 page 2014-03-03 10:58:33 -05: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
a665aca039 Merge pull request #443 from M-r-A/master 
Finalized Russian translations
 2014-03-03 07:21:49 -08:00
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +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
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
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -08:00
Tay Yang Shun
f43dd2f3ff Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages. 2014-03-01 14:47:31 +08:00
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
Alexei Nikitin
d68ff5a899 Fix diplomat.jade building 2014-03-01 04:54:54 +04:00
Alexei Nikitin
789b49e15f Update diplomat.jade 2014-03-01 03:37:11 +04:00
Scott Erickson
10795df7d9 Renamed hardcoded project-dotas to brawlwoods. 2014-02-28 13:59:02 -08:00
Nick Winter
ad30130814 Merge pull request #437 from M-r-A/master 
Fix indents
 2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3 Update ambassador.jade 2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c Update archmage.jade 2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8 Update ambassador.jade 2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a Update adventurer.jade 2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7 Update artisan.jade 2014-02-27 16:54:22 -08:00
Nick Winter
de4c9cb60d Merge pull request #436 from M-r-A/master 
Fix link in legal.jade
 2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc Fix link in legal.jade 2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0 Improved a bunch of things with the wizard settings view. 2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39 Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu 
Changed English(Au) in two wrong places to Luthanian and Norwegian

Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa

Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess

Update not_found.jade

A couple tweaks to gokul1794's commits.
 2014-02-27 12:07:57 -08:00
Nick Winter
c26995a3a9 Home button on ladder level goes to ladder. 2014-02-26 18:58:25 -08:00
Nick Winter
5c1c17c8dd Green Guide button for attention. 2014-02-26 17:52:08 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Nick Winter
b86c32c3e2 Merge pull request #422 from yangshun/level-not-found 
Redirect to play page for non-existent levels. Fixes issue #396
 2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff Moved internationalisation of level load error message into template file 2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a Used internationalised strings for level not found message 2014-02-26 05:54:33 +08:00
Tay Yang Shun
8a24407d3e Redirect to play page for non-existent levels. Fixes issue #396 2014-02-26 04:59:35 +08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Scott Erickson
79ce16dbba Hiding most of the ladder page if not logged in. 2014-02-24 14:57:51 -08:00
Scott Erickson
e48bdfa1a7 Added your score to the ladder/team view. 2014-02-24 13:03:04 -08:00
Nick Winter
10e10aa961 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69 Playback and level editor shortcut tweaks. 2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556 Finished up work on the wizard settings modal. 2014-02-24 09:46:40 -08:00
Scott Erickson
2d6dd36a68 Saturation and lightness was flipped on the spritebuilder. Fixed. 2014-02-24 09:06:22 -08:00
Nick Winter
5b88b58a75 Fixed application of a few i18n tags in wizard/picture settings. 2014-02-23 12:31:41 -08:00
Nick Winter
11f742ff0f Included Hour of Code explanation in play footer. 2014-02-23 11:48:34 -08:00
Nick Winter
0d9213ad44 Faded Contact link until hover. 2014-02-22 17:45:24 -08:00
Nick Winter
8565e3f315 Adding the button, not just the shortcut, for beautification. 2014-02-22 17:18:58 -08:00
Nick Winter
72cfcf96ed Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels. 2014-02-22 12:01:05 -08:00
Scott Erickson
7261f9960c Tweaked the name column size in the ladder view. 2014-02-20 16:52:46 -08:00
Nick Winter
91a641d3ab Updated Diplomat instructions and related locale files. 2014-02-20 14:52:42 -08:00
Scott Erickson
9c30b9f0d0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:49:17 -08:00
Scott Erickson
48cf9a1443 Added a link to the tutorial level. 2014-02-20 14:31:33 -08:00
Nick Winter
3c651abe20 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8 Tweaks for ladder views. 2014-02-20 13:58:35 -08:00
Nick Winter
284576521f Added fullscreen toggle to play with. 2014-02-20 13:19:49 -08:00
George Saines
7d4431d2f2 adding youtube link for instructional vid 2014-02-20 12:41:04 -08:00
Scott Erickson
63ef2860d6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02 Upgrading docs return value schema. Added button template for tutorial and screencast on ladder. 2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -08:00
Michael Schmatz
6d6cac7309 Various interface tweaks 2014-02-20 10:56:32 -08:00
Michael Schmatz
cb0c22f0c9 Replaced rank button with button going to ladder page 2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f Put more security on the session submissions and improved simulation status rendering 2014-02-20 09:44:44 -08:00
Michael Schmatz
99de854536 Put in link to detail view 2014-02-20 08:39:27 -08:00
Michael Schmatz
e593fd23b4 Improved interface for simulating games 2014-02-20 08:06:14 -08:00
Scott Erickson
878d1e4098 Fixed the placement of the music note in the playback view. 2014-02-19 12:27:49 -08:00
Scott Erickson
f383e5b9fa Fixes for the ladder team view. 2014-02-18 12:27:10 -08:00
Scott Erickson
5a436ce10b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 11:41:29 -08:00
Scott Erickson
cacf6539c1 Working on the ladder and team views. 2014-02-18 11:38:49 -08:00
Nick Winter
d45f67a8c3 Fixed some popover and modal layout and bugs. 2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9 Working on the ladder and team views. 2014-02-17 17:42:41 -08:00