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
4890 commits 27 branches 0 tags 134 MiB
Commit graph

3592 commits

Author SHA1 Message Date
Imperadeiro98
d7270335ca Update diplomat.jade 
Added all the languages and myself.
 2014-08-14 09:04:29 +01:00
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -07:00
Nick Winter
7844a2b987 Some fixes for new user views breaking on bad data or certain configurations. 2014-08-13 19:17:26 -07:00
Nick Winter
4f3af4d64f Fixed #1433. 2014-08-13 14:57:07 -07:00
Nick Winter
bdb3e14189 Added missing ForkModal. 2014-08-13 14:26:56 -07:00
Scott Erickson
31e3e7f98e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-13 14:06:03 -07:00
Scott Erickson
f9e8bfad9f Made some minor changes. 2014-08-13 13:45:24 -07:00
Nick Winter
b7d5428d5f Made Forking more abstract to apply to ThangTypes, too. 2014-08-13 11:36:00 -07:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Jayant Jain
f4b8b76f46 Adds subclass for component config nodes 2014-08-13 12:39:21 +05:30
Jayant Jain
76c784b1de Adds default scripts whenever a new level is created 2014-08-13 12:11:37 +05:30
Jayant Jain
1e52f237b7 Reworks undo-redo and undo-redo descriptions 2014-08-13 06:56:03 +05:30
Jayant Jain
094f26fc63 Removes undo-redo description methods from treema subclasses 2014-08-13 05:28:23 +05:30
Nick Winter
d3fb168636 Merge pull request #1431 from Imperadeiro98/master 
Updated files
 2014-08-12 15:52:53 -07:00
Jayant Jain
67ed28e034 Undo redo descriptions for settings tab view 2014-08-13 02:55:36 +05:30
Jayant Jain
d713c35db7 Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView 2014-08-13 02:55:36 +05:30
Jayant Jain
9c235fa797 Minor refactoring and bug fixes for undo and undo descriptions 2014-08-13 02:55:36 +05:30
Jayant Jain
c6caef6219 Undo redo descriptions for ThangsTabView 2014-08-13 02:55:36 +05:30
Imperadeiro98
eccf148793 Big update to pt-PT.coffee 2014-08-12 22:11:14 +01:00
Imperadeiro98
2ec8a69de0 Update locale.coffee 
Updated pt-PT description and added Catalan.
 2014-08-12 22:09:46 +01:00
Darredevil
1b1174d460 Added 'Classic Algorithms' level section 2014-08-12 23:23:43 +03:00
Nick Winter
291b44f0a6 Fix typo introduced in last commit. Like a boss. 2014-08-12 12:56:55 -07:00
Nick Winter
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Nick Winter
6d04b583f9 Added volume slider to game options. 2014-08-12 10:10:54 -07:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Nick Winter
9fd31c70e7 Hid parts of game menu that aren't ready yet. 2014-08-12 09:13:23 -07:00
Scott Erickson
8fafd46b7f Reined in an overzealous css rule. 2014-08-12 09:04:36 -07:00
Nick Winter
a4663bf5e4 Merge pull request #1426 from jayant1992/temp 
Terrain generator
 2014-08-12 08:42:15 -07:00
Nick Winter
cfc0ddbd68 Merge pull request #1425 from Imperadeiro98/master 
Update pt-PT
 2014-08-12 08:39:44 -07:00
Jayant Jain
eece235337 Adds preset images 2014-08-12 20:42:42 +05:30
Imperadeiro98
612056eaf6 Started Contribute 
I started translating Contribute and I will uncomment when it is translated integrally.
 2014-08-12 14:05:39 +01:00
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Imperadeiro98
8a3d9d6af2 Update pt-PT.coffee 
In line 451, does it refer to "Game" or "Games".
 2014-08-12 12:40:41 +01:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Imperadeiro98
ab3b6f29f3 Update pt-PT.coffee 2014-08-12 09:49:23 +01:00
Imperadeiro98
73e18a66e7 Update pt-PT.coffee 2014-08-12 09:45:54 +01:00
Jayant Jain
b6e53d87c7 More decorations! (for dungeon preset) 2014-08-12 10:35:09 +05:30
Jayant Jain
5d8264e887 Takes care of overlapping walls for rooms 2014-08-12 10:35:09 +05:30
Jayant Jain
9d001524c6 Adds initial indoor preset for terrain generator 2014-08-12 10:35:09 +05:30
Scott Erickson
88252806c7 Fixed #1413. 2014-08-11 18:47:41 -07:00
Nick Winter
4cc79e985e A few fixes for adding items to inventories in ThangTypes. 2014-08-11 17:09:44 -07:00
Nick Winter
00aa211a7d Merge pull request #1421 from Imperadeiro98/master 
New strings translated
 2014-08-11 16:18:25 -07:00
Nick Winter
910e064bb0 Merge pull request #1423 from jayant1992/temp-bugfix 
Fixes bug with enter press on thangs tab
 2014-08-11 16:16:22 -07:00
