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

5165 commits

Author SHA1 Message Date
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Imperadeiro98
2f1f4d8594 Update pt-PT.coffee 2014-12-27 18:50:58 +00:00
Nick Winter
d9265c6624 Propagated i18n. 2014-12-27 10:39:44 -08:00
Imperadeiro98
b91f8eb927 Fixed last merge issues 2014-12-27 18:27:43 +00:00
MinecraftWidget
eb60d1b186 Minor Additions 2014-12-27 11:12:24 -07:00
Omar S.
1b0ab789ca Checked up to line 340 
Checked the translations of the next lines and added one tip translation
 2014-12-27 10:35:46 -05:00
Imperadeiro98
598ca7d2ad Merge pull request #1995 from mileshayter/patch-1 
Update de-AT.coffee
 2014-12-27 11:48:01 +00:00
MinecraftWidget
b4f48764ff More Additions 2014-12-26 23:47:39 -07:00
MinecraftWidget
af7dbfb9ca Edits and Additions 2014-12-26 22:59:28 -07:00
Omar S.
b91f9e8e65 Checked and improved all up to timeunits (line 210) 
I will continue tomorrow. I have changed some lines and added somemore
 2014-12-26 23:29:24 -05:00
mileshayter
4719818dad Update de-AT.coffee 
Some translation done, will try to continue ASAP :)
 2014-12-26 22:38:55 +01:00
Imperadeiro98
9fbd1076f9 Fixed a link 2014-12-26 18:02:40 +00:00
Imperadeiro98
4dbdf60f10 Fixed link 2014-12-26 18:01:57 +00:00
flauta
4e93b3628d Update it.coffee 2014-12-26 17:49:04 +01:00
flauta
8edb13b18d Update it.coffee 
una piccola parte delle stringhe delle schermate iniziali, come esperimento
 2014-12-26 15:29:18 +01:00
Martin005
ca810dd142 Update cs.coffee 
Fixed missing space.
 2014-12-26 12:17:25 +01:00
Imperadeiro98
f6576d3984 Merge pull request #1989 from nixel2007/master 
Update ru.coffee
 2014-12-26 10:32:49 +00:00
Martin005
275b66eb07 Update cs.coffee 
Finally translate ALL of the strings!!! *celebrate time* :)
 2014-12-26 01:21:23 +01:00
Nick Winter
b116321deb Tested and cleaned up comment detection for space disablement sensitivity. 2014-12-24 12:37:25 -08:00
Nick Winter
c7eadb5670 Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4 2014-12-24 12:24:27 -08:00
nixel2007
b3bced93ac Update ru.coffee 2014-12-24 22:57:54 +03:00
nixel2007
917a61b310 Revert "Fixed i18n-coverage bug" 
This reverts commit 97cdb76b82.
 2014-12-24 22:15:52 +03:00
Nick Winter
1c1f2008a5 Now able to suggest required items for purchase before level start. 2014-12-24 11:01:50 -08:00
nixel2007
d74a86d06a Merge remote-tracking branch 'upstream/master' 2014-12-24 15:19:43 +03:00
Nick Winter
f361674fb4 Enabling new levels for playtesting. 2014-12-23 17:14:59 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Nick Winter
f17b3bd03b Fixed indentation and punctuation for superpower tip. 2014-12-23 07:57:07 -08:00
Nick Winter
48603e5bc8 Merge pull request #1985 from osanseviero/patch-3 
New tip
 2014-12-23 07:56:19 -08:00
Omar S.
9a30c35a3b New tip 
Added superpower tip
 2014-12-23 09:54:57 -05:00
Omar S.
f48c2b0def New tip 
Added superpower tip
 2014-12-23 09:54:31 -05:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
1bb76d5902 Fixed shadow placements. 2014-12-23 09:12:41 -05:00
Imperadeiro98
31ed540964 Merge pull request #1983 from tpai/patch-1 
Update zh-HANT.coffee
 2014-12-23 09:06:33 +00:00
tonypai
30eb96f151 Update zh-HANT.coffee 2014-12-23 16:01:33 +08:00
Nick Winter
5e3ae981d7 Merge pull request #1981 from Lynxbob/master 
Added 3 new name lists and 10 new names
 2014-12-22 17:40:51 -08:00
Branden Webb
eb3e0621f2 Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F. 2014-12-22 20:07:22 -05:00
Omar S.
3ed3dd00fa Added two names 2014-12-22 18:19:57 -05:00
Scott Erickson
d18260c20c Merge branch 'master' into feature/campaign-editor 2014-12-22 16:39:07 -05:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
George Saines
116feb5bea turning off realtime playback on the riddling kithmaze 2014-12-22 11:11:43 -08:00
Imperadeiro98
72e426c0e0 Fixed another link 2014-12-22 18:16:06 +00:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889 Set up the CampaignEditorView to trigger the CampaignView to re-render when things change. 2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236 When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView. 2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView. 2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Rishi
364f40274d Update SpellView.coffee 
hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .
 2014-12-22 18:06:32 +05:30
