Nick Winter
7286d069a0
Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.
2014-08-14 10:28:50 -07:00
Nick Winter
652d47fb81
Merge pull request #1432 from jayant1992/undo-redo
...
Undo redo descriptions
2014-08-14 09:58:28 -07:00
Ruben Vereecken
dbff3e04d5
Job profile view works once again
2014-08-14 17:25:41 +02: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
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
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
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
Jayant Jain
eece235337
Adds preset images
2014-08-12 20:42:42 +05:30
Ruben Vereecken
d6f5b7512d
i18n for all new pages
2014-08-12 14:05:01 +02:00
Ruben Vereecken
857d3ca02c
Added some simple animations to achievement popups
2014-08-12 12:04:08 +02: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
Nick Winter
4cc79e985e
A few fixes for adding items to inventories in ThangTypes.
2014-08-11 17:09:44 -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
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
Nick Winter
31d7e641e6
Fixes for equipping items and adding them to the World.
2014-08-11 11:04:38 -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
4dcc5bd8ee
Adding some options to the game menu options tab.
2014-08-10 15:56:45 -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
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
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
9f0add22a5
Worked in a lot of changes Scott proposed
2014-08-08 11:54:53 +02: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
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
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
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
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
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
Ruben Vereecken
0e5accb707
Repaired TestView by only loading js files once
2014-07-31 13:15:57 +02:00
Ruben Vereecken
871149b2bc
Rechecked and added cool stuff for achievements
2014-07-30 22:23:43 +02: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
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
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
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
Darredevil
f78c48c893
Docs tab v2
2014-07-25 01:26:34 +03: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
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07: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
be50927fb6
disabled editor works again
2014-07-23 14:38:12 +02:00
Dominik Kundel
5db634d6a8
fullscreen on keyboard shortcut
2014-07-22 21:47:36 +02: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
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
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
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
a7905db316
Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.
2014-07-20 15:51:48 -07:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07: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
Nick Winter
2d7b6eb145
Updated code language logos. Added code language blurb i18n tags.
2014-07-17 20:12:59 -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
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
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
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
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
Nick Winter
42af807e5c
Merged in geometry work from #51 .
2014-07-16 16:01:37 -07:00
Michael Schmatz
bb3c583300
Add approved date to job profile
2014-07-16 10:51:45 -07:00
Nick Winter
1fd28c0181
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-16 07:54:23 -07:00
Nick Winter
085951fa4a
Removed more counselor stuff.
2014-07-16 07:47:41 -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
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
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
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
da73975f20
Fixed #1095 .
2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171
Fixed #1010 .
2014-07-15 09:35:14 -07:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Ruben Vereecken
40ba28f49b
Basics for account and user home pages
2014-07-15 16:15:21 +02:00
Scott Erickson
d8d40ab0f6
Fixes #1116
2014-07-14 17:46:12 -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
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
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
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
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
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
Jayant Jain
493ebd07e6
Changes randomise to randomize
2014-07-14 06:01:09 +05:30
Michael Schmatz
2a5a366c12
Made language selection in opponent modal
2014-07-13 17:22:06 -07:00
Nick Winter
6dc2a48b75
Tracking time spent reading initial guides.
2014-07-13 16:07:15 -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
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Nick Winter
c62f5f3fa0
Skipping docs for language-inappropriate entries in spell palette.
2014-07-11 18:42:55 -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
Michael Schmatz
fede037e89
Fixed time NaN
2014-07-11 13:55:31 -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
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
Nick Winter
9ee373428f
Fixed some schema issues related to snippets and code languages.
2014-07-10 08:31:40 -07:00
nemoyatpeace
8700da6570
Update play_view.coffee
...
Added my level to the page.
2014-07-10 09:19:59 +08:00
Nick Winter
4b16e2fc57
Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master
2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1
Merge branch 'dkundel-feature/fullscreen-editor'
2014-07-09 13:41:57 -07:00
Nick Winter
0ed8d2b371
Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.
2014-07-09 13:41:42 -07:00
Darredevil
4309bfbe67
new Documentation page
2014-07-09 23:01:53 +03:00
Scott Erickson
d74a778f67
Made creating components open to everyone!
2014-07-09 12:21:32 -07:00
Scott Erickson
3fbce8334d
Fixed #1276
2014-07-09 10:47:02 -07:00
Ruben Vereecken
5dc54c784d
Added case and demo for user not found. Should be made prettier as soon as users can be queried by name
2014-07-09 18:13:22 +02:00
Ruben Vereecken
b065a524c1
Got down the basic layout for achievement overview
...
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
gosnat
4d50a6d76a
Update play_view.coffee
...
Added "Guide Everyone Home" level
2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba
Made some style tweaks to the employers page to move the filters into a sidebar when authorized.
2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c
Fixed some wizard positioning issues in multiplayer.
2014-07-08 18:51:10 -07:00
Michael Schmatz
21d056ff01
Instant application of filters
2014-07-08 11:19:14 -07:00
Michael Schmatz
bbc793b003
Fixed modal popping up when logging out sometimes
2014-07-08 10:42:36 -07:00
Michael Schmatz
aa40257034
Table styling/ copy edit
2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02
Implement candidate filter counts next to filters
2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4
Move featured candidates to top of sort
2014-07-07 21:29:48 -07:00
Michael Schmatz
08b9a8fdaa
Various changes to education filter
2014-07-07 21:04:12 -07:00
Michael Schmatz
9313541f9f
Fixed targeting on employers CSS
2014-07-07 20:02:01 -07:00
Michael Schmatz
05560662dd
Various fixes to employer page/profile view
2014-07-07 19:34:36 -07:00
Scott Erickson
c1f77e3f07
Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch
2014-07-07 18:48:26 -07:00
Scott Erickson
5d00aedac7
Widened the click area on the wizard settings view for color config.
2014-07-07 18:13:19 -07:00
Scott Erickson
1263d4724a
Fixed the title in the gold view to handle when goldEarned isn't available.
2014-07-07 16:56:47 -07:00
Scott Erickson
908772d8fe
Fixed an instance where a level loading callback was erroring if called before the surface was built.
2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3
Fixed the gold view not showing numbers until the first change.
2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c
Enabled submitting patches for thangs and articles.
2014-07-07 15:19:22 -07:00
Scott Erickson
12543cf4dd
Added the foundation of a component docs view.
2014-07-07 10:11:02 -07:00
Ruben Vereecken
ea3d1fee74
Starting on achievement overview style
2014-07-07 15:03:28 +02:00
Ruben Vereecken
9055612b24
Fixtures set up, demo start
2014-07-07 12:47:32 +02:00
Ruben Vereecken
b5702bc314
Added simple demo page
2014-07-07 12:11:43 +02:00
Ruben Vereecken
75b738f126
User loading now have async callbacks
2014-07-07 12:03:48 +02:00
Ruben Vereecken
ec78f95da1
Prepared things for Scott
2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066
Got users and achievements to load in a neat way
2014-07-06 22:48:33 +02:00
Ruben Vereecken
128008daa1
Hid the progress bar on load failed
2014-07-06 21:48:31 +02:00
Ruben Vereecken
10735867a4
Got some basic hierarchy set up for user view and template inheritance
2014-07-06 21:10:28 +02:00
Ruben Vereecken
e33bb44ffc
Start of new user routing and views are there
2014-07-06 20:45:27 +02:00
Scott Erickson
94a6e3961b
Added a button in the level editor to choose which team to play when editing a ladder level.
2014-07-05 13:54:41 -07:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Scott Erickson
b635c4cf16
Fixes #1220 . Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.
2014-07-04 20:45:42 -07:00
Scott Erickson
eed521fb8c
Merged conflicts.
2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5
Merged conflicts.
2014-07-04 17:54:24 -07:00
Scott Erickson
1ce55e356c
Making the ladder tab reload when social network friends load. See #1196 .
2014-07-04 17:32:16 -07:00
Scott Erickson
ca8394621d
Fixes #1223
2014-07-04 11:46:33 -07:00
Scott Erickson
f553a1c493
Merge pull request #1256 from rubenvereecken/patch_fix
...
Patch fix: applyDelta now always called
2014-07-04 11:45:22 -07:00
Ruben Vereecken
08030dc785
Cleaned up patch rendering logic
2014-07-04 20:18:26 +02:00
Ruben Vereecken
44c84b3689
proofed the SearchView's runSearch
2014-07-04 19:36:55 +02:00
Ruben Vereecken
a367082cc4
Corrected statistic logic, wrote test case
2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
7a4c6daec8
stats.gamesCompleted is now tracked in users
2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4
Added achievement preview, exp test, stuff
2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
fe5b675d18
Achievement polling now successfully tested
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
6e4170012f
Made sure applyDelta is called in all cases
2014-07-04 18:38:15 +02:00
Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Ruben Vereecken
63401025f6
proofed the SearchView's runSearch
2014-07-04 15:13:06 +02:00
Scott Erickson
2855d2a402
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
...
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
2014-07-03 17:41:58 -07:00
Michael Schmatz
6a33ca0892
Removed autoscrolling
2014-07-03 16:40:00 -07:00
Michael Schmatz
615303395c
Various fixes for recruiting page
2014-07-03 16:30:27 -07:00
George Saines
4d12aff35e
removing the counselor from the contribute page and all other links
2014-07-03 15:42:24 -07:00
Michael Schmatz
52ddb8db62
Add login link and rounded corners for pics
2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c
Added login button and fixed bg color
2014-07-03 14:40:39 -07:00
Michael Schmatz
538344094b
Fixed filter behavior
2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3
Filter functional
2014-07-03 11:39:44 -07:00
Michael Schmatz
49e4dd71ae
Merge branch 'master' into employer-redesign
...
Conflicts:
app/schemas/models/user.coffee
2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a
Filter button
2014-07-03 10:14:32 -07:00
Michael Schmatz
397140d9b0
Basic filtering
...
Only visas work
2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b
Basic filtering functionality
...
Still has a few bugs
2014-07-02 15:48:26 -07:00
Dominik Kundel
004a14ae3c
fixed autocomplete issue related to switching the programming language
2014-07-02 20:52:16 +02:00
Michael Schmatz
c6cc28b976
Various fixes to enable employers page to function correctly
2014-07-02 11:45:00 -07:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Nick Winter
802d43651e
Exposing Vector z property. Getting ready to use new builtin property documentation.
2014-06-27 00:36:18 -07:00
Nick Winter
d360ecac94
Merged in the language-war branch.
2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0
Improved per-language spell palette and tab documentation.
2014-06-25 22:56:39 -07:00
Nick Winter
8c6ee66684
Better handling of alternate spell palette documentation syntax for other code languages.
2014-06-25 20:19:11 -07:00
Nick Winter
04976a7b14
Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225 .
2014-06-24 21:08:01 -07:00
Nick Winter
dd9b8a0018
Migrating from tileGroupNumber to tileGroupLetter.
2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98
Messing with marks.
2014-06-24 15:45:33 -07:00
Michael Schmatz
e3a87156a2
Send BCC email to employer when contacting candidates
2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4
Patch modal handles invalid patches.
2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61
Changed the versions history modal to show name and date.
2014-06-24 16:41:55 -04:00
Scott Erickson
0363166736
Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.
2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3
Fixed bug showing spell palette for languages missing any code snippets.
2014-06-24 10:17:38 -07:00
Nick Winter
3862bd2376
Clearing backups of old models when saving new versions of versioned models.
2014-06-24 09:43:20 -07:00
Nick Winter
815ef88e78
Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.
2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f
Fix #1207
2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb
Added new level "K-means++ Cluster Wars"
...
Added new level "K-means++ Cluster Wars"
2014-06-23 03:43:54 +03:00
Nick Winter
8698589625
Applying Scott's fix for #1198 .
2014-06-22 07:55:29 -07:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Nick Winter
1f29a923cf
Fixed playing multiplayer levels without an opponent, against the AI.
2014-06-21 12:24:14 -07:00
Nick Winter
a8f4baebbc
Restricted some more analytics.
2014-06-21 09:47:48 -07:00
Nick Winter
dde71485bf
A bit of cleanup.
2014-06-20 20:52:50 -07:00
Nick Winter
60ca6e46d3
Ooops, that's a function.
2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb
Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.
2014-06-20 17:19:18 -07:00
Nick Winter
bb8b9b2e93
bid -> makeBid.
2014-06-19 17:27:41 -07:00
Nick Winter
7b59c42f5d
Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.
2014-06-19 15:41:35 -07:00
Nick Winter
1e9b403ce5
More zazz for home page code language selection.
2014-06-19 14:55:16 -07:00
Nick Winter
cf57411b5c
Added another logging message for more easily seeing when transpiled code might be misfiring.
2014-06-19 13:42:38 -07:00
Nick Winter
666c020389
Switching code language based on selection now.
2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be
Fixed a bug with logging missing documentation.
2014-06-19 16:15:38 -04:00
Michael Schmatz
51923459e0
Changed autocomplete to on by default
2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244
Merge pull request #1186 from dkundel/master
...
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Nick Winter
2e850dba78
Working on home language selection.
2014-06-19 08:06:34 -07:00
Michael Schmatz
548eaefae1
Add debug variable inspection progress bar
2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e
Merge remote-tracking branch 'upstream/master'
2014-06-18 21:50:55 +02:00
Nick Winter
ac6c7292c8
Fixed Gridmancer session linking on profile view.
2014-06-18 12:05:40 -07:00
Scott Erickson
d651885524
Maybe fixing the toggleModal system once and for all.
2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465
merge conflict solved
2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b
integrated autocomplete
2014-06-18 17:57:42 +02:00
Nick Winter
59654da24b
Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.
2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc
ModelModal now grants real ultimate power.
2014-06-17 15:17:25 -07:00
Nick Winter
0b8a0c8f6f
Added UserRemarks.
2014-06-17 13:03:13 -07:00
Scott Erickson
d6bb7ffe81
Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.
2014-06-16 11:40:09 -07:00
Scott Erickson
4932317982
Finally got the demo view working (mostly). Need to turn off third party ajax requests.
2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d
Initial work on a demo view. But brunch won't build demo-app.js for some reason.
2014-06-16 11:40:08 -07:00
Nick Winter
9a64ca5973
A few misc fixes.
2014-06-16 10:49:20 -07:00
Dominik Kundel
9a3ba70ea2
Merge remote-tracking branch 'upstream/master'
2014-06-16 14:30:22 +01:00
Dominik Kundel
25a0447d77
autocomplete
2014-06-16 14:29:01 +01:00
Nick Winter
66e2805a9a
Added StackLead integration. Employerified profile backgrounds.
2014-06-14 20:59:28 -07:00
Nick Winter
ff0d842871
Better employer contact message.
2014-06-13 16:04:11 -07:00
Michael Schmatz
84601d2927
Added more info email field to employer signup
2014-06-13 15:38:47 -07:00
Scott Erickson
a1dd9a714e
Fixed #1153 .
2014-06-13 13:35:57 -07:00
Scott Erickson
8f4e1b4bf0
Making the ModelModal look better.
2014-06-13 10:11:01 -07:00
Nick Winter
1502cdc64b
Merge branch 'jayant1992-master'
2014-06-13 08:17:12 -07:00
Dominik Kundel
e756c83d9e
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:12:55 +01:00
Nick Winter
28264d5ace
Added tournament results and a way to email them out.
2014-06-12 17:52:08 -07:00
Scott Erickson
152b860a23
Hotfix for the profile view.
2014-06-12 14:44:55 -07:00
Scott Erickson
8ab69cf833
Merge pull request #1138 from rubenvereecken/search-endpoint
...
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Ruben Vereecken
aecf937722
Cleaned up achievement testing environment
...
Made sure server sided tests work completely
2014-06-12 19:41:07 +02:00
Ruben Vereecken
2a5c2020ca
Added recalculation button to the achievement editor
2014-06-12 19:41:07 +02:00
Ruben Vereecken
a61d0e5569
Added support for diminished exp for repeatables. Needs tweaking though.
2014-06-12 19:40:59 +02:00
Ruben Vereecken
7096a07ce8
Improved logging (winston) and admin-only'd the achievement editor
2014-06-12 19:40:59 +02:00
Ruben Vereecken
5aa211cabd
Got repeatables working flawlessly and improved the achievement popup by a great deal
2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a
Created a test environment for repeatables
2014-06-12 19:40:59 +02:00
Ruben Vereecken
0751581113
Search endpoint is now without the /search prefix
...
Intermediate commit for search refactoring
2014-06-12 19:19:30 +02:00
Nick Winter
77920b5416
Improvements to profile views. Added links to players' code.
2014-06-11 19:38:47 -07:00
Scott Erickson
8a728cbb64
More switching of user objects from save to patch.
2014-06-11 14:17:31 -07:00
Scott Erickson
4ecbc73c1c
Fixed client side testing on karma/travis with the new FacebookHandler tests.
2014-06-11 13:43:07 -07:00
Jayant Jain
ed95206868
Enables moving around the map while an addThang is selected
2014-06-12 01:50:24 +05:30
Scott Erickson
6d15b5e631
Working on User patching.
2014-06-11 13:16:17 -07:00
Jayant Jain
d5d20377a2
Removes panning upon right click in editor
2014-06-11 15:05:59 +05:30
Scott Erickson
389d530eaa
Built a new 'patch' method for CocoModel, which saves only changed values to the server.
2014-06-10 20:59:37 -07:00
Nick Winter
f3d18efa90
Added employer_list and activity tracking.
2014-06-10 16:30:13 -07:00
Scott Erickson
f0ff8c242e
Migrating language to codeLanguage on systems and components because they conflict with the search system.
2014-06-10 13:20:14 -07:00
Nick Winter
22ca9507d0
Upgrades to employer's candidate indexing.
2014-06-09 22:17:53 -07:00
Nick Winter
dd2c7fab60
Updated Danger Minefield icon.
2014-06-09 21:11:59 -07:00
Darredevil
82f33a35de
Fixed id
2014-06-09 22:37:34 +03:00
Darredevil
da1d0e5361
Added new level
...
Added a new prime-sieve level
2014-06-09 22:29:02 +03:00
Michael Schmatz
693da57f13
Merge branch 'feature/linkedin-profile-import'
...
Conflicts:
app/templates/account/profile.jade
app/views/account/profile_view.coffee
2014-06-08 18:37:33 -07:00
Michael Schmatz
ad80fcf229
Removed linkedIn callback, disabled autosave
2014-06-08 18:21:56 -07:00
Michael Schmatz
f29a41f108
Add linkedIn link, field of study support to LinkedIn import
2014-06-08 18:15:18 -07:00
Michael Schmatz
7ec3910e36
Make LinkedIn import more robust
2014-06-08 17:38:02 -07:00
Nick Winter
6597b687eb
Only start profiles in edit mode if they are yours.
2014-06-08 11:52:16 -06:00
Scott Erickson
1b166028c6
Turned off Backbone.Mediator validation for tests.
2014-06-07 19:08:38 -07:00
Nick Winter
cefeb1df14
Fixed backwards Approved button and candidate time sort.
2014-06-07 19:58:33 -06:00
Scott Erickson
01c20f4065
Fixed karma tests.
2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7
Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842
2014-06-07 16:41:19 -07:00
Scott Erickson
2cbc33d66d
Fixed jasmine-ajax setup/reset.
2014-06-07 16:41:19 -07:00
Nick Winter
63a3aa9074
Fixes for browsing profiles by username.
2014-06-07 17:33:14 -06:00
Michael Schmatz
4072c1b969
Basic functionality done, needs validation error handling
...
As well as formatting
2014-06-07 11:45:49 -07:00
Nick Winter
67b10474e8
Suggested improvements to profile pages.
2014-06-07 00:33:18 -06:00
Scott Erickson
f0cdf6b2e2
Fixed #1111 .
2014-06-06 16:47:48 -07:00
Scott Erickson
49c9c6bfc9
Built the client test view (rebased from feature/testclient).
2014-06-05 16:56:29 -07:00
Nick Winter
f493f407c2
Fixed some bugs on job profile initialization.
2014-06-04 15:38:57 -06:00
Scott Erickson
8f6187125d
Fixed saving new settings for a level.
2014-06-03 12:27:53 -07:00
Ruben Vereecken
ed44ab5f7d
Improved logging (winston) and admin-only'd the achievement editor
2014-06-02 21:07:23 +02:00
Ruben Vereecken
8d2c62ba84
Got repeatables working flawlessly and improved the achievement popup by a great deal
2014-06-02 20:34:05 +02:00
Ruben Vereecken
bb57756cd9
Processed Scott's feedback. Db endpoint slightly safer, some refactorings.
2014-06-02 20:33:01 +02:00
Ruben Vereecken
8607162cd7
Finished designing achievement notify, for now.
2014-06-02 20:33:01 +02:00
Ruben Vereecken
d8bb802468
Designing the Notify to show level progress
2014-06-02 20:33:01 +02:00
Ruben Vereecken
d766a24e11
Achievements now popup when polled for by the client
2014-06-02 20:33:01 +02:00
Ruben Vereecken
aa3fedeb02
Achievements can have icons. Users now have their scores denormalized
2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f
Achievement queries are now strings server sided but remain objects for the client
2014-06-02 20:32:00 +02:00
Ruben Vereecken
c26f96f33e
Added achievement model and some missing pieces
2014-06-02 20:32:00 +02:00
Ruben Vereecken
1b2a251c58
Achievement editor in place and looking mighty fine
2014-06-02 20:31:09 +02:00
Ruben Vereecken
c2d2f2a2b8
Refactorings performed necessary to have searchable for more uses
2014-06-02 20:31:09 +02:00
Ruben Vereecken
a3ca382dcd
Used the feedback from Scott to improve endpoints
2014-06-02 20:29:12 +02:00
Nick Winter
10754e6825
Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton.
2014-06-01 16:45:19 -07:00
Nick Winter
d19b6760da
More flourishes for inline profile editor.
2014-06-01 11:45:01 -07:00
Nick Winter
400fddc294
Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry.
2014-05-31 22:09:41 -07:00
Nick Winter
852053022a
Started the horrifying migration to an inline jobs profile editor.
2014-05-30 22:12:44 -07:00
Scott Erickson
29011fab2a
Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.
2014-05-30 17:26:49 -07:00
Scott Erickson
22c4ddc064
Fixed the settings view putting undefineds in the level documents and causing validation errors.
2014-05-30 17:24:13 -07:00
Scott Erickson
f82ca5c1b6
Fixed #1099
2014-05-30 16:43:55 -07:00
Scott Erickson
bba0e4939d
Fixed #1039
2014-05-30 15:06:33 -07:00
Scott Erickson
254c6ff7ba
Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.
2014-05-30 13:40:38 -07:00
Ruben Vereecken
84e6b8cd6d
Script event triggers are now fetched from the mediator, resolving issue #1061
2014-05-30 12:38:43 +02:00
Nick Winter
1f32c1c8a1
Merge pull request #1113 from rubenvereecken/issue1110
...
One line fix for issue #1110 . Thang search bar works again.
2014-05-29 15:31:28 -07:00
Ruben Vereecken
ba57899f9f
One line fix for issue #1110 . Thang search bar works again.
2014-05-30 00:16:11 +02:00
Nick Winter
df13bbfaa6
Made right-click duplicate Thang menu actually clone modified Thang.
2014-05-29 12:33:21 -07:00
Nick Winter
f3adc216ed
Protecting our replacement of Math.random via Aether.
2014-05-29 12:26:08 -07:00
Nick Winter
90c97008ae
Merge pull request #1098 from rubenvereecken/view-refactoring
...
Refactored getRenderData from SearchView to children
2014-05-28 18:59:02 -07:00
dpen2000
bd444fa547
Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes
2014-05-29 02:16:07 +01:00
Ruben Vereecken
5909f15678
Refactored getRenderData from SearchView to children
2014-05-28 17:32:18 +02:00
Nick Winter
c01bd69625
Better recoverability for non-UserCodeProblem errors during world generation.
2014-05-26 18:45:00 -07:00
Nick Winter
ec0027043b
Added experimental Io language from Aether.
2014-05-26 08:59:48 -07:00
Nick Winter
3dd362c01e
Added support for blaming infinite loops.
2014-05-25 12:15:32 -07:00
Nick Winter
6b554e03ef
Merge pull request #1084 from domenukk/feature/step-single-frame
...
Added shortcut for frame single-stepping
2014-05-25 09:37:13 -07:00
Nick Winter
16e1ef760a
Merge branch 'master' of git://github.com/jayant1992/codecombat
2014-05-25 08:51:13 -07:00
Nick Winter
33408020f1
Merge pull request #1054 from dpen2000/patch-2
...
Update simulate_tab.coffee
2014-05-25 08:27:54 -07:00
Dominik Maier
f62cd7f38b
+ added shortcut for frame single-stepping
...
+ fixed single stepping for frames
2014-05-24 17:31:59 +02:00
Jayant Jain
55569ccf2f
Resolves an issue with nanoscroller and initially hidden content
2014-05-24 12:02:26 +05:30
Jayant Jain
f17c5cfb51
Adds nanoscroll to thang tab in level editor
2014-05-24 12:02:26 +05:30
Jayant Jain
cbe5f3a011
Fixes issue with esc key not deselecting the current thang
2014-05-24 12:02:26 +05:30
Nick Winter
690fbc6919
Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking.
2014-05-23 12:04:42 -07:00
Scott Erickson
bfa90f671d
Fixes #940 , merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal.
2014-05-22 11:26:08 -07:00
Nick Winter
48f5347075
Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.
2014-05-21 21:56:11 -07:00
Nick Winter
4fc1341a64
Added a way to remove SuperModel resources to fix ladder tab refreshing.
2014-05-21 15:33:28 -07:00
Scott Erickson
037dbe97c6
Some remaining work to get the delayed show guide script set up.
2014-05-21 14:50:27 -07:00
Jayant Jain
8f1f378bcb
Fixes issue with thang being added twice upon click
2014-05-21 10:27:47 -07:00
Jayant Jain
c05780de4c
Resolves #170 , thang can be directly placed by dragging onto the map
2014-05-21 10:27:46 -07:00
dpen2000
ce661a5493
Update simulate_tab.coffee
...
Add back in current user to nearby simulators
2014-05-21 15:06:52 +01:00
Nick Winter
88ef5ffe93
Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L.
2014-05-20 15:24:57 -07:00
Scott Erickson
93c6f72f07
Asynchronously building things again.
2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a
Fixed a bug with ladder tab not reloading.
2014-05-20 10:40:15 -07:00
Nick Winter
248cec1e6e
Transpile code properly.
2014-05-20 08:23:25 -07:00
Nick Winter
d058b16283
Fixed some memory leaks.
2014-05-20 08:00:49 -07:00
Scott Erickson
04da5b4714
Fixed thang avatar view thang loading some more.
2014-05-19 23:02:02 -07:00
Scott Erickson
042fd7ac0d
Made the guide, when it shows up the first time, only show the first doc.
2014-05-19 22:25:40 -07:00
Nick Winter
b6406b9b0e
Put some tournament details in there. Muted some extra casting sounds during level load.
2014-05-19 21:56:20 -07:00
Scott Erickson
b816055f9e
Fixed goal states to handle teams.
2014-05-19 21:55:30 -07:00
Nick Winter
39178daff6
Trying to show loading ready and initialize the Surface earlier.
2014-05-19 20:49:17 -07:00
Nick Winter
341097c5ca
A couple improvements for the LadderSubmissionView.
2014-05-19 19:51:24 -07:00
Nick Winter
116965fcdc
Rules wording tweaks; highlighting new matches and end of ranking with sounds.
2014-05-19 19:13:36 -07:00
Nick Winter
af31bcf008
Fleshed out tournament prizes tab.
2014-05-19 17:40:06 -07:00
Scott Erickson
b410d91203
Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier.
2014-05-19 17:10:41 -07:00
Scott Erickson
62ad8dd26a
Added a status message to the goals view.
2014-05-19 16:36:45 -07:00
Scott Erickson
8ae14e21ae
Fixed #1029 . Refactored scaling for sprites a bit.
2014-05-19 16:36:44 -07:00
Nick Winter
8a5a45950f
Simulator now pleads for you to help simulate when your match is being ranked.
2014-05-19 14:59:47 -07:00
Nick Winter
68a4483e91
Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.
2014-05-19 11:58:53 -07:00
Scott Erickson
179702b0eb
Set up the goals view to be more hidden by default, and shows up on mouse hover.
2014-05-19 11:31:18 -07:00
Nick Winter
b89615cea4
Added helpful keyboard shortcuts modal.
2014-05-19 10:08:34 -07:00
Michael Schmatz
38d732d8bc
Disable hover debugger when spell changed
2014-05-18 11:51:31 -07:00
Michael Schmatz
5c72ccdce1
Add support for Aether globals in hover debugger
2014-05-18 11:41:42 -07:00
Nick Winter
3c9428ffd3
Refactored game ranking buttons into a LadderSubmissionView.
2014-05-17 11:55:51 -07:00
Scott Erickson
5907ca8619
Fixed scaling in the thang type editor.
2014-05-17 11:49:11 -07:00
Nick Winter
736fc8c12f
Remove overeager transpile problem showing for JS again.
2014-05-17 09:58:35 -07:00
Nick Winter
418c2f1a2c
Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization.
2014-05-16 17:38:33 -07:00
Nick Winter
f64e50f85b
Recording flow only for frame of interest.
2014-05-16 16:52:55 -07:00
Michael Schmatz
891471b80a
Add time to hover debugger
2014-05-16 16:04:10 -07:00
Scott Erickson
ae64032739
Refactored the Camera to only listen to events that use the same canvas. Fixed the level editor map selection modals.
2014-05-16 15:34:14 -07:00
Michael Schmatz
21ccaa2d8a
Adjust histogram height downwards
...
Make room for ranking text
2014-05-16 13:33:41 -07:00
Michael Schmatz
ab1b0cac42
Added "Rank your session" message
2014-05-16 13:30:55 -07:00
Michael Schmatz
bd1261802d
Fix rank for unranked sessions on ladder histogram
2014-05-16 13:27:42 -07:00
Michael Schmatz
934c853789
Live simulation count and fixed double simulator leaderboard session
2014-05-16 13:16:35 -07:00
Michael Schmatz
60342cc40e
Hover debugger optimization for "this"
2014-05-16 10:19:36 -07:00
Michael Schmatz
206d63231e
Fixed teamSpells instantiation
2014-05-16 09:47:15 -07:00
Nick Winter
7811bda6c3
Use ace/mdoe/python for Python instead of ace/mode/lua.
2014-05-16 08:55:59 -07:00
Nick Winter
cff00f90b5
Stopped bug with useTranspiledCode; it will need more work later to get right.
2014-05-15 21:53:23 -07:00
Nick Winter
c7ca081df9
Merged ProblemAlertView fixes.
2014-05-15 15:36:06 -07:00
Nick Winter
c2a7530b62
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-15 15:35:08 -07:00
Michael Schmatz
0bb1422d6c
Switch spectate and level view to use transpiled code
2014-05-15 15:18:17 -07:00
Nick Winter
763e0500b2
Tracking simulator clicks.
2014-05-15 15:10:50 -07:00
Nick Winter
b973b749c0
Merged.
2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc
Moved random seed initialization to Existence System, where it can be configured.
2014-05-15 14:54:31 -07:00
Vicky Chijwani
0a14681e7b
Correctly parse multi-line error messages in the editor.
2014-05-16 01:41:26 +05:30
Scott Erickson
c03004166c
Set up the save version modal/patch modal to submit on submit form (like pressing enter in an input).
2014-05-15 12:37:39 -07:00
Nick Winter
c1f9d51b37
Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world.
2014-05-15 11:27:51 -07:00
Michael Schmatz
338b613074
Added transpiledCode to victory modal
2014-05-15 09:30:59 -07:00
Nick Winter
dbcafbb29b
Working on level-specific coding languages, with non-writable code in JavaScript.
2014-05-14 21:54:36 -07:00
Scott Erickson
2a17ec5cb9
Refactored out displayObject from CocoSprites.
2014-05-14 17:05:13 -07:00
Nick Winter
dd1acb94ed
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-14 16:06:09 -07:00
Nick Winter
c420209a6b
Improved GoldView tooltip.
2014-05-14 16:06:00 -07:00
Michael Schmatz
f32a0ca963
Added transpile to in-game rank button
2014-05-14 15:45:38 -07:00
Nick Winter
d61922ae42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f
Zoom/scroll, ModelModal, and coordinate grabber fixes.
2014-05-14 15:29:55 -07:00
Scott Erickson
7a381df348
Merge branch 'feature/thangload'
2014-05-14 11:48:19 -07:00
Michael Schmatz
b11112c0aa
Merge pull request #1001 from codecombat/transpiledCode
...
Include transpiled code in submission process
2014-05-14 11:43:53 -07:00
Michael Schmatz
a1360d6cb8
Include transpiled code in submission process
2014-05-14 11:42:15 -07:00
Michael Schmatz
19a637aaa4
Open candidates in new tab
2014-05-14 10:37:16 -07:00
Scott Erickson
0be813e424
Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.
2014-05-14 10:35:16 -07:00
Scott Erickson
cab1adf8fc
Merge branch 'master' into feature/thangload
2014-05-14 09:31:59 -07:00
Scott Erickson
4b404ae124
Finished tuning the supermodel loading and progress.
2014-05-13 14:39:45 -07:00
Nick Winter
53870a89a5
Python allowed, and better support for transpile errors.
2014-05-13 11:04:04 -07:00
Scott Erickson
66af855497
Merge branch 'master' into feature/thangload
2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe
Most of the way there getting it to work with loading thang types dynamically throughout the play view.
2014-05-13 10:26:33 -07:00
Nick Winter
69dc96c7c8
Fixed Rank My Game on my matches.
2014-05-12 19:56:12 -07:00
Nick Winter
802889d115
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5
Dynamic Canvas sizing.
2014-05-12 13:28:46 -07:00
Michael Schmatz
687872a97b
Moved debug cache onto main thread
...
UI responsiveness greatly improved
2014-05-12 11:16:02 -07:00
Nick Winter
1aa72541ff
Merged master into feature/thangload.
2014-05-12 09:57:31 -07:00
Nick Winter
0b5854765a
Adding Clojure and Lua as choosable languages.
2014-05-11 22:51:44 -07:00
Nick Winter
74ef9bc987
Experimental support for preloading worlds when we would have autocast if manual cast is on.
2014-05-11 17:42:32 -07:00
Nick Winter
8df3b01f9e
Merged world/lodash/aether breakup for world workers.
2014-05-10 18:52:55 -07:00
Nick Winter
1e18f0b42f
Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds.
2014-05-10 18:24:50 -07:00
Scott Erickson
f1de2ca8d9
Brought the canvas size down again because it halves the FPS in Firefox at least.
2014-05-09 16:35:10 -07:00
Nick Winter
df88be1ab1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-09 15:07:55 -07:00
Nick Winter
6040d3b225
Shouldn't use much CPU when totally paused on Surface.
2014-05-09 15:07:30 -07:00
Michael Schmatz
1bbd4e6c68
Fixed frame-related bug
2014-05-09 15:05:50 -07:00
Nick Winter
589410ed8e
Merged master into feature/thangload.
2014-05-09 12:56:58 -07:00
Nick Winter
c4819c647c
Removed includeeFlow, since we're going to do it lazily with the debug worker.
2014-05-09 09:29:50 -07:00
Scott Erickson
0292be054e
I think this fixes #976 . I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more.
2014-05-08 14:56:02 -07:00
Scott Erickson
3d51969757
Fixed the patch view loading.
2014-05-08 14:54:47 -07:00
Scott Erickson
9c3cefa457
Removed a couple logs I forgot about.
2014-05-08 14:28:18 -07:00
Scott Erickson
8072629534
Merged the bug fix which I did too.
2014-05-08 13:43:15 -07:00
Scott Erickson
57f11ff3ea
Fixed some bugs with the components tab.
2014-05-08 13:40:42 -07:00
Michael Schmatz
cb5ae5f2f6
Fix #983
...
We need a generic scrolling solution
2014-05-08 11:58:45 -07:00
Nick Winter
3819778bee
Updating everything to Aether 0.2.0.
2014-05-08 11:43:00 -07:00
Nick Winter
775a2a87e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-08 11:36:26 -07:00
Michael Schmatz
f0a873cf02
Fix #985
...
I can’t wait until Chrome has majority market share
2014-05-08 11:17:27 -07:00
Scott Erickson
1e938910ed
Couple bug fixes.
2014-05-08 11:10:22 -07:00
Scott Erickson
e9fc3df7c1
Set up the versions modal to display changes between versions when you select two of them.
2014-05-08 10:54:39 -07:00
Scott Erickson
ed222338e7
Fixed #892 by having the components tab reload whenever it's opened.
2014-05-07 16:24:13 -07:00
Nick Winter
f3c6745b29
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 15:37:49 -07:00
Michael Schmatz
4221fd55cb
Fixed #979
2014-05-07 13:56:10 -07:00
Michael Schmatz
ae213cc330
Fixed #982
2014-05-07 13:33:17 -07:00
Michael Schmatz
7110f023f2
Merge branch 'feature/hover-debugger-performance'
...
Conflicts:
app/lib/God.coffee
app/views/play/level/tome/spell_debug_view.coffee
2014-05-07 11:37:03 -07:00
Michael Schmatz
806b159aab
Fixed another off-by-one error
2014-05-07 10:20:22 -07:00
Michael Schmatz
6fd89f10b9
Fixed various debugger UI bugs
2014-05-07 10:03:49 -07:00
Nick Winter
0c30ec0c12
Some weird bugs I noticed with {me}.
2014-05-06 16:58:08 -07:00
Michael Schmatz
da575f8945
Refactored hover debugger is functional
...
Still needs optimizations and a few bug fixes, but it’s better than the
existing code existing to Nick
2014-05-06 15:07:06 -07:00
Scott Erickson
c58a27fcbf
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-06 11:21:15 -07:00
Scott Erickson
ffdf11133e
Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges
2014-05-06 11:19:11 -07:00
Nick Winter
ca8d5c1f3b
Stop bobbing and more marks when world ended.
2014-05-06 11:02:53 -07:00
Michael Schmatz
dddd617a08
userCodeMap issues fixed
...
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Nick Winter
2e6bec5454
Some fixes for my accidental merge of #970 .
2014-05-06 09:49:04 -07:00
Nick Winter
1f3cc8a004
Merge branch 'master' of git://github.com/domenukk/codecombat
2014-05-06 08:00:39 -07:00
Dominik Maier
6d244e8560
+ Merged Simulators
2014-05-06 05:07:34 +02:00
Dominik Maier
c9bb488794
Created headless-client and an alternative implementation of god
2014-05-06 02:37:14 +02:00
Nick Winter
0e0ca785d9
Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.
2014-05-05 16:59:12 -07:00
Nick Winter
82529c781b
Fixed some ladder home links.
2014-05-05 15:33:08 -07:00
Scott Erickson
8f9aea1b9b
Fixed the patches view.
2014-05-05 15:19:35 -07:00
Nick Winter
b6a53a83e7
Fixed issue with play button not turning into rewind.
2014-05-03 13:26:37 -07:00
Nick Winter
73222a1a98
Don't start drawing Surface until needed.
2014-05-03 09:13:26 -07:00
Nick Winter
77adebe181
Fixed #893 .
2014-05-02 18:53:18 -07:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Nick Winter
afbe5b063b
Fix HTML icon syntax in the Markdown.
2014-05-02 15:51:07 -07:00
Nick Winter
a04f74de8b
Implemented George's gold design.
2014-05-02 15:12:30 -07:00
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Scott Erickson
2952d7702c
Merge branch 'master' into feature/thangload
...
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
2014-05-02 08:20:03 -07:00
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
ae31f90a25
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 17:41:10 -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
Michael Schmatz
347292c985
Implemented save notes button
2014-05-01 17:36:49 -07:00
Michael Schmatz
9fb5826593
Scroll to candidate position while going back
2014-05-01 16:56:41 -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
Scott Erickson
3bc0c1710e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288
Fixed #934
2014-05-01 15:44:50 -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
Michael Schmatz
294570cb1b
Made it so that modal doesn't show if you've signed the contract
2014-04-29 15:30:28 -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
Michael Schmatz
546bd26328
Fixed login flow and user profile issue
2014-04-29 15:12:50 -07:00
gosnat
d0900870b2
Update play_view.coffee
...
Fixed ID for harvest-time level (was pointing to find-the-spy)
2014-04-29 10:53:55 -05: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
Scott Erickson
8164c6881c
Fixed a patches resource name.
2014-04-28 11:10:27 -07:00
Scott Erickson
01f2a556f9
Set up the patches view with the new loading system, fixing a few things in the meanwhile.
2014-04-28 11:09:21 -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
dpen2000
0a8ec096f7
Make components read only for anonymous users
2014-04-28 02:03:08 -04:00
dpen2000
3165a2b654
Change all lines setting readonly from being admin only to being authenticated only
2014-04-28 02:03:08 -04: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
Scott Erickson
14cffc5875
Did some refactoring to simplify using SuperModel and registering models and collections.
2014-04-26 12:54:03 -07:00
Scott Erickson
d5bcec5ad0
Fixed the level editor with the new loading system.
2014-04-25 19:11:32 -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
14d62915f4
Got projection and backups set back up, partially fixed the level editor.
2014-04-25 16:14:05 -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
7640a6365b
Removed some logs.
2014-04-25 14:59:17 -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
2ff97c3bcd
I guess emails might not be there.
2014-04-25 10:55:37 -07:00
Nick Winter
183fe9c496
Code review of 97d3b6.
2014-04-25 10:46:43 -07:00
Michael Schmatz
abe07e6395
Potential popup blocker fix
2014-04-25 09:17:04 -07:00
Michael Schmatz
97d3b6107d
Merge feature/linkedin into master
2014-04-25 08:47:31 -07:00
Michael Schmatz
61458c97d6
Fixed jqxhr error display
2014-04-25 07:50:29 -07:00
Michael Schmatz
0dbcc861bf
Various tweaks to employer signup
2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d
Employer signup works
2014-04-24 17:36:07 -07:00
Michael Schmatz
6644c6a9ee
Push for george
2014-04-24 15:27:37 -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
Scott Erickson
2d43b36022
Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText
2014-04-24 13:29:24 -07:00
Scott Erickson
e2c2657f34
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-24 13:23:40 -07:00
Scott Erickson
472f8899dd
Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master
...
Conflicts:
app/views/editor/level/edit.coffee
2014-04-24 13:17:43 -07:00
Nick Winter
b9173a5ea5
Fixed #913 , I think. (This was just built into marked.)
2014-04-24 12:24:22 -07:00
Scott Erickson
0a313a110c
Removed a piece of logging.
2014-04-24 12:07:11 -07:00
Scott Erickson
8ab50205aa
Fixed more buttons in treema.
2014-04-24 11:50:49 -07:00
Scott Erickson
1eb2adbc61
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-24 11:22:50 -07:00
Scott Erickson
76f36294b0
Fixed #908 , while keeping things like opening revert or contact modals in the level editor from breaking.
2014-04-24 11:22:43 -07:00
Nick Winter
73f39095e6
Upgraded table sorter.
2014-04-24 11:09:01 -07:00
tmrdja
14ebc957de
Changed responsive view for LevelEditor
2014-04-24 11:51:16 +02: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
Darredevil
47eef39bc7
Added Gold Rush level
2014-04-24 02:07:59 +03:00
Nick Winter
68f3eeb770
Two tiny profile improvements.
2014-04-23 11:26:20 -07:00
Michael Schmatz
628a784ac4
Progress towards LinkedIn integration
2014-04-23 11:25:36 -07:00
Scott Erickson
c85971e5e6
Added i18n population action to the level editor.
2014-04-22 17:56:41 -07:00
Scott Erickson
9c8841e838
Merge remote-tracking branch 'origin/master'
2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02
Hack to fix a bug with the components view in the thang editor.
2014-04-22 16:42:41 -07:00
dpen2000
dd00e2abe6
Replace generic text Sign Up to Create a New Content
2014-04-23 00:37:10 +01: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
ab77176ed0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-22 11:11:10 -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
Scott Erickson
bb0cbf1151
Removed some old code that didn't work out.
2014-04-22 10:43:08 -07:00
Michael Schmatz
81809956b8
hasChangedSignificantly async refactor
...
Still checking for bugs
2014-04-22 08:54:35 -07:00
Scott Erickson
f57be1ae52
Migrated to the new email system, along with a setting for recruit notifications.
2014-04-21 16:15:23 -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
Scott Erickson
1e50ef36ce
Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming
2014-04-21 12:53:11 -07:00
tmrdja
826a5f56db
Added responsive view for LevelEditor
2014-04-21 21:15:22 +02:00
Scott Erickson
c754f7b943
Merge branch 'master' into feature/loading-views
2014-04-21 11:53:18 -07:00
Scott Erickson
9bc8ae11da
Fixed some indentation.
2014-04-21 11:42:21 -07:00
dpen2000
de69f740e4
Fix deltas referring to last system saved
...
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
2014-04-19 19:59:21 -04:00
Scott Erickson
044556e5a4
Fixed a bug with the level editor that prevented selecting thangs to add.
2014-04-19 10:27:14 -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
George Saines
71ee31ef49
styling the community page
2014-04-18 13:02:07 -07:00
Nick Winter
848ebf2ffe
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca
Reworked top nav. Many improvements to job profile form.
2014-04-18 09:53:28 -07:00
Ting-Kuan
75224e0cd9
hideLoading on ThangEditView and ComponentConfigView.
2014-04-17 22:41:07 -04:00
Ting-Kuan
64f986c286
Remove dependency management in supermodel.
2014-04-17 22:16:29 -04:00
Scott Erickson
ed0c7e1412
Creators of documents are automatically added as watchers. Added a patch creation email for watchers.
2014-04-17 17:09:01 -07:00
Ting-Kuan
69fe4428e4
Before merge to master.
2014-04-17 19:52:09 -04:00
Ting-Kuan
a5e2069d60
Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts.
2014-04-17 19:37:31 -04:00
Ting-Kuan
1c1cf2f189
Fix loading of Level.
2014-04-17 19:23:35 -04:00
Scott Erickson
21e8d7b26f
Fixed patches denormalization.
2014-04-17 15:44:19 -07:00
Scott Erickson
7ccaa8c843
Fixed a bug, colored a badge.
2014-04-17 14:39:52 -07:00
Scott Erickson
cdaf2ebfaf
Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.
2014-04-17 14:23:33 -07:00
Ting-Kuan
b7439ed1ca
Fix loading bar and retry block in ladder_view, #857 .
2014-04-17 16:54:26 -04:00
Scott Erickson
781a8ec913
Fixed the play and save buttons.
2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/views/editor/level/thangs_tab_view.coffee
2014-04-17 13:25:42 -07:00
Scott Erickson
b5406b0149
Set up the rest of the component/system buttons and nav bars.
2014-04-17 13:24:17 -07:00
Ting-Kuan
fe96289bf6
debugging: ladder_view doesn't show loading bar.
2014-04-17 15:57:08 -04:00
Nick Winter
2230b32829
Merge pull request #863 from dpen2000/FixTypeError
...
Fix javascript error occuring when e is null/undefined
2014-04-17 11:37:51 -07:00
Scott Erickson
9eff958dcb
Fixed the level and component watch buttons.
2014-04-17 11:35:09 -07: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
7bc9bb5328
Fix javascript error occuring when e is null/undefined
2014-04-17 14:32:35 -04:00
Scott Erickson
8f4535853b
Fixed the component history button.
2014-04-17 11:29:12 -07:00
Scott Erickson
4c1143f026
Tweaked the versions history modal.
2014-04-17 11:22:33 -07:00
Scott Erickson
8a2b762446
Fixed a bug where opening a modal by data attributes would sometimes open it multiple times.
2014-04-17 11:12:09 -07:00
Scott Erickson
8859405e18
Reworked the nav bars in the level editor.
2014-04-17 11:02:00 -07:00
Nick Winter
40367e701c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-17 10:12:26 -07:00
Nick Winter
eec1888b22
gzipping when in production but not going through Cloudflare.
2014-04-17 10:12:23 -07:00
Ting-Kuan
360e594f3d
Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views
...
Conflicts:
server/commons/Handler.coffee
2014-04-17 12:58:29 -04: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
Michael Schmatz
e764277874
Merge pull request #850 from dpen2000/MoreSimulatorsLeaderboardImprovements2
...
Implement rank column in simulators leaderboard
2014-04-16 13:26:42 -07:00
Scott Erickson
02a7381fa9
Fixed the watch buttons for levels and components.
2014-04-16 11:02:40 -07:00
Scott Erickson
731726dcd3
Merge branch 'master' into feature/jsondiffpatch
2014-04-16 10:42:43 -07:00
Scott Erickson
f88e0ac0ab
Set up patches for components.
2014-04-16 10:42:32 -07: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
Scott Erickson
b9a978dd13
Fixed the colors tab view.
2014-04-16 08:44:04 -07: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
Scott Erickson
476d153717
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-16 08:07:54 -07:00
Scott Erickson
94c4179417
Fixed some things that were keeping brunch from working.
2014-04-16 08:03:41 -07:00
Ting-Kuan
c53eb562a3
Remove debug msg.
2014-04-16 02:31:18 -04:00
Ting-Kuan
52a73ceae3
Migrate view to fit new supermodel.
2014-04-16 02:28:59 -04:00
Scott Erickson
c395a3414e
Merge branch 'master' into feature/jsondiffpatch
2014-04-15 15:18:57 -07:00
dpen2000
a74f89c30c
Implement rank column in simulators leaderboard
2014-04-15 23:13:10 +01:00
Scott Erickson
58b1019934
Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.
2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8
ModelModal and simple leaderboard pagination.
2014-04-15 15:01:54 -07:00
Scott Erickson
e06c3dbb0b
Fixed the thangs tab view preventing the new patches view from handling clicks correctly.
2014-04-15 13:21:33 -07:00
Scott Erickson
1efabc3738
Fixed the fix.
2014-04-15 12:31:35 -07:00
Scott Erickson
69fba34f64
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-15 12:27:46 -07:00
Scott Erickson
b238ccaf27
Fixed the context-menu preventer in the level editor.
2014-04-15 12:27:35 -07:00
Scott Erickson
bb53e963b6
Removed a hack no longer needed.
2014-04-15 12:27:11 -07:00
Nick Winter
e49344bd87
A few job profile fixes and cleanup.
2014-04-15 10:45:54 -07:00
Ting-Kuan
af399f4415
Merge branch 'master' into feature/loading-views
2014-04-15 13:34:20 -04:00
Nick Winter
9194f842e6
Added some job description fields.
2014-04-15 09:28:19 -07:00
Nick Winter
1239617bd4
Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.
2014-04-14 16:34:11 -07:00
Nick Winter
2b7e629c7f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-14 14:49:42 -07:00
Nick Winter
e908ae2fb4
Fixed #772 .
2014-04-14 14:49:38 -07:00
gosnat
ebddcb57a9
Update play_view.coffee
...
Adding the "Find the Spy" level to the user created list.
2014-04-14 15:43:23 -05: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
Ting-Kuan
8e19d8b71f
Change some resource loading logic to fit new SuperModel.
2014-04-13 13:29:43 -04:00
Ting-Kuan
573a4ae847
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
...
Conflicts:
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
2014-04-13 10:37:35 -04:00
Ting-Kuan
4979344ee5
Remove schema loading code.
2014-04-13 10:36:09 -04:00
dpen2000
ec3c292b72
Implement simulators leaderboard
2014-04-13 02:35:58 +01:00
Nick Winter
08616def10
Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.
2014-04-12 14:53:09 -07: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
8349578057
Fixed #786 .
2014-04-12 12:35:45 -07:00
Scott Erickson
30f785f7cf
Moved the model schemas into a models folder.
2014-04-12 10:51:02 -07:00
Scott Erickson
5a794306fe
Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas
2014-04-12 08:53:24 -07:00
Scott Erickson
6eab5003f8
Merge branch 'feature/jsondiffpatch'
2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419
Fixed the level editor so you can save again.
2014-04-12 08:48:49 -07:00
Aditya Raisinghani
e04787475c
Rebased master to get updated schemas and added patch schema
2014-04-12 15:16:42 +05:30
Aditya Raisinghani
b932bf1e7c
Deleted schemas from /server and modified files to point to /app/schemas
2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01
Refactored schemas to be in /app
2014-04-12 14:33:55 +05:30
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Scott Erickson
308adec7c7
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:00 -07:00
Scott Erickson
0eb74ab287
Added buttons for performing actions on patches.
2014-04-11 22:33:09 -07:00
Nick Winter
a792286161
Ameliorated #468 , maybe. At least, it doesn't erroneously show the name errors any more.
2014-04-11 22:30:28 -07:00
Scott Erickson
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -07:00
Nick Winter
99ead5d193
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6
Change populate model to accept resource name.
2014-04-11 22:35:20 -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
91c2f0fa33
Fixed #715 , and some misc cleanup.
2014-04-11 17:36:15 -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
1607790ea3
Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.
2014-04-11 14:59:09 -07:00
Scott Erickson
bbb9fb7a64
Added a patches view.
2014-04-11 14:19:17 -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
Nick Winter
b330e783bf
Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons
2014-04-11 13:28:11 -07:00
Nick Winter
ae65f07e7e
Added some i18n and improved employer page.
2014-04-11 12:49:44 -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
Nick Winter
3751bf903e
Merge pull request #806 from 1c7/master
...
New features: chinese language version use Youku
2014-04-11 10:33:10 -07:00
Scott Erickson
97a7bc7614
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4
Updated to jQuery 2.1.
2014-04-11 10:12:39 -07:00
Nick Winter
a68f3efb99
Added specific job profile photo support. Improved right column design a bit.
2014-04-10 17:54:28 -07:00
Nick Winter
7a35a6248f
Adding contact form for employers to contact candidates.
2014-04-10 14:59:32 -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
Scott Erickson
a3951b0fa7
Extended the save version modal to allow submitting patches.
2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128
Added some autocompleters for job profile Treema. Projects are now entirely links.
2014-04-10 11:58:51 -07:00
Michael Schmatz
a796d88967
Fixed tutorial modal for nonexistent tutorials
2014-04-10 11:42:22 -07:00
Scott Erickson
3c832d3707
Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.
2014-04-10 11:13:33 -07:00
Michael Schmatz
42bf2996af
Made Aether ignore variable hoisting
...
See #813
2014-04-10 10:36:32 -07:00
Scott Erickson
5629284c76
Added text diff library to delta view.
2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e
Integrated the delta view into the save view for levels.
2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e
Fixing some recruitment profile bugs.
2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
2014-04-09 16:46:44 -07:00
Scott Erickson
b15380047c
Tweak to view.
2014-04-09 16:09:53 -07:00
Scott Erickson
f2d21b960f
Added a delta subview for displaying deltas of schema'd data.
2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10
Implemented George's jobs page design.
2014-04-09 13:14:52 -07:00
Aditya Raisinghani
495d1be620
Added social buttons to Sign up modal
2014-04-10 01:01:30 +05:30
Nick Winter
76054345d7
Fixed #805 .
2014-04-09 09:04:59 -07:00
1c7
56c18441e4
use youku for Chinese Version
2014-04-09 13:50:13 +08:00
Nick Winter
c226835ff2
Fixed a couple bugs in custom TreemaNodes.
2014-04-08 17:13:05 -07:00
Ting-Kuan
6729cfc292
First commit.
2014-04-08 12:03:03 -04:00
Nick Winter
b96bca8c18
Finished most of basic features for job profiles.
2014-04-07 17:58:02 -07:00
Nick Winter
9af6694054
More work on the job profiles.
2014-04-07 15:21:05 -07:00
Aditya Raisinghani
7cc9d22254
Moved nanoscroller to bower components and related fixes.
2014-04-08 03:04:36 +05:30
Nick Winter
1b79de0d86
Loading active candidate profiles from the database into a table for employers.
2014-04-06 17:01:56 -07:00
Nick Winter
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07:00
Ting-Kuan
ac51404d4c
remove debug msg.
2014-04-06 16:40:06 -04:00
Ting-Kuan
20c624e0b8
Refactor CocoView.
2014-04-06 16:37:00 -04:00
Aditya Raisinghani
634ed82938
Fixed the background for spectate view
2014-04-07 01:00:35 +05:30
Nick Winter
5c8c7fff1d
Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.
2014-04-05 17:05:03 -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
Scott Erickson
2093049f5c
Fixed a bug with the profile view caused by the new page loading system.
2014-04-04 13:59:40 -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
Aditya Raisinghani
1c3117836f
Shifted nanoscroller to vendor.
2014-04-04 00:13:09 +05:30
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
ae9769e3ce
Added read only notification in editors. Fixed #374 .
2014-04-01 13:15:30 -07:00
Nick Winter
ba3c4af536
Fixed last piece of #673 .
2014-04-01 10:51:03 -07:00
Nick Winter
b316a3e078
Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing
2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
2014-04-01 09:12:48 -07:00
Ting-Kuan
e076440d1b
Move Noty to vendor folder.
2014-04-01 02:41:04 -04:00
Ting-Kuan
085d181ed3
Use Noty to produce warning message while adding component with not added system.
2014-04-01 00:47:50 -04:00
Nick Winter
8c013c1192
Fixed 101: added level completion status to /play.
2014-03-31 15:48:22 -07:00
Nick Winter
389323953b
Fixed #180 .
2014-03-31 13:56:13 -07:00
Nick Winter
d8a194f895
Actually using loading screen template.
2014-03-31 13:21:08 -07:00
Dominik Kundel
1c6aea9c1c
Merge remote-tracking branch 'upstream/master'
2014-03-31 20:35:32 +02:00
tmrdja
dfe6bce351
Added contextmenu
...
Added contextmenu
2014-03-31 18:33:14 +02:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07:00
tmrdja
f8de6162d1
Added contextmenu
...
Added contextmenu with Delete and Duplicate button
2014-03-30 19:38:54 +02:00
Nick Winter
6bff295d2e
Linking up Prabh's Coin Mania level.
2014-03-29 18:04:29 -07:00
Nick Winter
54f4e8d1e9
Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor
2014-03-29 17:38:14 -07: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
bd0ecd76e5
Fixed SearchView projections.
2014-03-29 13:22:21 -07:00
Ting-Kuan
130d322d60
Move error_view's dom to template file.
2014-03-28 23:51:15 -04: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
ff7e2d5d47
Fixed #728 .
2014-03-28 11:02:23 -07:00
Nick Winter
62867534a7
Fixed #727 .
2014-03-28 09:52:07 -07:00
Scott Erickson
84cb0bfd0d
Merge pull request #713 from Sighne/master
...
Migrate .on, .once - ThangTypeEditView
2014-03-28 09:34:29 -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
7ab5adcdac
Merge pull request #700 from pedrofgsrj/loginAutocomplete
...
Fixed issue #597
2014-03-27 14:20:58 -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
Laura Lebbah
5d894ea053
Migrate .on, .once - ThangTypeEditView
2014-03-27 21:33:59 +01:00
Ting-Kuan
6012a3ce9e
Show error message when editor fails to initiate.
2014-03-27 14:35:20 -04:00
Pedro Sobrinho
38bf27020a
Fixed issue #597
2014-03-26 20:55:03 -04: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
Scott Erickson
e9b3db2eb9
Fixed destroy to not break stopListening, which uses off.
2014-03-24 14:27:10 -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
093cc66fa0
Reverted few wrong migrations
2014-03-24 22:56:32 +05:30
Shrihari
f085b0d319
Refactored cast-button events
2014-03-24 22:41:27 +05:30