Nick Winter
9a5cd22069 Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels. 2014-08-11 16:15:46 -07:00
Jayant Jain
4beb85a3e7 Fixes bug with enter press on thangs tab 2014-08-12 04:16:17 +05:30
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
023fd40767 Renamed inventory to collectedThangIDs for Collects. #59 2014-08-11 12:52:40 -07:00
Nick Winter
2bc92f1a6e Merge pull request #1422 from dkundel/master 
Fixed issue #1420 and pasting snippets on click
 2014-08-11 12:47:36 -07:00
Imperadeiro98
bd0f75a414 Update pt-PT.coffee 2014-08-11 20:35:41 +01:00
Dominik Kundel
c2e53be58f Merge remote-tracking branch 'upstream/master' 2014-08-11 21:34:24 +02:00
Dominik Kundel
d2c63f4b98 fixed undo manager to not remove all code 2014-08-11 21:34:02 +02:00
Imperadeiro98
6c2a0ef77c Update pt-PT.coffee 2014-08-11 20:04:23 +01:00
Imperadeiro98
18380f4dd5 Update pt-PT.coffee 
In line 432, is the string right?
 2014-08-11 20:03:29 +01:00
Imperadeiro98
010afc7e95 Update pt-PT.coffee 2014-08-11 19:29:54 +01:00
Nick Winter
31d7e641e6 Fixes for equipping items and adding them to the World. 2014-08-11 11:04:38 -07:00
Nick Winter
cf7e2042c9 Got bitten by another case of #1108. 2014-08-11 10:02:39 -07:00
Dominik Kundel
14f96a7eac Merge remote-tracking branch 'upstream/master' 2014-08-11 15:30:05 +02:00
Ruben Vereecken
672b0f54f6 Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
Nick Winter
706ab7a251 Trying to get item ThangType nodes and inventory loading working. 2014-08-10 22:09:13 -07:00
Nick Winter
d1e26b40c2 I retook the Nick name. 2014-08-10 17:47:18 -07:00
Nick Winter
0074a04cfe Moved Restart into Game Menu. 2014-08-10 17:41:18 -07:00
Nick Winter
45c762fddc Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n. 2014-08-10 17:26:30 -07:00
Nick Winter
fb95f48f73 Implemented GameMenu OptionsView. 2014-08-10 16:27:33 -07:00
Nick Winter
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Scott Erickson
65658dec78 Small styling fix. 2014-08-10 13:07:06 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Nick Winter
da74a5ae77 Merge pull request #1410 from kisik21/patch-1 
Update ru.coffee
 2014-08-08 15:05:38 -07:00
kisik21
dfd5fad258 Update ru.coffee 
Oh nooooo...
 2014-08-09 01:34:41 +04:00
kisik21
450831548e Update ru.coffee 
Slag, why I am so stupid? I am making more and more commits, to fix MY errors, when I can do not make them...
 2014-08-09 01:28:06 +04:00
kisik21
8bfb8a5049 Update ru.coffee 
Fixed some errors in formatting, seems like I broke that...
 2014-08-09 01:13:28 +04:00
kisik21
e882abcb79 Update ru.coffee 
Кое что подправил, по совету Alexei Nikitin (Прошу прощения, если неправильно написал ник)
Fixed some strings with Alexei Nikitin (Sorry if I wrote your nickname incorrectly)
 2014-08-09 00:54:03 +04:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Ruben Vereecken
e6569539dc User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
Nick Winter
cc0ea25262 Merge pull request #1412 from rubenvereecken/meh 
Table headers are now unhoverable
 2014-08-08 08:38:05 -07:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Jayant Jain
593c31f33c Shows dragged component over other layers 2014-08-08 18:16:12 +05:30
Jayant Jain
93fd301300 Increases add treema line height, components are selected after being added 2014-08-08 18:02:20 +05:30
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
Ruben Vereecken
3bfd341363 Goal states are now tracked in level sessions (state.goalStates) 2014-08-08 13:10:31 +02:00
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Scott Erickson
9403d39b61 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-07 18:48:41 -07:00
Scott Erickson
94ca62f4c5 Fixed a bug I added in some minor final changes. 2014-08-07 18:48:30 -07:00
Nick Winter
9363665610 Merge pull request #1416 from Darredevil/patch-13 
Added new level 'QuickSort the Spiral'
 2014-08-07 18:31:53 -07:00