Imperadeiro98
2bca94161e Fixed a link 2014-12-22 11:22:06 +00:00
Nick Winter
e153a7ecce Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking. 2014-12-21 21:38:12 -08:00
Matt Lott
e7c626656e No-cache User fetch in hero victory 
After earning achievements.  On IE, this call results in a cache hit,
so the User object was never updated with the sweet sweet loot you just
earned.  Like a sword you need for True Names.
 2014-12-21 21:14:38 -08:00
Imperadeiro98
8da578e106 Update en.coffee 2014-12-21 21:46:45 +00:00
Imperadeiro98
393860ffa4 Update en.coffee 2014-12-21 21:30:15 +00:00
Imperadeiro98
0c00f9f0c1 Delete contribute_nav.jade 2014-12-21 21:09:52 +00:00
Imperadeiro98
5d9e303fb1 Added Martin005 2014-12-21 20:53:43 +00:00
Imperadeiro98
2b0757810c Merge pull request #1973 from uaMithril/patch-3 
Update uk.coffee
 2014-12-21 20:11:47 +00:00
Imperadeiro98
0cbf76bc36 Merge pull request #1972 from uaMithril/patch-2 
Update uk.coffee
 2014-12-21 20:09:58 +00:00
Imperadeiro98
81eb028025 Merge pull request #1971 from tpai/patch-1 
Update zh-HANT.coffee
 2014-12-21 20:09:14 +00:00
Imperadeiro98
0c01a4ed8c Merge pull request #1964 from Martin005/patch-5 
Update cs.coffee
 2014-12-21 20:02:27 +00:00
Mithril
837b62ee9d Update uk.coffee 2014-12-21 13:51:18 +02:00
Mithril
7ad505252b Update uk.coffee 2014-12-21 13:03:48 +02:00
tonypai
e815dff1de Update zh-HANT.coffee 
Hi, I've already sign the CLA, and this is my PR. :)
 2014-12-21 16:13:40 +08:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5 Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings. 2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699. Fixed #57. Colored collision overlays according to collision categories. 2014-12-20 13:39:51 -08:00
Martin005
eed3043a6d Update cs.coffee 2014-12-20 19:00:56 +01:00
Imperadeiro98
a52bf08792 Fixed links 2014-12-20 09:32:59 +00:00
Imperadeiro98
6ebf25ad15 Linked community page to new i18n 2014-12-20 09:28:56 +00:00
Imperadeiro98
bd5184c23b Update pt-PT.coffee 2014-12-20 09:12:31 +00:00
Nick Winter
08cb87c84d Automatically take screenshots when submitting contact form from level view. 2014-12-19 18:37:42 -08:00
Nick Winter
0041ffe423 Propagated i18n. 2014-12-19 15:36:16 -08:00
Nick Winter
2df1318e1b Hooked up i18n for redesigned contribute view. 2014-12-19 15:35:18 -08:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Imperadeiro98
4ca342c389 Fixed spacing 2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44 Merge pull request #1940 from uaMithril/patch-1 
Update uk.coffee
 2014-12-19 20:45:19 +00:00
David Nagy
0c88f9f39c Update hu.coffee 2014-12-19 20:18:08 +00:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
23da22a559 Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data. 2014-12-19 13:04:04 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
George Saines
31fb5fe80e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -08:00
Matt Lott
f853259304 Updating help videos 
Moving dungeons-of-kithgard to Vimeo
Adding original style for haunted-kithmaze
 2014-12-18 14:04:48 -08:00
Matt Lott
f2835a998a Add second kith maze help video 2014-12-18 12:05:10 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Matt Lott
70cd8aa20d Update Vimeo embed player params 2014-12-17 23:59:59 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -08:00
Matt Lott
d494dc9c79 Add video tutorials to game guide 2014-12-17 22:26:36 -08:00
Nick Winter
fe0c89e433 Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler. 2014-12-17 21:54:56 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
nemoyatpeace
0496c9338d Update SpellView.coffee 
Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy
 2014-12-18 09:10:07 +08:00
Nick Winter
da72991260 A few misc tweaks for the new desert level options. 2014-12-17 12:42:42 -08:00
nixel2007
97cdb76b82 Fixed i18n-coverage bug 
Added analysis of the translation of all available properties
 2014-12-17 23:21:54 +03:00
Imperadeiro98
d1e4a98981 Merge pull request #1947 from Martin005/patch-4 
Update cs.coffee
 2014-12-17 15:42:48 +00:00
Martin005
821f31f02e Update cs.coffee 2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493 Update pt-BR.coffee 2014-12-17 08:56:31 -02:00
Nick Winter
a98deb1ff8 Making item requiring smarter about which slots can be required for non-warriors. 2014-12-16 18:57:54 -08:00