Scott Erickson
cc025942f8 Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
Darredevil
bea6e12a3a Minor name fix 2014-08-08 03:26:13 +03:00
Darredevil
3dfe7987ea Added new level 'QuickSort the Spiral' 2014-08-08 02:04:02 +03:00
Scott Erickson
0c5364eebb Removed editorMode. 2014-08-07 14:22:43 -07:00
Ruben Vereecken
e082d363be Table headers are now unhoverable 2014-08-07 13:12:30 +02:00
George Saines
0549273d14 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8 community page redesign 2014-08-06 17:42:19 -07:00
Scott Erickson
29770bd220 Added a function for denormalizing levels, extending level thang components and configs with ones from thang types. 2014-08-06 15:18:22 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Nick Winter
852dabc17a Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance. 2014-08-06 07:43:56 -07:00
Nick Winter
74283bafed Made sure items equip themselves within the SpriteBoss, too. 2014-08-05 21:47:51 -07:00
kisik21
46c6051102 Update ru.coffee 2014-08-06 02:42:30 +04:00
Scott Erickson
eceac0bbc9 Hiding the randomize button overlay until #1409 is handled. 2014-08-05 15:06:11 -07:00
Scott Erickson
d5a8d8dc72 Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108. 2014-08-05 14:56:11 -07:00
Scott Erickson
c5d496c063 Removed a bit for debugging. 2014-08-05 13:40:36 -07:00
Scott Erickson
30998ecbec Fixed components w/out changes sometimes showing up in the save level modal. 2014-08-05 13:21:45 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Dominik Kundel
84c0fbd01f use shortName as fallback for some entries if no snippet 2014-08-05 11:19:15 +02:00
Nick Winter
3bbdee583d Better problem alert layout for alerts that include hints. 2014-08-04 20:16:12 -07:00
Nick Winter
a0b75ddb8e Put Sky Span up for testing. 2014-08-04 19:46:00 -07:00
Dominik Kundel
f09b3c4792 Merge remote-tracking branch 'upstream/master' 2014-08-04 23:03:28 +02:00
Dominik Kundel
50517431db added support for inserting snippets by shift+click 2014-08-04 23:02:54 +02:00
Dominik Kundel
86eea93e2f merged changes 2014-08-04 22:37:15 +02:00
Ruben Vereecken
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Nick Winter
85011d1ed4 No need to explicitly track subviews for determining what the current view is. 2014-08-04 13:21:42 -07:00
Darredevil
a11649b12b Typo fix 2014-08-04 23:15:01 +03:00
Nick Winter
0bcaf70d56 Merge pull request #1406 from rubenvereecken/forms_fix 
Fixed missing errors bug
 2014-08-04 12:49:22 -07:00
Nick Winter
8a86e86012 Merge pull request #1390 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-04 12:45:13 -07:00
Ruben Vereecken
c165d46e17 Fixed missing errors bug 2014-08-04 20:02:26 +02:00
Ruben Vereecken
fb3848359e Merge branch 'master' into achievements 2014-08-04 17:55:44 +02:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Jayant Jain
549f2657ea Styles add button for addComponentsTreema 2014-08-04 07:53:24 +05:30
Jayant Jain
06875ce2b8 Resolves bug with mouseenter and mouseleave callbacks for add components treema 2014-08-04 07:21:02 +05:30
Jayant Jain
9e1513eb56 Add button on hover for addComponentsTreema 2014-08-04 07:05:22 +05:30
Jayant Jain
98f43b679f Adds component upon double click, newly added components are automatically selected 2014-08-04 06:04:35 +05:30
Jayant Jain
03d696c3df Components can now be added to thangs by dragging and dropping 2014-08-04 05:51:12 +05:30
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Imperadeiro98
0663dbc414 Update pt-PT.coffee 2014-08-01 10:39:30 +01:00
Imperadeiro98
4b932593be Update pt-PT.coffee 2014-07-31 18:39:13 +01:00
Imperadeiro98
96fb84362a Update pt-PT.coffee 2014-07-31 18:21:23 +01:00
Imperadeiro98
c7212226ae Update pt-PT.coffee 2014-07-31 18:01:09 +01:00
Imperadeiro98
68e3110e74 Update pt-PT.coffee 2014-07-31 17:38:14 +01:00
Michael Schmatz
ca7b8ca10a Merge pull request #1401 from rubenvereecken/test_fix 
Repaired TestView by only loading js files once
 2014-07-31 08:14:59 -07:00
Michael Schmatz
e7de8e3282 Merge pull request #1396 from rubenvereecken/refactoring 
[Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)
 2014-07-31 08:12:18 -07:00
Michael Schmatz
2ebc7f5aa6 Merge pull request #1398 from jayant1992/master 
Updates for script tab in level editor
 2014-07-31 08:12:04 -07:00
Michael Schmatz
52b8dd8db3 Merge pull request #1400 from rubenvereecken/moment_update 
Added Moment i18n support
 2014-07-31 08:11:01 -07:00
Michael Schmatz
0b9df5150d Merge pull request #1393 from Melondonut/patch-3 
Korean translation - patch3
 2014-07-31 08:10:22 -07:00
Ruben Vereecken
0e5accb707 Repaired TestView by only loading js files once 2014-07-31 13:15:57 +02:00
Imperadeiro98
3d71d155b6 Update pt-PT.coffee 2014-07-31 10:50:01 +01:00
Ruben Vereecken
41729f9700 Added Moment i18n support 2014-07-30 23:19:21 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Imperadeiro98
1f8ce2eaf2 Update pt-PT.coffee 2014-07-30 20:47:03 +01:00
Jayant Jain
2690ef9a59 Reorders script ids upon deletion 2014-07-30 01:05:04 +05:30
Jayant Jain
f0940308ea Newly inserted scripts are automatically assigned id 2014-07-30 00:52:59 +05:30
Jayant Jain
632d9a666e Shows all autocomplete values on click instead of having to type initially 2014-07-30 00:52:59 +05:30
Jayant Jain
0555c2ec14 Initial autocomplete for event checks in scripts tab 2014-07-30 00:52:59 +05:30
Ruben Vereecken
d4043ac3db Implemented singleplayer and multiplayer games played on profile 2014-07-29 20:11:45 +02:00
Ruben Vereecken
39c01c0bcb Finished refactoring of LevelGuideModal (renamed from docs_modal) 2014-07-29 19:50:50 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
026e6e6378 Added some support to fetch level sessions for the user profile page 2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b Did a bunch related to achievements and user profile page 2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Ruben Vereecken
15c1939657 Started on achievement setup script 2014-07-28 14:17:25 +02:00
Melondonut
9b830fff26 Update ko.coffee 2014-07-28 18:58:48 +09:00
Melondonut
9d93d871e1 Update ko.coffee 2014-07-28 13:35:05 +09:00
Melondonut
5307515553 Update ko.coffee 2014-07-28 13:07:18 +09:00
Melondonut
53dd446db1 Update ko.coffee 2014-07-28 12:44:20 +09:00
Imperadeiro98
3ffeda8bbc Update pt-PT.coffee 2014-07-27 19:31:56 +01:00
Michael Schmatz
d7cb76d10c Merge branch 'pr/1387' 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Jayant Jain
df554360fe Updates glyphicons for undo-redo, adds placeholder text for add thangs search 2014-07-26 01:55:15 +05:30
Darredevil
3b704330d6 Documentation tab for Level Editor 2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef Merge branch 'codecombat-master' 
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 22:48:13 +03:00
Darredevil
e3a0ea400c Docs tab v2 2014-07-25 22:33:55 +03:00
Jayant Jain
3e9dbe0d0b Fixes bug in undo/redo on SystemsTabView 2014-07-25 18:07:09 +05:30
Jayant Jain
d3962c19bd Ensures randomised thang clusters do not overlap each other 2014-07-25 18:07:01 +05:30
Jayant Jain
f700ddea0c Adds temporary hack for infinite loops in randomise 2014-07-25 18:06:54 +05:30
Jayant Jain
1790215fea Adds rooms and doors to dungeon preset 2014-07-25 18:06:44 +05:30
Jayant Jain
dc66218c00 Adds undo and redo buttons in editor topbar 2014-07-25 18:06:34 +05:30
Jayant Jain
9a24341fa5 Prevents overlapping of randomly generated thangs 2014-07-25 18:06:25 +05:30
Jayant Jain
3df2de8bec Number of decorations scales appropriately with preset size 2014-07-25 18:06:13 +05:30
Jayant Jain
dce6254d4a Fix for flickering thangs due to exact same coordinates 2014-07-25 18:06:03 +05:30
Jayant Jain
598e727500 Adds an initial dungeon preset, refactors border code to properly create dungeon walls 2014-07-25 18:05:49 +05:30
Jayant Jain
80da704d19 Background image paths automated, adds preset image files 2014-07-25 17:54:10 +05:30
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded 
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
 2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799 Refactors some code for presets in terrain generator 2014-07-25 17:50:21 +05:30
Jayant Jain
86cf344f28 Adds preset images to preview the generated terrain 2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893 Docs tab v2 2014-07-25 01:26:34 +03:00
Imperadeiro98
19f257f1d0 Update pt-PT.coffee 2014-07-24 22:43:39 +01:00
Michael Schmatz
d773c301fb Add message if no player code in profile 2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b Add login link to profile login prompt 2014-07-24 10:16:43 -07:00
Melondonut
26ab77b1ae Update ko.coffee 2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b Update ko.coffee 2014-07-24 15:30:54 +09:00
Michael Schmatz
e0d7392c1f Merge pull request #1386 from codecombat/pr/1376 
Pr/1376
 2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0 Uncommented some commented translated lines 2014-07-23 15:23:53 -07:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383' 
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
 2014-07-23 14:44:15 -07:00
Ruben Vereecken
cde87e4fe5 Covered general patches with tests 2014-07-23 20:00:28 +02:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Dominik Kundel
5279b01483 fixed showing pinned popover 2014-07-23 17:39:16 +02:00
Scott Erickson
beef508e76 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc Renamed problem and spell to their new, capitalized names. 2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f fixed spell palette sliding behind HUD 2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3 fixed artefact 2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843 last fix for dimming the editor 2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Melondonut
cb3f547b9e Update ko.coffee 2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81 Update ko.coffee 2014-07-23 13:56:18 +09:00
Ruben Vereecken
8969311d82 Butons on profile page now nicer 2014-07-22 21:52:52 +02:00
Dominik Kundel
5db634d6a8 fullscreen on keyboard shortcut 2014-07-22 21:47:36 +02:00
George Saines
8982c7ea5b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-22 09:11:30 -07:00
George Saines
574252df32 subbing in Pavel's better tiny programming language icons 2014-07-22 09:11:25 -07:00
greyhusky
a313c3ab27 More translations 
Translated the "about" page and parts of "legal" page as well as some other stuff
 2014-07-22 15:01:47 +02:00
Ruben Vereecken
411bb87985 Added contributor categories to user profile page 2014-07-22 12:50:56 +02:00
Melondonut
8476aa33f9 Update ko.coffee 2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff Update ko.coffee 2014-07-22 10:13:24 +09:00
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f Removed filterActive from filter alerts 2014-07-21 14:47:44 -07:00
Ruben Vereecken
ebdbc0f891 Basis for user view is finished 2014-07-21 22:02:08 +02:00
Ruben Vereecken
972d231ff5 Refactored router and views to anticipate the renameViews feature 2014-07-21 19:49:16 +02:00
Ruben Vereecken
0d87209fa8 Recently played is now shown on account page 2014-07-21 19:06:22 +02:00
Michael Schmatz
735a7082ee Correction to filter schema 2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2 Added saved employer filter alerts to schema 2014-07-21 09:44:40 -07:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81 Half the account page is there 2014-07-21 13:40:11 +02:00
Nick Winter
ac7e663418 Merge pull request #1359 from Melondonut/patch-2 
translation Update ko.coffee
 2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0 uncommented line 485 2014-07-21 14:11:17 +09:00
Darredevil
61ebc4d15b Docs tab 2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe Merge pull request #1360 from Darredevil/master 
Docs page enhancement
 2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9 Docs page enhancement 2014-07-21 02:23:01 +03:00
Nick Winter
99e1a8b30a Merge pull request #1357 from TheSecretSquad/issue#1213crosshair 
Changed point marker to crosshair, made it bigger, and changed color to white
 2014-07-20 16:04:29 -07:00
Nick Winter
a7905db316 Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible. 2014-07-20 15:51:48 -07:00
Melondonut
f5ac5423f8 Update ko.coffee 
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
 2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c fix for no user logged 2014-07-20 22:14:33 +03:00
Melondonut
9724c4f218 Update ko.coffee 
Hi there. 
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."  
thank you, 
Melondonut.

안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
 2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16 A few bugfixes, plus gigantic child window convenience for me editing levels. 2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed Changed point marker to crosshair, and changed color to white 2014-07-19 20:12:56 -04:00
Nick Winter
d45c2d31de New language icons. 2014-07-18 20:14:41 -07:00
Scott Erickson
e7a70bbd0b Merge conflict handling. 2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804 Removed the deprecated ErrorView. 2014-07-18 16:56:08 -07:00
Scott Erickson
00c11fd70e Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data. 2014-07-18 16:46:28 -07:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-18 16:12:27 -07:00
Scott Erickson
90a4a1b635 Added setProjection so CocoModels can more easily get subsets of data. 2014-07-18 16:12:27 -07:00
George Saines
18631ec5b1 upgrading our level icons 2014-07-18 15:42:53 -07:00
Michael Schmatz
321bce121c Edited task schema 2014-07-18 14:50:31 -07:00
Imperadeiro98
3ac1d6c77c Update pt-PT.coffee 2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc Update pt-PT.coffee 2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11 Propagated i18n tags for code language blurbs. 2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Scott Erickson
708f67ebd5 Merge branch 'master' into renameViews 2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 17:23:56 -07:00
Scott Erickson
59b723b890 Refactoring View to ModalView. 2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583 Refactoring View to CocoView. 2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Nick Winter
079d336881 Stopped .nano from overriding Bootstrap's column width for component docs page. 2014-07-17 16:36:59 -07:00
Scott Erickson
2b4b91733c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e Work on the job profile view, initial work on the code modal. 2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d Merge pull request #1344 from Darredevil/master 
fix for no user logged
 2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-17 16:29:26 -07:00
Scott Erickson
4818a81854 Added setProjection so CocoModels can more easily get subsets of data. 2014-07-17 16:22:06 -07:00
Nick Winter
e412a7b73f Merge pull request #1341 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-17 16:00:54 -07:00
Nick Winter
769c26229e Merge pull request #1340 from sunzenshen/master 
Fixed typo: Chose -> Choose
 2014-07-17 15:59:08 -07:00
Nick Winter
8813a7f545 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Scott Erickson
590626d5f8 Centered social link icons. 2014-07-17 09:30:27 -07:00
Scott Erickson
6f09e95d68 Removed background from job profile view. 2014-07-17 09:22:52 -07:00
Darredevil
b6469ff45b fix for no user logged 2014-07-17 19:12:26 +03:00
Darredevil
80b420ebbf fix for no user logged 2014-07-17 19:11:23 +03:00
Michael Schmatz
ccb2ad67ac Merge pull request #1342 from codecombat/feature/mail-system 
Feature/mail system
 2014-07-17 07:18:39 -07:00
Imperadeiro98
17a4a689e4 Update pt-PT.coffee 2014-07-17 14:18:29 +01:00
Imperadeiro98
991ef61d62 Update pt-PT.coffee 2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77 Update pt-PT.coffee 2014-07-17 13:25:25 +01:00
Alan Shen
c56be02222 Fixed typo: Chose -> Choose 
It may be late to describe incoming targets with past tense.
 2014-07-17 01:16:08 -06:00
Darredevil
83177c5f00 language sensitive docs added 2014-07-17 03:19:09 +03:00
Darredevil
8da06f6c6b language sensitive docs added 2014-07-17 03:18:06 +03:00
Michael Schmatz
ae23679a26 Hard code mail tasks and add unsubscribe 2014-07-16 16:37:06 -07:00
Nick Winter
781e1da93e Fixed typo: massword -> password. 2014-07-16 16:14:48 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Nick Winter
855461a67e Don't let test view interfere with normal body styles. 2014-07-16 16:01:37 -07:00
Michael Schmatz
b74bdfbf51 Added metadata to mail sent schema 2014-07-16 12:12:11 -07:00
Michael Schmatz
bb3c583300 Add approved date to job profile 2014-07-16 10:51:45 -07:00
nemoyatpeace
f17112ecf8 Minor adjustment to the aoe script 2014-07-17 00:53:52 +08:00
Nick Winter
5ce0cff538 Propagated i18n. Added password repeat to base en.coffee. 2014-07-16 08:03:25 -07:00
Nick Winter
1fd28c0181 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-16 07:54:23 -07:00
Nick Winter
bf0e1ead92 Merge pull request #1335 from rubenvereecken/settings_patch 
Did UX changes, added an error and fixed a job profile editing bug
 2014-07-16 07:52:04 -07:00
Nick Winter
085951fa4a Removed more counselor stuff. 2014-07-16 07:47:41 -07:00
Nick Winter
5b693d02cf Merge pull request #1330 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-16 07:47:08 -07:00
Ruben Vereecken
bfc4ef58b0 Did UX changes, added an error and fixed a job profile editing bug 2014-07-16 14:47:55 +02:00
Imperadeiro98
4dbb49aa72 Update en.coffee 2014-07-16 13:24:16 +01:00
Nick Winter
6e9091fdf0 More fixes to documentation popovers. 2014-07-15 19:25:53 -07:00
Nick Winter
906ab3ac2b Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette. 2014-07-15 18:54:55 -07:00
Nick Winter
03cc2d1af0 Fixed Grass01-Grass05 scaling issues. 2014-07-15 18:08:00 -07:00
George Saines
8c9c41f477 copy tweak on the employer homepage 2014-07-15 17:27:26 -07:00
Jayant Jain
fa595fcb32 Better positioned level border trees 2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251 Borders and floors are placed inside positive axes 2014-07-16 05:03:18 +05:30
Imperadeiro98
7d476470c7 Corrected a mistake 2014-07-15 20:17:50 +01:00
Imperadeiro98
32d4408f67 Update pt-PT.coffee 
Delete lines 747-753 and 775-776.
 2014-07-15 20:02:23 +01:00
Scott Erickson
3325332626 Fixes #1328. 2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87 Added watchers to list of properties to skip in deltas/patches. 2014-07-15 11:23:35 -07:00
Nick Winter
e06f9132d1 Fixed #469. 2014-07-15 10:24:18 -07:00
Nick Winter
da73975f20 Fixed #1095. 2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171 Fixed #1010. 2014-07-15 09:35:14 -07:00
Nick Winter
39bea855d1 Propagated new i18n tags with the script. 2014-07-15 08:22:02 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Ruben Vereecken
c423fe989b Merge branch 'navbar' into achievements 2014-07-15 16:16:01 +02:00
Ruben Vereecken
40ba28f49b Basics for account and user home pages 2014-07-15 16:15:21 +02:00
Nick Winter
b3e8eb8504 Working on something for #1327. 2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3 Fixed #1321. 2014-07-14 17:54:32 -07:00
Scott Erickson
d8d40ab0f6 Fixes #1116 2014-07-14 17:46:12 -07:00
Scott Erickson
b113e126a3 Fixes #1316 and #1318 2014-07-14 17:18:48 -07:00
Scott Erickson
888ee6c0bb Fixed deltas in the version history modal. 2014-07-14 16:37:10 -07:00
Scott Erickson
9d22a35194 Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat 2014-07-14 15:13:52 -07:00
Nick Winter
f2f3817e10 Fixed Thang Editor scaling. 2014-07-14 14:10:46 -07:00
Nick Winter
cfeb6c34a4 Merge pull request #1324 from Darredevil/master 
docs page minor update
 2014-07-14 13:23:52 -07:00
Ruben Vereecken
1f1ff25a5a merge 2014-07-14 20:27:47 +02:00
Nick Winter
23dc8d2947 Removed a bad log. 2014-07-14 11:21:03 -07:00
Darredevil
c579742955 docs page update 2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007 GET /auth/name/<name> now serves possible free names 
anonymous users are now warned if their new name is already chosen

User Settings is now without auto-save

Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.

Refactored conflicted name checking so it can be used in more places

Signup form now has an optional name field

Covered extra case where the debounced check happened too late. Support for submitting on enter.

Worked in scott's comments and got tests working again
 2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9 Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode. 2014-07-14 11:05:59 -07:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Ruben Vereecken
ae4a5eb460 Deduplicated bootstrap include 2014-07-14 18:52:23 +02:00
Ruben Vereecken
5aa6db7696 Made the sass more snappy 2014-07-14 18:40:23 +02:00
Nick Winter
7446c9ee08 Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons. 2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2 Don't ask for team again if we already have a child window. 2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00 Merge branch 'jayant1992-master' 2014-07-14 07:33:59 -07:00
Nick Winter
42cf0b5cce Added missing starting quote. 2014-07-14 07:30:18 -07:00
Nick Winter
d27dbdddbb Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13 2014-07-14 07:29:47 -07:00
Ruben Vereecken
7a52c195eb More user navbar styling! Also need to investigate browser reflow 2014-07-14 15:32:02 +02:00
Ruben Vereecken
1aa566e4f7 Layout of navbar user dropdown about finished 2014-07-14 14:56:44 +02:00
Ruben Vereecken
5f2c7665ea Navbar refactored, starting to look good already. 2014-07-14 14:20:13 +02:00
Ruben Vereecken
d261f888d7 Refactored profile view to be a userView. Would still like to test remarks though 2014-07-14 12:18:28 +02:00
Tery Lim
0f4a7df982 Use spl instead of trailing space for spacing 2014-07-14 13:56:27 +08:00
Inez KEMENES
ca3a2b620b Update hu.coffee 
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
 2014-07-14 07:22:19 +02:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed Less geometric random borders for the terrain generator 2014-07-14 08:11:33 +05:30
Nick Winter
bd47b3bc83 Fixed #1210 based on #1313. 2014-07-13 18:53:01 -07:00
Nick Winter
1d9afbabd2 Fixes for duplicate Thang IDs and reverting randomized Thangs. 2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4 Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-07-13 18:21:27 -07:00
Nick Winter
b1b9f87ebe Fixed root test view URL to not need the trailing slash. 2014-07-13 17:34:51 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Nick Winter
f92b29a4a3 Added rotate to Vector APIs. 2014-07-13 17:25:24 -07:00
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
daff7a2640 Merge pull request #1314 from TheSecretSquad/issue#1213 
Added point marker shape, and split updateSize method into helpers.
 2014-07-13 17:08:11 -07:00
Nick Winter
a076822a08 Merge pull request #1306 from kerradus/master 
update ru.coffee
 2014-07-13 17:07:45 -07:00
Nick Winter
01fdc5b520 Merge pull request #1311 from rubenvereecken/pretty_wizard_modal 
Bootstrappified Wizard Settings modal
 2014-07-13 17:07:07 -07:00
Nick Winter
6eea28dc19 Error handling for syntax errors in component code. 2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e Added point marker shape, and split updateSize method into helpers. 2014-07-13 19:31:34 -04:00
Nick Winter
6dc2a48b75 Tracking time spent reading initial guides. 2014-07-13 16:07:15 -07:00
Ruben Vereecken
bd7c2d0d36 Bootstrappified Wizard Settings modal 2014-07-14 00:25:24 +02:00
Ruben Vereecken
9db84befa6 Set up a 301 Redirect for account/profile instead of a backbone redirect 2014-07-13 22:34:32 +02:00
Scott Erickson
ebfb329da7 Fixed a bug where pressing escape would not properly end scripts in the session state. 2014-07-13 13:11:45 -07:00
Jayant Jain
deecd7d2ff Deletes previously randomised thangs when generating again 2014-07-14 01:34:32 +05:30
Jayant Jain
b934d22cbd Batches insertion of thangs to treema to speed up terrain generation 2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd Moves randomise modal template and view to editor/level/modal 2014-07-14 01:34:32 +05:30
Jayant Jain
be223197df Updates i18n tags and en.coffee 2014-07-14 01:33:45 +05:30
Scott Erickson
667ea14442 Merge branch 'mediator-schema' of https://github.com/jthemphill/codecombat into jthemphill-mediator-schema 2014-07-13 12:20:11 -07:00
Scott Erickson
3b6d17286b Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds. 2014-07-13 12:19:51 -07:00
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02:00
Dmitry
e60832bcfa Update ru.coffee 
some fixes
 2014-07-13 23:13:42 +04:00
Nick Winter
202a562c51 Merge pull request #1303 from maryannv/patch-1 
Add space before "Contribute"
 2014-07-13 12:08:27 -07:00
Scott Erickson
843ed97643 Another fix for mongoose i18n locale object hack. 2014-07-13 10:05:58 -07:00
Nick Winter
868a6ed43b Fixed a couple i18n issues. Fixed #1302. 2014-07-13 09:31:56 -07:00
Nick Winter
49e6ed13ba Fixed LatestVersionReferenceNode's collection initialization. 2014-07-13 09:11:06 -07:00
Nick Winter
373c1688ed Merge pull request #1287 from rubenvereecken/user_patch 
Noty errors don't show up on user save fails anymore
 2014-07-13 08:54:20 -07:00
Nick Winter
8a7e7e82a0 Let's try a heads-up whenever there's a JS error. 2014-07-13 08:37:39 -07:00
Nick Winter
83248f039c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-13 07:52:35 -07:00
Nick Winter
39f6874682 Merge pull request #1304 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-13 07:48:42 -07:00
Dmitry
b1aa0a1973 update ru.coffee 2014-07-13 15:33:50 +04:00
Maryann Vellanikaran
f9c92d2731 Add space before "Contribute" 
Before: http://cl.ly/image/0p1f1P1D0P2d
After: http://cl.ly/image/3a0x12070C28
 2014-07-12 15:45:53 -07:00
Nick Winter
d48f5256a7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-12 10:19:19 -07:00
Scott Erickson
f4b22fedc9 Tweaking the visuals for the i18n treema node to mostly ignore the property required to get around mongoose not handling empty objects. 2014-07-12 09:58:28 -07:00
Scott Erickson
8cb7cd770c Fixed i18n population because mongoose has problems with empty objects. 2014-07-12 09:58:28 -07:00
Jeff Hemphill
a8d369ed1a Add schemas for tome subscriptions 2014-07-12 01:55:35 -07:00
Imperadeiro98
178e147565 Update pt-PT.coffee 2014-07-12 08:54:16 +01:00
Nick Winter
89dc724d31 Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay 
Centered CoordinateDisplay background and label
 2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5 Centered CoordinateDisplay background and label 2014-07-11 22:10:13 -04:00
Nick Winter
c62f5f3fa0 Skipping docs for language-inappropriate entries in spell palette. 2014-07-11 18:42:55 -07:00
Nick Winter
f13f0ddfef Merge pull request #1296 from dreamist/patch-1 
Update th.coffee
 2014-07-11 18:11:57 -07:00
Nick Winter
17ba4bc8a7 Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter. 2014-07-11 18:07:00 -07:00
Nick Winter
788562f2ea Merge pull request #1295 from Imperadeiro98/master 
Updated some strings
 2014-07-11 14:28:29 -07:00
Michael Schmatz
fede037e89 Fixed time NaN 2014-07-11 13:55:31 -07:00
dreamist
ca78638a21 Update th.coffee 
One fix and a few more translations
 2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea Update pt-PT.coffee 2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349 Update pt-PT.coffee 2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489 Fixed a issue with headers 
There was a issue with the headers that is now corrected.
 2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f Update pt-PT.coffee 2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567 Update pt-PT.coffee 2014-07-11 15:17:16 +01:00
Nick Winter
65e39ad4e3 Propagated i18n updates. 2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Nick Winter
3d5cd29519 Removed some logging. 2014-07-10 17:35:59 -07:00
Michael Schmatz
80e7b7664e Changed employer artisanal message font 2014-07-10 15:42:45 -07:00
Nick Winter
f17e24013b Fixed #1217 (scaleFactor, debug shapes). 2014-07-10 14:22:15 -07:00
Jayant Jain
d6928eb1c4 Removes okay button, hides modal upon generation 2014-07-11 01:43:51 +05:30
Jayant Jain
a76a79bb9d Fixes bug with placing addThang after randomise 2014-07-11 01:07:24 +05:30
Jayant Jain
5fb4f161d0 Removes console logs 2014-07-11 00:01:19 +05:30
Jayant Jain
da0b0d9830 Big terrain generator commit - 
1.Adds method for randomising decorations/doodads
2.Creates presets
3.Adds thang clusters which can be used to create presets easily
 2014-07-11 00:01:19 +05:30
Jayant Jain
dbe464df16 Removes console logs 2014-07-11 00:01:19 +05:30
Jayant Jain
b401b04893 Adds randomiseFloor and randomiseBorder functions 2014-07-11 00:01:19 +05:30
Jayant Jain
38bed0ee93 Random thangs are now created and positioned in the thangs view 2014-07-11 00:01:19 +05:30
Jayant Jain
74205b31d2 Adds code for passing randomised thangs to thang view 2014-07-11 00:01:18 +05:30
Jayant Jain
1436a4dac7 Cleans up some css for terrain generator modal 2014-07-11 00:01:18 +05:30
Jayant Jain
813ecaa59c Adds randomise option to dropdown on editor page 2014-07-11 00:01:18 +05:30
Jayant Jain
c40da260f0 Adds initial modal and view for terrain generator 2014-07-11 00:01:18 +05:30
Jayant Jain
efa2bee08c Adds shortcuts for undo/redo for thangs tab view 2014-07-11 00:01:18 +05:30
Scott Erickson
a3c524424c Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users 2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f Fixed some schema issues related to snippets and code languages. 2014-07-10 08:31:40 -07:00