Nick Winter
635c4e18df
Restricted Roughedge and Sharpened Sword for Kithgard Gates Builder's Hammer swap, too.
2014-11-14 11:03:01 -08:00
Nick Winter
7e12c10649
Temporarily disabled code toolbar for a few more levels. Worked around The First Kithmaze / Haunted Kithmaze switch for preventing level unlock problems.
2014-11-14 09:24:42 -08:00
Nick Winter
01d6c6d239
Stop whole-line selection on gutter clicks.
2014-11-13 10:54:50 -08:00
Nick Winter
05a3577de9
Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.
2014-11-13 10:49:37 -08:00
Nick Winter
4fe6fd3020
Some fixes for loading iPad gem products.
2014-11-12 20:21:14 -08:00
Scott Erickson
ed8285248f
Put in the new InventoryModal background.
2014-11-12 18:01:35 -08:00
Scott Erickson
5b034194ee
Put in the new BuyGemsModal design.
2014-11-12 17:17:24 -08:00
Scott Erickson
07cf741015
Changed the campaign switching icons arrows nested in the campaign maps.
2014-11-12 16:26:35 -08:00
Nick Winter
ba6565395e
Spell palette cool with multiple items offering same skills.
2014-11-12 15:28:08 -08:00
Scott Erickson
025780a575
Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing.
2014-11-12 15:00:24 -08:00
Scott Erickson
6e433e1b77
Filtered out achievement popups for level achievements.
2014-11-12 14:40:01 -08:00
Scott Erickson
913dda65aa
Created the VectorIconSetupModal, a quick way to get portraits aligned to a container.
2014-11-12 14:14:07 -08:00
Scott Erickson
fc3a5de2f2
Tweaked the BuyGemsModal to not need gems from the iPad app.
2014-11-12 12:15:03 -08:00
Nick Winter
26beb8a034
A few improvements to ItemDetailsView formatting to deal with spells granted.
2014-11-12 11:02:05 -08:00
Scott Erickson
9b33ffe5d8
Tweaked the BuyGemsModal to not care if iPad event handling is synchronous or not.
2014-11-12 10:37:09 -08:00
Scott Erickson
a582717bc3
Set up the BuyGemsModal with Backbone events so the iPad can communicate with it.
2014-11-12 10:23:43 -08:00
Scott Erickson
c3eecd15be
Set up the WorldMapView to update the gem count when a player purchases gems or items.
2014-11-12 10:22:56 -08:00
Scott Erickson
ad35109878
Built the BuyGemsModal stub.
2014-11-12 09:40:55 -08:00
Nick Winter
f1947d7d9d
Fixed a couple bugs.
2014-11-11 18:16:45 -08:00
Nick Winter
0af7b4d5b7
Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories.
2014-11-11 16:37:00 -08:00
Nick Winter
c06f226e72
Renaming A Fiery Trap to Back to Back.
2014-11-11 07:57:29 -08:00
Nick Winter
ce04541d3a
Working on tying item purchasability to player level, plus other small tweaks to the item store.
2014-11-10 22:07:55 -08:00
Nick Winter
eab293cb66
Refactored item-details-view styling and shared styles between InventoryModal and PlayItemsView, fixing scrollbars and text overflow issues in the process. Dragging to unequip now updates restrictions again. Worked on pointer cursors for equippable ittems. Hid items not usable by your hero's class. Stopped silhouetted items from being clickable.
2014-11-10 18:13:04 -08:00
Nick Winter
fbbcf2a925
Replayed useful changes from last few InventoryModal commits after big merge.
2014-11-10 16:09:41 -08:00
Scott Erickson
f21f54cd19
Refactored, mostly redesigned inventory view, modeled after the Heald item store design.
2014-11-10 15:31:32 -08:00
Nick Winter
ffea887330
Revamped real-time playback behavior to kick in on Thornbush Farm. Added a Done button until then.
2014-11-10 15:16:28 -08:00
Nick Winter
d8dfc0a2b3
Fixed some bugs with LevelSetupManager and inventory. Moved hard-coding of level-specific options to a new LevelOptions config file. Fixed a couple minor bugs.
2014-11-10 12:47:24 -08:00
Matt Lott
e253795665
Removing stray test console.log
2014-11-10 11:09:07 -08:00
Matt Lott
c5b26a4376
A/B test experimental languages hero select
...
Test group not shown experimental languages on first hero select.
2014-11-10 11:08:21 -08:00
Nick Winter
97c4ff2e7e
Made flag detection more dynamic.
2014-11-10 10:51:46 -08:00
Nick Winter
956186b538
Fixed #1604 : changing languages and reloading work better now.
2014-11-10 09:36:40 -08:00
Nick Winter
ab448532f5
Fixed bug in achievement popup listing wrong xp left values.
2014-11-10 08:31:26 -08:00
Nick Winter
f78ff257ab
Several improvements to behavior of pointing out next levels.
2014-11-10 08:21:28 -08:00
Nick Winter
563c886bdd
Hide the play button on the inventory screen until the items have fully loaded.
2014-11-10 07:49:30 -08:00
Matt Lott
a3d88eb975
Update a/b test tracking data
...
cast button text was missing group
auto first level and cast button text didn’t need action property
2014-11-09 21:47:51 -08:00
Matt Lott
9c6485b142
A/B test automatically starting first level
...
When loading the world map, if user hasn’t already started it.
2014-11-09 21:33:50 -08:00
Nick Winter
85471badaa
Added callout to become an Adventurer on disabled levels.
2014-11-09 21:27:03 -08:00
Nick Winter
111b9febac
Updated main.html. Removed LinkedIn.
2014-11-09 20:35:46 -08:00
Nick Winter
44d4d13c93
A few tweaks to the GameMenuModal.
2014-11-09 20:19:12 -08:00
Nick Winter
9b074841d6
Messed around with some of the new modals' scroll bars.
2014-11-09 19:39:09 -08:00
Nick Winter
51d8564aac
Lazily loading FilePicker. Reducing number of web workers used on iPad to try to reduce memory pressure.
2014-11-09 17:35:50 -08:00
Nick Winter
2bafad2932
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-09 16:19:28 -08:00
Nick Winter
ad06000ceb
Fixed three big memory leaks: LevelSetupManagers never being destroyed, wall grid closures retaining Lanks, and real-time-multiplayer:new-opponent-code retaining Spells.
2014-11-09 16:19:18 -08:00
Matt Lott
377138f35f
Hide problem alert on code change
2014-11-09 11:36:17 -08:00
Matt Lott
5741968210
Skip delimiters on Enter
2014-11-09 11:28:03 -08:00
Matt Lott
1f11ad66ed
Play problem alert sound on jiggle
2014-11-08 22:17:14 -08:00
Matt Lott
0d2fe9b6e2
Update error code line background
...
Add title to problem alert dialog
2014-11-08 21:51:58 -08:00
Nick Winter
a628372b1b
Enabled some levels for testing.
2014-11-08 21:50:25 -08:00
Nick Winter
14e8f6a653
Preparing for some of these new levels.
2014-11-08 19:33:00 -08:00
Nick Winter
b74ad24aa8
A few sass tweaks to problem alerts and level loading.
2014-11-08 11:59:39 -08:00
Nick Winter
f9370532af
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-08 11:51:38 -08:00
Nick Winter
8d81445b84
More improvements to level loading view sizing and unveiling.
2014-11-08 11:51:31 -08:00
Nick Winter
1b94868197
Added new LevelDialogueView. Messed around with dimming a bit more.
2014-11-08 11:39:04 -08:00
Nick Winter
4cb641689c
Increased dimming behavior when parts of the DOM are locked.
2014-11-08 08:58:36 -08:00
Nick Winter
a8700f5113
Reload now shows confirmation modal again. Added some stuff missing from the last commit.
2014-11-08 08:38:25 -08:00
Matt Lott
588fa0620e
Jiggle user code problem alert
2014-11-07 22:46:12 -08:00
Matt Lott
d43fd49d12
Use testGroupNumber in cast button text A/B test
2014-11-07 21:56:49 -08:00
Nick Winter
f3dfcdc81d
Implemented new HUD design. Removed more unneeded stuff. Changed reload button to restart level. Still need restart confirmation and to redo the sprite dialogue area.
2014-11-07 19:15:55 -08:00
Nick Winter
cfff09b01e
Merged big .executing arrow.
2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc
Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things.
2014-11-07 16:04:35 -08:00
Scott Erickson
636a46ff00
Removed my testing code for the GameMenuModal.
2014-11-07 13:05:31 -08:00
Scott Erickson
eecdbdbe17
Minor fix for when changing hero from the world map.
2014-11-07 13:02:48 -08:00
Scott Erickson
a087663458
Implemented Heald's design of the GameMenuModal.
2014-11-07 13:02:28 -08:00
Nick Winter
fbc2799211
Startd to implement new code editor design. Fixed #1732 .
2014-11-07 09:09:13 -08:00
Matt Lott
b4dde5705b
Place error message over Surface next to line
2014-11-06 21:43:43 -08:00
Nick Winter
03852fb44f
Plannable pickUpFlags support and fixes for playing Coinucopia.
2014-11-06 18:21:54 -08:00
Scott Erickson
424c3a6d3e
Integrated the new PlayHeroesModal into the game, refactoring PlayLevelModal into LevelSetupManager.
2014-11-06 16:23:23 -08:00
Matt Lott
1630f7e033
Remove time from problem alert message
2014-11-06 15:03:39 -08:00
Matt Lott
453960b3fb
A/B Run and Submit button text
2014-11-06 14:44:56 -08:00
Nick Winter
ce6526863d
Support for hiding optional bonus goals until they are achieved instead of until they are failed.
2014-11-06 08:57:13 -08:00
Nick Winter
fe7e96ab4e
Started restricting common items with APIs that will make it impossible to win certain dungeon campaign levels.
2014-11-05 20:56:17 -08:00
Nick Winter
851bf39c5c
Using extendedName.
2014-11-05 20:22:15 -08:00
Nick Winter
ce8b3bc83c
Added hero components projection for good hero stat comparison bars. Fixed overflow/scrolling on code language selector for play-heroes-modal.
2014-11-05 19:37:13 -08:00
Nick Winter
35f5fd1c84
Hid some buttons that take us to old account/settings/achievements pages for now. Made property documentation popovers chill over to the left.
2014-11-05 19:23:55 -08:00
Scott Erickson
c660053dea
Set up the PlayHeroesModal, and hooked it into the world map.
2014-11-05 19:04:14 -08:00
Nick Winter
c48b155413
Allow rerun of level without a code change.
2014-11-05 18:06:21 -08:00
Nick Winter
36c753a828
Returning executed statement highlighting to deemphasized state when playback has ended.
2014-11-05 17:47:23 -08:00
Nick Winter
aa9c3b5eaa
Fixed iPad scrubber positioning. Reworked spell debug progress stepper to use drags instead of hover. Hiding spell debug progress stepper based on level, not statements executed.
2014-11-05 17:34:56 -08:00
Nick Winter
f8679dfeca
Hide say() until later levels. Fix bug with identifying correct equipped item ThangTypes in the spell palette.
2014-11-05 15:43:08 -08:00
Nick Winter
46409ef10d
Made goals styling more robust to different sizing scenarios.
2014-11-05 15:06:26 -08:00
Nick Winter
189c3d202c
Goals now show status: 'Running...' while the world is simulating.
2014-11-05 14:42:55 -08:00
Nick Winter
184e4c124a
Impossible to select another slot and hide the available item the arrow is requiring you to equip.
2014-11-05 14:17:11 -08:00
Nick Winter
0e1afff318
No fold widgets in ACE.
2014-11-05 13:53:23 -08:00
Nick Winter
2afc7c830a
Implemented getHeroStats.
2014-11-05 13:28:54 -08:00
Nick Winter
6efcbc5ead
Hid Crawlways of Kithgard. A/B testing Haunted Kithmaze vs. The First Kithmaze. Renamed New Sight to Dread Door and awarded its glasses later.
2014-11-05 10:40:37 -08:00
Nick Winter
a2554570b0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-05 07:50:13 -08:00
Matt Lott
40506d23a6
Admin growth view
2014-11-04 22:17:49 -08:00
Nick Winter
f461aeca95
Implemented new playback scrubber textures.
2014-11-04 19:03:35 -08:00
Nick Winter
49b8c745a0
New GoalsView background. Be my guest with any text color improvements.
2014-11-04 17:20:58 -08:00
Nick Winter
b776350e6a
Made item shop fit on iPad and small screens.
2014-11-04 08:39:36 -08:00
Nick Winter
ff1f9d488c
Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins.
2014-11-04 07:52:23 -08:00
Nick Winter
9dba7ee187
Temporarily making Wizard/Ranger gear unpurchasable while we have no Wizards or Rangers.
2014-11-04 07:19:30 -08:00
Scott Erickson
2dee00883c
Removed the testing code for the PlayItemsModal.
2014-11-03 20:53:49 -08:00
Scott Erickson
33d14918b0
Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed.
2014-11-03 20:48:59 -08:00
Nick Winter
447432301d
Turning some links into buttons for iPad.
2014-11-03 09:58:57 -08:00
Nick Winter
441cf8c339
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-02 18:37:36 -08:00
Nick Winter
75f624c10b
More iPad tweaks. Can now switch back to logging in from signing up. Default to signing up instead of logging in.
2014-11-02 18:36:43 -08:00
Michael Schmatz
60d60f8b49
Add logging out event
2014-11-02 19:02:49 -05:00
Nick Winter
ad2fdb9dde
Working on new Fully Illustrated designs for level play view and iPad interface.
2014-11-02 14:51:01 -08:00
Nick Winter
9ebd09ec40
Analytics tracking individual note group starts/ends. Showing next level arrow faster. Added a couple munchkin names from one of yesterday's playtesters.
2014-11-01 16:59:12 -07:00
Nick Winter
e2680a3382
Tweaking my tweaks.
2014-11-01 15:57:42 -07:00
Nick Winter
a061ab5148
Some styling and animation tweaks to the level loading screen.
2014-11-01 11:10:26 -07:00
Nick Winter
57544c72a8
Moved Tactical Strike in from the edge of the map so it's a little more clickable on iPad.
2014-11-01 10:22:38 -07:00
Nick Winter
e129faf384
A few tweaks here and there.
2014-11-01 09:35:19 -07:00
Nick Winter
19c7d7b3b8
Schema is more lenient for problem we occasionally see with opponent level sessions not having a submittedCodeLanguage. Play dungeon menu music on levels of undefined terrain type.
2014-10-31 18:05:29 -07:00
Matt Lott
35cba4a90d
Sync PVP status view and bug fixes
...
Pvp status view (temp location and UI)
Remove pvp status from control bar
Add game menu param for jumping into a specific tab
Lots of bug fixing and session state cleanup
Does not address problems with executing real-time multiplayer cast
2014-10-31 16:33:43 -07:00
Nick Winter
4bc5e5d3ad
Gigantic DOM highlight arrow when animating in. A few more tiny tweaks and bugfixes.
2014-10-30 22:31:40 -07:00
Nick Winter
cd89198f70
Finished rearranging levels on the dungeon map.
2014-10-30 21:34:49 -07:00
Nick Winter
da3872b0a8
Hooked up new inventory recommendations for new levels.
2014-10-30 20:17:57 -07:00
George Saines
a0775e1bf2
moved the practice levels into position
2014-10-30 19:58:11 -07:00
George Saines
c8e5cdefec
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-30 19:47:29 -07:00
George Saines
bab73531f2
modified the map?
2014-10-30 19:47:24 -07:00
Nick Winter
a69e12fbc2
Updated WorldMapView to new levels.
2014-10-30 19:18:03 -07:00
Nick Winter
01fccf5ab7
Started highlight arrow sound A/B test. Hid more of the HUD when hiding. Support for knowing whether your killer was hurt when firing world:thang-died notes.
2014-10-30 19:18:03 -07:00
Nick Winter
57680f4a83
Hide HUD until Kithgard Gates.
2014-10-30 16:59:32 -07:00
Nick Winter
47c090f7c7
Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of.
2014-10-30 13:07:04 -07:00
Nick Winter
7da65dec5b
Including leather boots as required gear better. Labeling 'Your Skills'. Not showing a minus for incomplete goals. Adding script triggers for deleting required sample code.
2014-10-29 22:29:36 -07:00
Nick Winter
9b29e9512f
Fixed GameMenuModal sometimes defaulting a Python player back to JavaScript.
2014-10-29 16:49:37 -07:00
Nick Winter
ea349cfa29
Intermediate query state for heroes while still transitioning from Unit to Hero.
2014-10-29 15:54:51 -07:00
Nick Winter
98fe639010
Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor.
2014-10-29 15:34:04 -07:00
Nick Winter
2e3afa989b
Handling some missing comment template errors better. Fixed equipping builder's hammer before Kithgard Gates. Fixed next level branch button linking.
2014-10-29 12:08:03 -07:00
Nick Winter
83bd8d3834
Enabled Forgetful Gemsmith in the world map.
2014-10-29 11:09:54 -07:00
Nick Winter
696b0ba336
Working around DCM's latest (very old) sploit.
2014-10-29 10:51:34 -07:00
Nick Winter
066fab03a3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-29 10:47:31 -07:00
Nick Winter
efa28b1064
Added some levels to the forest map. Beating levels and returning home now takes you to the proper map.
2014-10-29 10:47:17 -07:00
Scott Erickson
d3192dd373
Fixed a bug where the game menu being auto opened was crashing.
2014-10-29 10:43:05 -07:00
Scott Erickson
02eacbbc8f
Added a button to switch between world maps.
2014-10-29 09:48:37 -07:00
Nick Winter
5ba1f61abe
Added i18n support for level code comments.
2014-10-28 21:15:47 -07:00
Nick Winter
c7713b4105
Showing i18n in property docs.
2014-10-28 21:15:47 -07:00
Scott Erickson
a4729d9d6b
Finished migrating the guide into game menu.
2014-10-28 16:30:40 -07:00
Scott Erickson
dcb7aaf9a4
Removed a TODO.
2014-10-28 14:23:39 -07:00
Scott Erickson
e6c0d53d50
ThangType editor now deletes properties properly.
2014-10-28 14:22:29 -07:00
Scott Erickson
67684b89d5
Fixed #1687 , forcing reloads when populating i18n in documents.
2014-10-28 14:21:22 -07:00
Scott Erickson
895645ef6d
Levels and Components with i18nCoverage update that coverage from the level editor now.
2014-10-28 13:48:17 -07:00
Scott Erickson
9e6fd119a0
Achievements populate i18n whenever they're edited now.
2014-10-28 13:09:07 -07:00
Scott Erickson
e5ea4f70e9
Added a progress bar to the i18n home view. Sorting models by completion so documents needing translation go to the top.
2014-10-28 11:28:31 -07:00
Scott Erickson
346f3b33bf
Added context to the i18n editor for components.
2014-10-28 11:21:26 -07:00
Nick Winter
68ac412f2b
I think this return is needed to prevent sending the i18n query results twice and crashing the server.
2014-10-27 22:54:50 -07:00
Scott Erickson
cea04d27ad
Built diplomat-specific views for editing levels, components, achievements and thang types.
2014-10-27 17:16:22 -07:00
Matt Lott
8f923f9e1e
Replacing http PATCHs with PUTs
...
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
2014-10-27 16:09:52 -07:00
Nick Winter
f86c726fc8
Made iPad touch events work on inventory equipping and progress slider.
2014-10-27 13:32:32 -07:00
Nick Winter
206f7ee5a4
Upgraded ChooseHeroView: drag onto hero, more visible drag states and animations, emphasize double-click over drag, better programming language selector.
2014-10-27 11:17:34 -07:00
Nick Winter
7b2964c6ef
Formatting docs popovers for iPad.
2014-10-26 20:21:03 -07:00
Nick Winter
4c8e67efce
FastClick avoidance on start level button.
2014-10-26 17:49:45 -07:00
Matt Lott
0f721f9f48
Reducing user code problems view to recent 300
...
Loading 1000 took too long (~10min) in production.
2014-10-26 17:11:51 -07:00
Nick Winter
c0f5c357ba
Defense, not defence.
2014-10-26 15:31:20 -07:00
Nick Winter
27d1304c6c
Turns out checking Errorception is really useful.
2014-10-26 11:02:34 -07:00
Matt Lott
7c21d5921e
Update query for user code problems view
...
So it doesn’t explode in production.
2014-10-26 10:50:30 -07:00
Nick Winter
6473fff940
Implemented stat comparison bars on ChooseHeroView.
2014-10-25 21:53:55 -07:00
Nick Winter
3f5f292f0d
Updated how we're sending over spell palette items to iPad app.
2014-10-25 16:26:03 -07:00
Michael Schmatz
56da3af83b
Publish "tome:spell-loaded" on spell reloading
2014-10-25 17:00:54 -04:00
Matt Lott
185c977cdb
User code problems admin view
...
Shows the most recent 1000 log entries
Url: admin/user-code-problems
2014-10-24 15:11:55 -07:00
Matt Lott
f4426f2e43
Save user code errors without 'Line N: ' prefix
2014-10-24 14:05:54 -07:00
Nick Winter
42b81fd55e
Fix for point/region choosers destroying AudioPlayer's camera. Fix for DOM highlight arrow covering up level info on iPad.
2014-10-24 13:03:15 -07:00
Matt Lott
651ff3c8d0
Update attack snippet if no findNearestEnemy
...
This is a one-off fix until we have a more general solution to snippet
updating based on available skills.
2014-10-24 11:38:48 -07:00
Nick Winter
79ed8b2470
Hooked up some menu music transitions to play menu music during HeroVictoryModal and GameMenuModal.
2014-10-23 20:03:19 -07:00
Nick Winter
4c33b98e27
Fixed building Thangs with new Components that no other Thang uses. Fixed THangs with id 0 in the level editor.
2014-10-23 18:11:12 -07:00
Nick Winter
13fe1bbece
Improved branching choices and set up an A/B/C/D test around branching.
2014-10-23 16:37:09 -07:00
Matt Lott
83516f562b
Enable local autocomplete
2014-10-23 16:23:46 -07:00
Matt Lott
a5695e896b
Increase size of autocomplete popup
2014-10-23 11:16:58 -07:00
Nick Winter
7f8216f482
Experimental branching support, visible to admins.
2014-10-22 15:42:51 -07:00
Nick Winter
039dd4f264
Fixed issue with HeroVictoryModal assuming achievements all have rewards.
2014-10-22 13:57:57 -07:00
Matt Lott
625a34b2e6
Add autocomplete right-justified help text
2014-10-22 12:24:31 -07:00
Nick Winter
afc6558edc
Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging.
2014-10-22 10:46:34 -07:00
Scott Erickson
1f7d098b2e
Added rotation buttons in the context menu and shortcuts to the level editor.
2014-10-22 07:53:49 -07:00
Nick Winter
49f3a0a298
More logging for the merged models problem.
2014-10-21 20:12:20 -07:00
Nick Winter
399cd048fc
Logging some stuff to get to the bottom of things.
2014-10-21 19:39:13 -07:00
Matt Lott
bb8d1d8362
Adding more analytics even tracking
...
Actions on homepage
Path from homepage to first level
2014-10-21 16:55:16 -07:00
Nick Winter
09e80120bf
Fixed issue with progress scrubber hover not showing the right time when hovering over handle.
2014-10-21 15:59:43 -07:00
Nick Winter
7c2982d3f1
Adding some logging for crazy save validation bugs. Swapping in flag item slot.
2014-10-21 13:57:49 -07:00
Scott Erickson
7f4ac3e5d6
Fixed point and region choosers in the level editor.
2014-10-21 10:59:05 -07:00
Nick Winter
7a9014f83a
Several improvements to the victory modal.
2014-10-20 19:01:00 -07:00
Nick Winter
bc15ccd240
Fixed panel vs. total counts on other achievements.
2014-10-20 16:13:56 -07:00
Nick Winter
ec3e1d0bce
Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing.
2014-10-20 13:57:32 -07:00
Nick Winter
1219710cbb
Starting to work on codeProblems goal type. Rearranged script import for publishing notes earlier. Fallback for Math.log10.
2014-10-20 09:41:28 -07:00
Nick Winter
08d9e39764
LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests.
2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85
Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal.
2014-10-19 17:38:10 -07:00
Nick Winter
440e1700b1
Using aiSource now for enemy AIs in multiplayer, separate from sample code source.
2014-10-19 12:44:58 -07:00
Imperadeiro98
d4f9078980
Update WorldMapView.coffee
2014-10-19 12:50:58 +01:00
Imperadeiro98
d9a32895c7
Update MainPlayView.coffee
2014-10-19 12:49:57 +01:00
Nick Winter
9f216e3361
Preserving opponent flags.
2014-10-18 18:57:33 -07:00
Nick Winter
24da2aa80a
Preserving flag history and submission count so that things are more stable in between real-time submissions.
2014-10-18 17:32:01 -07:00
Nick Winter
56a80e3615
Started getting hero-ladder level type working.
2014-10-18 14:51:49 -07:00
Michael Schmatz
4aff89d60a
Fixed spell palette changes for iPad
2014-10-18 09:46:08 -04:00
Nick Winter
2e539debbb
Added signup poke to HeroVictoryModal.
2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e
More blingstrositization for the HeroVictoryModal.
2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54
First set of fixes to HeroVictoryModal.
2014-10-17 18:00:13 -07:00
Matt Lott
f75ff8a236
Don't save duplicate user code problems
2014-10-17 15:53:00 -07:00
Nick Winter
a65dabad04
Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay.
2014-10-17 15:25:31 -07:00
Nick Winter
7bc50ade30
Fixes for spectate layout in new WebGL dual-stage mode.
2014-10-17 08:47:53 -07:00
Nick Winter
a922c9c6ef
First draft of new hero spell palette that groups abilities by item.
2014-10-16 21:38:11 -07:00
Nick Winter
07b988c405
Fixed gear requirements for Closing the Distance.
2014-10-16 12:14:04 -07:00
Nick Winter
54de8482f1
Spell palette now hugs the spell editor, which itself shrinks as needed.
2014-10-16 12:08:21 -07:00
Scott Erickson
fbaced90c3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-15 16:43:37 -04:00
Scott Erickson
9455199b39
Limited social media library loading to only those views that need it.
2014-10-15 16:43:26 -04:00
Nick Winter
d3f35f024a
Fixed #1665 . Fixed #1667 .
2014-10-15 10:33:33 -07:00
Nick Winter
9826311656
Started playing menu music on WorldMapView. Only go full-screen on squat windows where we really need it (see #1669 ).
2014-10-15 10:28:29 -07:00
Nick Winter
5c40f99d99
Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit.
2014-10-14 22:38:22 -07:00
Matt Lott
7cbb5ac45d
Pass common 'this' methods to Aether
2014-10-14 17:53:17 -07:00
Matt Lott
ce14f92979
Pass problem context to Aether
...
So Aether can craft better error messages.
Bumping Aether to v0.2.39
2014-10-14 14:02:34 -07:00
Nick Winter
ee9e32af51
Hid play/pause button for first few levels. Hid submit button until run once or won for a few more levels.
2014-10-14 11:11:56 -07:00
Nick Winter
b7fe9398d5
Don't preload when player hasn't finished typing this or self.
2014-10-14 10:39:13 -07:00
Nick Winter
d79d40b98c
Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin.
2014-10-14 09:54:36 -07:00
Nick Winter
80537dfac7
Experimented with triggering full-screen on first level start.
2014-10-13 21:45:14 -07:00
Scott Erickson
99e5941126
Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels.
2014-10-13 17:18:33 -04:00
Scott Erickson
6ff7cd12cc
Mostly done with the victory modal.
2014-10-13 11:53:08 -04:00
Michael Schmatz
dee5d82d61
Added gutter problem support for iPad
2014-10-11 12:57:45 -04:00
Michael Schmatz
e7269a62dd
Added line highlighting event for iPad
2014-10-11 11:34:31 -04:00
Nick Winter
629827f133
Fixed onAnnotationClick handler message.
2014-10-10 13:36:13 -07:00
Nick Winter
7f9fdc7253
Fixed temporarily locking of items.
2014-10-09 19:59:57 -07:00
Nick Winter
a0ad5efba2
Some improvements for exhortation of tunic donning in The Raised Sword.
2014-10-09 19:54:39 -07:00
Matt Lott
37ac9f1a69
Fix highlight error when opening browser tools
2014-10-09 17:55:38 -07:00
Nick Winter
7487df5af8
Point out (and require) equipping of necessary items for first set of levels. Can now drag items to unequip.
2014-10-09 15:54:18 -07:00
Nick Winter
45471b8030
Fix for streaming new serialized Aethers into worlds where their Thangs hadn't existed before.
2014-10-09 09:53:57 -07:00
Matt Lott
b6f37694e1
Autocomplete line endings for javascript
...
Fixes #1651
2014-10-08 14:23:13 -07:00
Nick Winter
589c3b090c
Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map.
2014-10-08 10:46:10 -07:00
Nick Winter
c6b398aae2
Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure.
2014-10-08 09:46:56 -07:00
Nick Winter
fcd174ed22
Re-enabled line-by-line highlighting through brute force for hero levels.
2014-10-07 22:28:53 -07:00
Matt Lott
1108159603
Enable updated autocomplete
...
Bug fixes for incorrect autocompletes such as “this.this.moveRight()();”
Reducing suggestions to just level snippets to make it more beginner
friendly.
2014-10-07 15:13:43 -07:00
Nick Winter
ff467d1f31
Don't play a selection sound when adding a Thang.
2014-10-07 12:04:55 -07:00
Nick Winter
5261a7d4d9
Snap to integer meters in the level editor when holding shift.
2014-10-07 10:41:16 -07:00
Nick Winter
dfdcf66f4b
A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance.
2014-10-06 17:46:22 -07:00
Scott Erickson
f00fd66bed
Fixed displaying raster image thangs in the thang editor.
2014-10-06 16:22:21 -07:00
Nick Winter
0fefd627fa
Fixed COPPA toggle.
2014-10-06 15:04:42 -07:00
Nick Winter
d6b7616f15
Updated keyboard shortcut symbols.
2014-10-06 15:04:42 -07:00
Nick Winter
31056933e9
Added volume control to world map.
2014-10-06 10:17:55 -07:00
Nick Winter
63f518e7c6
Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements.
2014-10-06 10:17:55 -07:00
Scott Erickson
3da0ea9d72
Fixed labels and marks not properly updating in the level editor.
2014-10-03 12:00:08 -07:00
Scott Erickson
e504932e5e
Added yet another fine tuning of camera movement in the level editor.
2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a
Fixed walls not updating when you edit them in the ThangsTabView.
2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db
Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at.
2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97
Couple teardown fixes.
2014-10-03 10:44:02 -07:00
Nick Winter
0c09a468c7
Fixed skipping through real-time playback to fire when the final goals are actually ready.
2014-10-02 17:49:14 -07:00
Nick Winter
3cdb8ff416
Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map.
2014-10-02 17:21:06 -07:00
Scott Erickson
ca84721921
Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed.
2014-10-02 16:54:58 -07:00
Scott Erickson
987061cec6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3
moving the level dots to fit the dungeon world map
2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259
Messing with the scaling on the dungeon map.
2014-10-02 14:05:18 -07:00
Nick Winter
285264ceb4
Skip past hero selection if hero has already been selected.
2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e
Made sure all dots are invisible by default.
2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d
Fixed a handful of bugs with the thang editor and sprite animation.
2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-02 09:28:31 -07:00
Nick Winter
2491861d76
A few tweaks for the iPad app.
2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a
Added new slot icons and dungeon map.
2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f
Unlocked all levels again until we can figure out the achievement timing problems.
2014-10-01 17:02:04 -07:00
Scott Erickson
1b1bc4e95a
Fixed adding thangs in the level editor, and moving them around.
2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9
Got the level editor mostly working again.
2014-10-01 13:26:38 -07:00
Nick Winter
8d37309de1
Several fixes for achievement recalculation.
2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3
Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle.
2014-09-30 16:18:32 -07:00
Scott Erickson
1dda6bfcfc
Layed the view framework for a new hero victory modal.
2014-09-30 16:14:47 -07:00
Scott Erickson
b3ae258bed
Fixed some issues with the thang editor.
2014-09-30 13:34:44 -07:00
Scott Erickson
8f29d0ee7f
Did some tweaking of UserView to handle slugs for ids.
2014-09-30 10:53:01 -07:00
Scott Erickson
adbfa42f25
Merge branch 'master' into feature/webgl
2014-09-30 10:27:26 -07:00
Matt Lott
136af8a0b4
Fixes for world simulation without Web Workers
...
Primarily for IE9, which is still blocked by box2d issues with these
changes.
Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.
Work in progress.
2014-09-28 23:24:18 -07:00
Scott Erickson
f081d9ed4b
Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again.
2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401
Merge branch 'master' into feature/webgl
2014-09-28 10:38:19 -07:00
Nick Winter
cf9cf6f98b
Stopped locking levels for now, since the achievements aren't quite unlocking them correctly.
2014-09-26 03:52:57 -07:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
Nick Winter
4ca7df0b32
A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet.
2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81
Completed transition to new hero levels.
2014-09-25 15:32:33 -07:00
Nick Winter
61aa2d8b6f
Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.
2014-09-25 13:29:20 -07:00
Nick Winter
2ed6b737c2
Added WorldMapView ambient sounds.
2014-09-25 11:37:29 -07:00
Scott Erickson
8fe2ed4438
Resolved conflicts.
2014-09-25 10:52:36 -07:00
Scott Erickson
06b106f42b
Merged from master.
2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef
Migrating surface to webgl. It sorta works!
2014-09-25 10:47:53 -07:00
Nick Winter
9ea24f4c74
Added a workaround for Surface resize failure on realtime playback end that Maksym had seen.
2014-09-25 09:48:14 -07:00
Nick Winter
c0c436189f
Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks.
2014-09-25 00:02:53 -07:00
Nick Winter
cce36333dd
Set letterbox during real-time playback.
2014-09-24 22:59:13 -07:00
Nick Winter
cde2acaea1
Disabled clicking spell palette entries for hero levels.
2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10
Hid flags view during real-time playback for non-flag-using levels.
2014-09-24 22:23:14 -07:00
Nick Winter
5e0b42068a
Scrubber auto-pauses when dragging from ended position.
2014-09-24 22:12:00 -07:00
Nick Winter
b2592aad8c
Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle.
2014-09-24 21:01:58 -07:00
Nick Winter
b8d59cb179
Fixed a bug with playback never quite getting to the end.
2014-09-24 20:25:30 -07:00
Nick Winter
6441a753d5
Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better.
2014-09-24 20:15:17 -07:00
Nick Winter
e48fa5f0b7
Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits.
2014-09-24 19:14:22 -07:00
Nick Winter
da83fee58f
Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values.
2014-09-24 16:58:52 -07:00
Nick Winter
73d6261b5d
Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n.
2014-09-24 16:29:28 -07:00
Nick Winter
6b6d1d3e74
Changed 'Available Spells' to 'Your Skills' in hero levels.
2014-09-24 15:48:18 -07:00
Nick Winter
53ddf0159d
Preloaded previous/next heroes in ChooseHeroView.
2014-09-24 15:39:51 -07:00
Nick Winter
a786b1e096
Changed world map to click on iPad, hover otherwise.
2014-09-24 15:21:39 -07:00
Nick Winter
ada65cc290
Lowered master volume temporarily until per-sound instance volumes are fixed.
2014-09-24 15:06:22 -07:00
Matt Lott
73e49f9972
IE11 compatibility fixes
...
Removing social share buttons from base if IE, except Facebook.
Unrolling restricted property setting loop (weird).
Updating isIE check to support IE11.
2014-09-24 12:17:13 -07:00
Nick Winter
f4cee11ebe
ThangsTabView letting you position spike walls on top of walls.
2014-09-24 12:02:45 -07:00
Driphter
db61249ac7
Added support for 'codeLanguage' when setting the 'favoriteLanguage'
2014-09-24 02:57:54 -04:00
Nick Winter
8d6b23274b
Zoom in on hero during real-time playback.
2014-09-23 22:10:18 -07:00
Nick Winter
225fd0ca18
Moved world map level info to click from hover.
2014-09-23 19:12:05 -07:00
Nick Winter
019f634d9f
Respecting coordinates setting.
2014-09-23 18:39:52 -07:00
Nick Winter
e493855578
Hiding spell tab hover docs for plan().
2014-09-23 18:32:07 -07:00
Nick Winter
c1023b137f
Better pointing out of submit button when victory is ready.
2014-09-23 18:21:27 -07:00
Nick Winter
e109cbbbdc
Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels.
2014-09-23 11:39:56 -07:00
Nick Winter
33080e5a65
Fixed #1586 .
2014-09-23 10:56:52 -07:00
Nick Winter
00e2fc99a2
Fixed some issues with the sample code.
2014-09-23 08:58:23 -07:00
Nick Winter
6a8d3082f3
Propagated i18n. Added a fallback for cast button for now until the new run button can be translated.
2014-09-23 08:08:29 -07:00
Nick Winter
f3511a5dde
Fixed another bug with loading heroes between levels.
2014-09-22 23:01:19 -07:00
Nick Winter
b0ee2224ae
Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping.
2014-09-22 22:26:09 -07:00
Nick Winter
8640369b26
Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor.
2014-09-22 21:50:48 -07:00
Nick Winter
149848c971
Fixed temporary item restrictions.
2014-09-22 20:44:45 -07:00
Nick Winter
1b4e75e7e8
Fix for earned achievement default null worths. Misc other fixes.
2014-09-22 20:15:51 -07:00
Nick Winter
786820e056
Fixed drag and drop for hero inventory.
2014-09-22 16:12:55 -07:00
Nick Winter
ec548fa33a
AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison.
2014-09-22 16:09:27 -07:00
Nick Winter
a79976e6a2
Bigass 'Stop' button in lower right during real-time playback.
2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170
Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion.
2014-09-22 14:05:13 -07:00
Nick Winter
42b52f5593
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
2014-09-21 22:10:52 -07:00
Nick Winter
6cb8a2a019
Hero always centered in camera in new hero levels when playing and not panning to drag.
2014-09-21 20:49:45 -07:00
Nick Winter
600e985259
Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected.
2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af
Showing goals on level loading view.
2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e
Press Start to begin playing levels. Fixed #1574 .
2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce
Fixed a bug with hero placeholder loading. Improved game menu modal close button usability.
2014-09-21 13:26:56 -07:00
Nick Winter
389f6fb9c1
Pre-assigning and limiting owned items based on level for now.
2014-09-21 11:24:37 -07:00
Nick Winter
e1790d5159
Restored item comparison in InventoryView, now o'ertop the hero.
2014-09-21 09:53:58 -07:00
Nick Winter
4cdff02a32
Implemented most of new inventory view.
2014-09-20 23:11:51 -07:00
Nick Winter
9f6e1e081c
Using language choice from ChooseHeroView.
2014-09-20 16:04:13 -07:00
Nick Winter
ae14bd1ced
Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564 .
2014-09-20 15:18:21 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93
Fixed a few misc bugs I noticed with the job profiles.
2014-09-19 22:16:05 -07:00
Nick Winter
ec21637adf
Showing the new hero levels instead of the old campaign levels on the /play-hero map.
2014-09-19 11:03:38 -07:00
Nick Winter
121ff0a4af
Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now.
2014-09-18 18:25:33 -07:00
Nick Winter
8042f27ba7
Added the rest of the custom TreemaNodes to the SystemsTabView as well.
2014-09-18 15:26:06 -07:00
Nick Winter
5ddbbe7707
Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting.
2014-09-18 08:12:46 -07:00
Nick Winter
689a4241d4
Final Criss-Cross tournament results.
2014-09-17 22:37:34 -07:00
Nick Winter
95e37fa3b2
Starting new front view (at /front for now) and play view (at /play-hero for now).
2014-09-17 18:56:08 -07:00
Nick Winter
d96d0d65f3
Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits.
2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9
Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs.
2014-09-16 20:19:52 -07:00
Nick Winter
a700b7844f
Added a bit of error handling for weird equipment error we were seeing.
2014-09-16 11:13:03 -07:00
Nick Winter
54f56162e9
Place Electrowalls over other walls.
2014-09-16 10:30:27 -07:00
Nick Winter
89aa930803
Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio.
2014-09-15 15:38:07 -07:00
Nick Winter
9acb3670c1
Fixed error when deleting in level editor with nothing selected.
2014-09-15 15:24:11 -07:00
Nick Winter
6176a8f6cb
Wall dragging no longer conflicts with wall clicking.
2014-09-15 15:23:09 -07:00
Nick Winter
8acaea3d6a
Drag walls to place them continuously.
2014-09-15 14:54:21 -07:00
Nick Winter
6ac56030e8
Fixed bug with systems not being addable.
2014-09-15 12:45:10 -07:00
Nick Winter
d2491dba4f
Disabled autocast even more.
2014-09-15 11:56:29 -07:00
George Saines
32ac3c1f95
updating contributor pages
2014-09-12 17:46:44 -07:00
Nick Winter
d3245948e2
Sorting addable Thangs in a sensible order.
2014-09-11 13:34:15 -07:00
Nick Winter
d5542ffbbc
Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open.
2014-09-11 11:24:06 -07:00
George Saines
11a734b001
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-11 11:08:29 -07:00
George Saines
040b901e41
removed merge junk
2014-09-11 11:08:25 -07:00
Nick Winter
9eb0dbc625
Fixed bug with creating new levels.
2014-09-11 10:50:23 -07:00
George Saines
b81288cf52
changing volume for some SFX
2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a
trying to change SFX volume
2014-09-11 09:59:50 -07:00
Nick Winter
68808d0e07
Some fixes for how audio is triggered.
2014-09-11 08:38:30 -07:00
Nick Winter
f53f6bf0a3
Misc changes, wishing I could get sounds to work at lower volumes.
2014-09-10 19:55:00 -07:00
djsmith85
19d3a6cc9f
Updated German translations (de-DE & de-AT)
...
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
2014-09-10 02:57:47 +02:00
Nick Winter
2396f9c26d
Updates to go along with latest iPad app spell palette loading.
2014-09-08 21:40:52 -07:00
Nick Winter
dd2cdf3ef9
Fixed bugs with forking ThangTypes.
2014-09-08 16:03:29 -07:00
Nick Winter
8dad2bf12d
Fixed some typo.
2014-09-08 14:26:17 -07:00
Scott Erickson
6c12384fe9
Reenabling on surface mouse moved.
2014-09-08 14:13:19 -07:00
Nick Winter
6ed89a2d79
Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView.
2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb
Fixed typo in spell palette event.
2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced
Fixed #1530 . Propagated i18n. Starting to add some more events for the iOS app.
2014-09-07 20:54:25 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Nick Winter
8de75024fc
Implemented placeholders for a bunch of sound triggers.
2014-09-05 13:04:05 -07:00
Nick Winter
d3eb7a7438
Fixed a few issues with real-time multiplayer flags.
2014-09-04 20:10:04 -07:00
Nick Winter
b698200cf0
A few minor fixes.
2014-09-04 15:14:27 -07:00
Scott Erickson
fca9a92167
Flattened the queries the NewAchievementModal creates.
2014-09-04 11:17:07 -07:00
Nick Winter
8c45e22741
Protection and logging for #1463 . Fixed an issue with spectate camera script bounds.
2014-09-04 11:04:23 -07:00
Nick Winter
35f22e0f8c
Fixed a few tome / canvas resizing bugs.
2014-09-03 18:35:14 -07:00
Scott Erickson
f519df6189
Wrapping up work on the folderized thangs treema in the level editor.
2014-09-03 16:51:09 -07:00
Nick Winter
8f38d57aaa
Merge branch 'feature/realtime-multiplayer'
2014-09-03 16:14:58 -07:00
Nick Winter
6b6c8dd683
Merged master into feature/realtime-multiplayer; looks good.
2014-09-03 16:14:33 -07:00
Scott Erickson
9439f0d47d
Some tweaks and fixes to the folderized thangs in the level editor.
2014-09-03 15:38:57 -07:00
Scott Erickson
0cc593e3ac
Thangs tab now maintains the order of thangs independently of how thangs are reorganized into folders.
2014-09-03 15:38:57 -07:00
Nick Winter
24a2373d54
Fixed editor config change event schema.
2014-09-03 13:08:09 -07:00
Scott Erickson
e1abf115f7
Folderizing thang types in the level editor.
2014-09-03 12:30:08 -07:00
Scott Erickson
975c6ad2a6
Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid.
2014-09-03 09:33:21 -07:00
Scott Erickson
1888e9ea92
Removed a log.
2014-09-03 08:44:46 -07:00
Scott Erickson
a494d1f2c4
Fixed the walls not updating when they are randomly generated.
2014-09-02 19:47:43 -07:00
Scott Erickson
9af460cf42
Fixed #330
2014-09-02 18:43:24 -07:00
Nick Winter
6eb23349d0
Center camera when level loaded in level editor.
2014-09-02 18:08:41 -07:00
Scott Erickson
621c684c74
Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly).
2014-09-02 17:53:39 -07:00
Nick Winter
23516175d4
Adding default IDs to new goals.
2014-09-02 17:28:45 -07:00
Scott Erickson
3fd9cb89ef
Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly.
2014-09-02 17:26:02 -07:00
Scott Erickson
6394482c34
Unjanking getCurrentView.
2014-09-02 17:07:28 -07:00
Scott Erickson
daca7b54f3
Refactored SystemTabView names, hid the add button in the systems tab.
2014-09-02 16:50:54 -07:00
Nick Winter
fa0f904fbb
Fixed a couple bugs with Achievements not getting schema defaults.
2014-09-02 16:48:16 -07:00
Nick Winter
b20b819a1f
Tweaked a few styles on the ThangsTabView.
2014-09-02 16:43:17 -07:00
Nick Winter
7f9ac5e573
Fixed a few bugs where default hero level type wasn't getting pulled.
2014-09-02 16:02:30 -07:00
Scott Erickson
55bac798ee
Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width.
2014-09-02 15:33:23 -07:00
Nick Winter
e02431b26b
Fixed color group saving in Thang editor.
2014-09-02 15:25:00 -07:00
Nick Winter
d8ef2f8596
Made new related achievements open in a new tab in the level editor.
2014-09-02 15:00:14 -07:00
Nick Winter
ba53cb06fe
Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System.
2014-09-02 14:16:41 -07:00
Scott Erickson
1edf3de651
Fixed double clicking sometimes firing when you're just dragging units around in the level editor.
2014-09-02 14:06:37 -07:00
Scott Erickson
7e627277e1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322
Optimized level serialization a little so that level editing is a bit less painful.
2014-09-02 12:33:34 -07:00
Scott Erickson
13b066f6aa
Fixed not being able to drag thangs around every other attempt.
2014-09-02 11:53:03 -07:00
Nick Winter
4b9bf22e22
Thang editor now sets some default Components when you change the kind of a ThangType.
2014-09-02 11:29:33 -07:00
Scott Erickson
9c841991fd
Added links to the versions modal.
2014-09-02 11:07:58 -07:00
Nick Winter
af42bafb15
Added default goals. Don't show System versions in the Systems list if they're 0.
2014-09-01 21:58:22 -07:00
Nick Winter
e615dde6e2
Show inventory view now, for hero levels.
2014-09-01 21:10:45 -07:00
Nick Winter
9094c0ce19
Add hero placeholder to terrain generator on hero levels.
2014-09-01 20:22:46 -07:00
Nick Winter
b7d9e7a095
Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs.
2014-09-01 20:07:50 -07:00
Nick Winter
6085b70dfc
Fixed a bounds offset issue in the Thang Editor colors tab.
2014-09-01 16:22:04 -07:00
Nick Winter
72eb59b7c3
Fixed a few bugs.
2014-09-01 16:14:50 -07:00
Nick Winter
195e027b53
Fix for null/undefined objects in the diffs.
2014-09-01 14:27:47 -07:00
Nick Winter
6df5ca00b2
Fixed #69 .
2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -07:00
Nick Winter
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
George Saines
495247661b
bringing contribute avatars up to speed
2014-08-31 15:21:30 -07:00
Nick Winter
ef9a983e30
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
2014-08-31 12:21:25 -07:00
Nick Winter
5f132e55ba
Fixed #1414 . Also started lazily loading certain level editor tabs.
2014-08-30 23:04:45 -07:00
Nick Winter
a284c8eb37
Fixed #1428 .
2014-08-30 21:16:01 -07:00
Nick Winter
aa54cc32d1
Fixed #1458 .
2014-08-30 20:27:58 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
George Saines
6549b4ccc0
updating the diplomat list
2014-08-30 18:51:02 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
a8644d030e
Fixed #1355 .
2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -07:00
Scott Erickson
5f11a5ecca
Selected component in the thang components edit view shows up with a blue header.
2014-08-30 09:47:23 -07:00
Scott Erickson
6f2de166c0
Removed destroying scripts, since they don't have ace editors, and it was causing a bug.
2014-08-30 09:42:13 -07:00
Nick Winter
051f1a77ae
Fixed #1152 .
2014-08-30 09:19:41 -07:00
Nick Winter
e5cf6c340b
Fixed #1140 . I just put it on the home page for now, but later we can put it somewhere where it makes sense.
2014-08-29 23:09:38 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
Nick Winter
40aa95ba16
Fixed #1297 .
2014-08-29 18:07:32 -07:00
Scott Erickson
7a9c53e424
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:04:50 -07:00
Scott Erickson
21e0889a86
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:02:29 -07:00
Nick Winter
cb14149816
Fixed #1286 . Sort of.
2014-08-29 17:52:47 -07:00
Nick Winter
63f2c5db4f
Fixed #1268 .
2014-08-29 17:33:25 -07:00
Nick Winter
5503b3a2bc
Fixed #1147 .
2014-08-29 17:03:02 -07:00
Matt Lott
8143d9c5ba
Real-time multiplayers to 'coding' after playback
2014-08-29 15:26:39 -07:00
Matt Lott
92cad5f46f
Real-time multiplayer subscription schemas
2014-08-29 15:10:04 -07:00
Nick Winter
68dcdaf223
A couple achievment/item editor error fixes.
2014-08-29 13:00:11 -07:00
Scott Erickson
434a0c071b
Few more bugs fixed for defaults.
2014-08-29 12:29:42 -07:00
Scott Erickson
f93ef2005e
Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'.
2014-08-29 11:34:32 -07:00
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Matt Lott
68cca74b43
Real-time multiplayer initial commit
...
Simple matchmaking, synchronous multiplayer PVP, flags!
Rough matchmaking is under the game menu multiplayer tab, for ladder
games only. After creating a 2-person game there, you can exit that
modal and real-time cast to play against each other.
If you’re the first person to cast, you’ll sit at the real-time level
playback view waiting until the other player casts. When they do, you
both should start the real-time playback (and start placing flags like
crazy people).
If in a multiplayer session, the real-time simulation runs the players’
code against each other. Your multiplayer opponent’s name should be up
near the level name.
Multiplayer sessions are stored completely in Firebase for now, and
removed if both players leave the game. There’s plenty of bugs,
synchronization issues, and minimal polish to add before we push it to
master.
2014-08-28 23:34:07 -07:00
Nick Winter
a4b2333fd3
Added Systems documentation. Fixed #1115 .
2014-08-28 22:32:55 -07:00
Nick Winter
124f999bc8
Fixed #1105 . Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
2014-08-28 19:39:46 -07:00
Scott Erickson
9406a8c920
Merge branch 'master' into feature/defaults
2014-08-28 17:58:58 -07:00
Nick Winter
e67b4ae064
Fixed #1090 .
2014-08-28 17:08:05 -07:00
Scott Erickson
74ca7fe0cc
Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.
2014-08-28 17:05:46 -07:00
Scott Erickson
8f95ad2787
Fixed a few bugs.
2014-08-28 15:42:46 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Nick Winter
107a727d02
Fixed a bug in the WizardSettingsModal being destroyed and still trying to do things.
2014-08-28 14:06:53 -07:00
Nick Winter
f79a2848fd
Fixed #1038 . Focus should now remain on code editor when after clicking on Surface.
2014-08-28 14:00:54 -07:00
Scott Erickson
e3bc9045d1
Couple tweaks.
2014-08-28 13:53:00 -07:00
Scott Erickson
8b056cfb8f
Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.
2014-08-28 11:24:45 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Scott Erickson
94065a0c4c
Merged conflicts.
2014-08-28 09:59:07 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239
Fixed a bug with old, un-migrated level-set-playing events in button handlers.
2014-08-28 09:52:51 -07:00
Nick Winter
a50f6b9224
Fixed a bug with reloading non-writable code.
2014-08-28 09:41:47 -07:00
Nick Winter
ec6b3d7e5f
Fixed #1481 . More Mediator schema fixes.
2014-08-28 09:27:42 -07:00
Nick Winter
28431703f5
Fixed #953 .
2014-08-27 22:23:24 -07:00
Nick Winter
02255044e3
Fixed #847 . Fixed some subscription schemas.
2014-08-27 18:43:17 -07:00
Nick Winter
2ef7bff2c5
Fixed #886 .
2014-08-27 17:54:16 -07:00
Scott Erickson
7bdfcb4313
Fixed pasting component configs into the thang component config treema.
2014-08-27 17:29:28 -07:00
Nick Winter
92b29915e2
Finished fixing #841 .
2014-08-27 17:26:56 -07:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9
Fixed #784 .
2014-08-26 17:34:00 -07:00
Nick Winter
1864cb09bc
Fixed #712 . Fixed a bug with listing files/musics in admin files view due to removed trailing slashes.
2014-08-26 15:42:33 -07:00
Scott Erickson
5d804c6d9a
Fixed merge conflict.
2014-08-26 15:41:59 -07:00
Scott Erickson
162aa7633e
Fixed the component and system settings treema, clearing out defaults for properties not being edited.
2014-08-26 15:40:51 -07:00
Nick Winter
50ad453345
Fixed #169 .
2014-08-26 14:34:23 -07:00
Scott Erickson
ab669739a6
Fixed a bug with the thang component edit view: labels of new components not showing up.
2014-08-26 14:15:21 -07:00
Nick Winter
35b107cf58
Refactored grid. Fixed #158 .
2014-08-26 13:56:57 -07:00
Scott Erickson
2f72aa4f47
Fixed adding new components in the thang components edit view.
2014-08-26 13:48:57 -07:00
Scott Erickson
39d0df5153
Fixed name ordering in the thang components editor.
2014-08-26 13:27:17 -07:00
Scott Erickson
5b5bceda3a
Components tab now incorporates components inherited from thang types.
2014-08-26 13:08:56 -07:00
Nick Winter
3e9adf6b1a
Fixed issue with IndieSprites no longer coloring properly.
2014-08-26 12:39:30 -07:00
Nick Winter
38dcb7fcef
Fixed #5 .
2014-08-26 11:29:16 -07:00
Scott Erickson
fb06e58201
Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties.
2014-08-26 10:14:36 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f
Bunch of fixes to the thang component edit view.
2014-08-26 09:48:33 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Nick Winter
51bc98665a
Removed more old editor root page bits. Like #1486 but keeping the editor titles.
2014-08-26 08:16:29 -07:00
Nick Winter
e666ee1dac
Added stop playback button and real-time countdown screen.
2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea
Bunch of fixes to get the level editor working again.
2014-08-25 20:34:46 -07:00
Nick Winter
e48b218533
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
2014-08-25 15:39:47 -07:00
Nick Winter
9df0cfb93f
A few changes to flags UX.
2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83
Merge branch 'master' into feature/defaults
2014-08-25 13:00:33 -07:00
Nick Winter
08f2ee248b
No longer constructing SpellViews for non-readable methods.
2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07
A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in.
2014-08-24 21:39:34 -07:00
Nick Winter
1a7e4554f0
Fixed a few minor bugs.
2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129
Add flag cursor and pending flags.
2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934
Fixed a couple bugs. Flags are now colored.
2014-08-24 12:33:46 -07:00
Nick Winter
be07f9cfb9
Many improvements to real-time streaming and flags.
2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc
Rudimentary flag buttons are in.
2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651
Sending flag history to the World for to make flag Thangs during simulation.
2014-08-23 17:26:56 -07:00
Scott Erickson
0721b49216
Refactoring defaults.
2014-08-23 15:51:59 -07:00
Nick Winter
2e23247521
Fixed #811 , a bug where you could pause the world if you clicked on a letterboxed playback scrubber.
2014-08-23 14:55:58 -07:00
Nick Winter
8777a87774
Made a real-time playback button.
2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669
Full-screen playback during real-time mode.
2014-08-23 13:54:52 -07:00
Scott Erickson
1c5db3f2b7
First round of getting the site to use the new defaults system, in particular the job profile view.
2014-08-23 11:07:52 -07:00
Nick Winter
9c0869e566
Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!
2014-08-22 21:35:08 -07:00
Nick Winter
ee41796b73
Fixed some wonkiness with the playback scrubbing while streaming worlds.
2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1
World streaming is getting there!
2014-08-22 14:59:32 -07:00
Scott Erickson
f15135efe1
Fixed a terrible bug.
2014-08-22 11:40:31 -07:00
Scott Erickson
e200889f0b
Initial refactoring to use the new version of Treema.
2014-08-22 11:11:05 -07:00
Nick Winter
9b31e28536
More improvements to world streaming.
2014-08-21 21:23:45 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Scott Erickson
9a116d81be
Fixed a few forms around the site to properly handle pressing enter.
2014-08-21 12:49:06 -07:00
Nick Winter
28176c7f72
Misc workarounds.
2014-08-20 13:26:48 -07:00
Nick Winter
91db8397a0
Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators.
2014-08-19 08:09:15 -07:00
Nick Winter
2c6fc67db2
Some simulation and ladder fixes. Preparing Criss-Cross tournament.
2014-08-18 21:49:58 -07:00
Scott Erickson
f8d4e42c67
Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork.
2014-08-18 15:25:45 -07:00
Nick Winter
4b88c930a4
Merge pull request #1453 from Darredevil/patch-15
...
Added new 'Minimax Tic-Tac-Toe' level
2014-08-18 14:11:15 -07:00
Darredevil
1f51eabe48
Added new 'Minimax Tic-Tac-Toe' level
2014-08-18 18:39:16 +03:00
Ruben Vereecken
48a79ad48c
New achievement modal fills in level.original query bit
2014-08-18 14:35:57 +02:00
Nick Winter
3b083e15f5
Don't require any Component default properties in hero levels, for maximum defaultability.
2014-08-15 12:27:56 -07:00
Nick Winter
5f20e6f05e
Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet.
2014-08-15 12:09:56 -07:00
Nick Winter
ba1e7005ca
Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108 . Actually, same one, but the fix eralier got undone.
2014-08-15 10:50:05 -07:00
Nick Winter
f1a9848366
Fixed a couple errors.
2014-08-15 10:27:36 -07:00
Nick Winter
4a133f6998
Added popovers to community social link logos.
2014-08-15 09:43:55 -07:00
Nick Winter
32c74db282
Merge pull request #1442 from dkundel/master
...
Fixing most of the issues described in #18
2014-08-15 09:02:15 -07:00
Ruben Vereecken
40818fd7bc
GitHub Login implemented
2014-08-15 16:20:45 +02:00
Dominik Kundel
68828b67bb
removed console.log
2014-08-15 02:04:46 +02:00
Dominik Kundel
755a86e3d3
moving some styling
2014-08-15 01:56:01 +02:00
Nick Winter
69c22db434
Moved Hero Placeholder replacement logic to Level's denormalizeThang.
2014-08-14 16:35:03 -07:00
Matt Lott
98bed57751
Merge pull request #1441 from differentmatt/master
...
Instrument user code problems
2014-08-14 16:17:47 -07:00
Nick Winter
0f983bdcf1
Crude steps towards using your hero equipment in items levels.
2014-08-14 15:12:15 -07:00
Scott Erickson
827f6ee8b8
Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way.
2014-08-14 14:04:03 -07:00
Matt Lott
9b79e2ca27
Instrument user code problems
2014-08-14 13:32:00 -07:00
Dominik Kundel
702656ad02
Merge remote-tracking branch 'upstream/master'
2014-08-14 22:30:19 +02:00
Dominik Kundel
b1252a4426
moving the popover for palette entries into the body to fix layering with popover of autocomplete
2014-08-14 22:29:57 +02:00
Nick Winter
719e64e85f
Added a quick visualization of language localization completion to the Diplomat page.
2014-08-14 11:43:40 -07:00
Nick Winter
18b0208aac
Updated i18n.
2014-08-14 10:57:57 -07:00
Scott Erickson
c31a509472
Working on the inventory view. Added a way to get the current equipment config from the inventory view.
2014-08-14 10:44:04 -07:00
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
Shrihari
0160538b44
More migrations
2014-03-24 22:28:34 +05:30
Scott Erickson
bf039ed485
Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema)
...
Select dependents when a extant component is selected.
2014-03-24 09:31:27 -07:00
Shrihari
69ee16f77f
Fixed wrong migrations
2014-03-24 21:37:09 +05:30
Nick Winter
92c87dc4ad
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
2014-03-24 08:28:48 -07:00
Ting-Kuan
e9118142db
Fix issue #662
2014-03-24 10:54:59 -04:00
Shrihari
67f5270bfc
Migrate .on, .once - Batch 1
2014-03-24 12:23:41 +05:30
Nick Winter
5852b87aa3
A little longer debounce is better.
2014-03-23 18:55:44 -07:00
Nick Winter
808762c229
Merge pull request #663 from domenukk/master
...
fixes codecombat/codecombat#655
2014-03-23 18:11:40 -07:00
Dominik Maier
f66e210c73
regarding codecombat/codecombat#655 debounce debounces.
2014-03-24 01:18:36 +01:00
Nick Winter
dbeb3d445b
Give focus back to spell view on palette click.
2014-03-23 16:48:30 -07:00
Dominik Maier
dcbd55a864
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
2014-03-24 00:47:41 +01:00
Nick Winter
656b34fc34
Fixed comment gutter icons jumping all over the place.
2014-03-23 16:00:23 -07:00
Dominik Maier
0dee3d042f
fixes codecombat/codecombat#655 completely
...
Removes asynchronous name checking, though, if it ever worked.
2014-03-23 23:04:39 +01:00
Dominik Maier
459a1f9e48
fixes codecombat/codecombat#655
2014-03-23 18:41:15 +01:00
Nick Winter
7ba959045a
A slight enhancement to #650 , plus fixing CocoModels thinking they're modified when schema defaults have been added.
2014-03-23 10:00:16 -07:00
Scott Erickson
8ca5f23749
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-23 09:30:46 -07:00
Scott Erickson
72b88a3ee9
First pass on setting up gplus friends on the ladder page.
2014-03-23 09:30:01 -07:00
dpen2000
970552a6d6
Fix "Simulating game between" line to only have one "and"
2014-03-23 13:35:24 +00:00
Nick Winter
fd2d9b6833
Merge pull request #658 from ItsLastDay/editor_tweaks
...
Added tooltip in level-editor (issue #174 )
2014-03-22 17:30:52 -07:00
Mikhail Koltsov
2316773cb1
removed Label requierment
2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46
Added labels above selected thangs in level-editor (issue #174 )
2014-03-22 23:17:15 +04:00
Nick Winter
96fe1e42f0
Merge pull request #657 from adi2412/reloadCode
...
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 22:56:41 +05:30
Nick Winter
29e7b8e5c1
Fixed mail to correctly capture the matches.
2014-03-22 09:48:36 -07:00
Michael Schmatz
5141873725
Added resimulateAllSessions method
2014-03-22 09:07:01 -07:00
Scott Erickson
0df09f7f35
Fixed an ever-reloading bug.
2014-03-21 21:11:51 -07:00
Scott Erickson
2cdfbf1c48
Merged conflicts.
2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/templates/play/ladder/ladder_tab.jade
app/views/play/ladder/ladder_tab.coffee
2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce
Added facebook friends to the ladder page.
2014-03-21 19:50:54 -07:00
Nick Winter
b91f3200c2
Merge pull request #649 from jayant1992/master
...
Fixes #641 , the list of levels in editor reloads properly upon changing ...
2014-03-21 17:46:10 -07:00
Nick Winter
e101fb04eb
For #648 : Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627 .
2014-03-21 17:42:13 -07:00
Jayant Jain
860c3a34d3
Fixes #641 , the list of levels in editor reloads properly upon changing language
2014-03-22 05:51:44 +05:30
dpen2000
a35d0cb651
Implement saving lastLevel in database re #627
2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1
Adding CLAs view.
2014-03-21 16:22:47 -07:00
dpen2000
b1b0579cb3
Save autocastDelay as a setting on User re #627
2014-03-21 22:46:14 +00:00
Ting-Kuan
0db309f526
Select dependents when a extant component is selected.
2014-03-21 12:19:47 -04:00
Nick Winter
b30bf35945
Fixed #638 , I hope.
2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40
Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks
2014-03-21 07:25:33 -07:00
Mikhail Koltsov
45b87ed38e
finally got it right
2014-03-21 13:45:56 +04:00
Mikhail Koltsov
0ece400a18
Level editor: selecting a thang now moves the scroll in existant-thang list
2014-03-21 11:54:55 +04:00
Nick Winter
424390ae84
Moved antiscroll init; disabled it for now because of bugginess.
2014-03-20 22:00:34 -07:00
Nick Winter
ca1e3742c0
Added simulation counts.
2014-03-20 15:40:02 -07:00
Scott Erickson
22555790b5
Set up a trimmed down leaderboard showing just top players and your rank.
2014-03-20 14:40:17 -07:00
Scott Erickson
dbbf9ce8b3
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
...
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
2014-03-20 11:22:23 -07:00
Nick Winter
b7e8f2ecb5
Merge pull request #605 from kvasnyk/master
...
Fix for #272 bug.
2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6
Less useless ladder refresh requests.
2014-03-19 18:26:38 -07:00
Scott Erickson
954a3ac4cb
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-19 17:11:53 -07:00
Scott Erickson
b6c9b6276c
Tweaked logging of sprite building.
2014-03-19 17:11:45 -07:00
iulianR
bfac03a73c
Rearranged play_view.cofee for consistency
2014-03-19 01:57:21 +02:00
Scott Erickson
74e068af0b
Fixed some bugs from the migration from _.cloneDeep to $.extend
2014-03-18 13:47:51 -07:00
Scott Erickson
a461a14d6e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-18 13:08:34 -07:00
Scott Erickson
37a9b7f319
Switching from the slow _.cloneDeep to the fast $.extend
2014-03-18 13:08:26 -07:00
Jayant Jain
80f53d2c6b
Adds search bar for adding thangs in level editor
2014-03-19 00:41:03 +05:30
Nick Winter
4355813d69
Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.
2014-03-18 11:26:15 -07:00
kvasnyk
5216432bf9
Fix for #272 bug.
2014-03-18 05:47:53 +01:00
Dominik Kundel
c55b608886
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/templates/play/level/modal/editor_config.jade
2014-03-17 19:39:38 +01:00
Aditya Raisinghani
b5bef94eb3
Fixed issue with video on multiplayer page modal
2014-03-17 19:52:03 +05:30
Nick Winter
6c2a78c060
Show videos in HD if possible. Use ready state on level loader.
2014-03-17 05:52:19 -07:00
Nick Winter
833c310a91
Merge pull request #579 from ItsLastDay/popover
...
Fix for issue #496
2014-03-17 04:30:57 -07:00
Mikhail Koltsov
df3739517d
fixed issue #496
2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d
Made some tips show up more rarely.
2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172
Tweaked the loading page progress bar.
2014-03-17 00:05:45 -07:00
Nick Winter
65c53a9e43
Check anonymous for clicking link.
2014-03-16 22:17:56 -07:00
Scott Erickson
dc4252a94d
Moved the tips into the level loader screen and gave them i18n.
2014-03-16 22:01:21 -07:00
Scott Erickson
5a8d1b0a2b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a
Playback is now disabled during casting. Also cleaned out some remaining hover logic.
2014-03-16 21:43:14 -07:00
Nick Winter
f02f4e77d0
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
2014-03-16 21:33:46 -07:00
Scott Erickson
e88c79681d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf
Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.
2014-03-16 21:04:36 -07:00
Nick Winter
ffb9ec2908
Merged.
2014-03-16 20:36:18 -07:00
Nick Winter
9a64fb5dac
Work on /multiplayer modal.
2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
2014-03-16 20:28:02 -07:00
Dominik Kundel
6a983dcb8c
changed name of event triggered when config is changed and introduced new event when language is changed
2014-03-17 02:14:04 +01:00
Scott Erickson
e430a6c2de
Added multiplayer launch view.
2014-03-16 17:33:57 -07:00
Scott Erickson
3fa0124d7e
Removed wizard loading code from home view, for now anyway.
2014-03-16 17:21:17 -07:00
Scott Erickson
dd8ea18186
Merge remote-tracking branch 'origin/master'
2014-03-16 17:13:18 -07:00
Scott Erickson
f23e3285cd
Fixed a bug.
2014-03-16 17:12:55 -07:00
Nick Winter
b550708113
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967
Brawlwood protectAPI on!
2014-03-16 17:07:10 -07:00
Scott Erickson
eee8fbba2c
New level page with new artwork.
2014-03-16 16:59:48 -07:00
Nick Winter
aa4f1baf73
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
2014-03-16 13:23:01 -07:00
Dominik Kundel
ce6533de59
changing ace edit mode based on setting
2014-03-15 23:14:57 +01:00
Jayant Jain
91515b1cea
Clicking a thang in the left list automatically pans to the sprite on the editor map
2014-03-16 03:11:40 +05:30
Dominik Kundel
46133ab85d
added select statement for programming language
2014-03-15 22:00:29 +01:00
Nick Winter
b210423419
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 12:31:43 -07:00
Nick Winter
ca75cc4a1a
Fixed #405 with a sledgehammer--just loading all Components before loading level editor.
2014-03-15 12:31:39 -07:00
Michael Schmatz
efba8a0654
Fixed control bar leaderboard button for #429
2014-03-15 11:34:59 -07:00
Michael Schmatz
6dcbaddbbd
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/spectate_view.coffee
2014-03-15 09:20:44 -07:00
Michael Schmatz
2c6e667bb7
Added API for queue messages count
2014-03-15 09:20:13 -07:00
honam bang
e63e787a30
Removed spaces for coding convention
2014-03-15 08:30:47 -07:00
bang honam
70f3ca8f8e
Added a line for coding convention
2014-03-15 08:30:37 -07:00
Nick Winter
7b1f8d1114
Merge pull request #547 from jayant1992/master
...
Improved panning and zooming for editor
2014-03-15 08:05:02 -07:00
Nick Winter
95cd3782a1
Oops, don't keep sending ladder updates just to me.
2014-03-15 07:45:44 -07:00
Nick Winter
8276dbf2d1
Merge branch 'loading-view'
2014-03-14 19:44:33 -07:00
Nick Winter
b2efb1bba5
More work on the loading view.
2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea
Working on new loading view design.
2014-03-14 17:06:08 -07:00
Michael Schmatz
357b73be93
Fixed bug in next game button, fixed wizard positions
2014-03-14 16:14:35 -07:00
Michael Schmatz
075ea23be9
Fixed random sessions fetching
2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-14 11:58:42 -07:00
Scott Erickson
af8008596a
Made editing thangs in the level editor not so slow by avoiding calling level.serialize.
2014-03-14 11:58:29 -07:00
Michael Schmatz
71aa6cc2c6
Added random session pair choosing
...
Due to a bug I cannot test this immediately
2014-03-14 11:30:06 -07:00
Jayant Jain
ece932595c
Enables drag-panning for editor and region chooser
2014-03-14 23:57:00 +05:30
Nick Winter
5c76ca71e3
Added configuring of behaviors to the editor config.
2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033
Fix for if aceConfig doesn't exist yet.
2014-03-14 07:46:36 -07:00
Nick Winter
c28d2bb576
Merge pull request #545 from dkundel/master
...
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
2014-03-14 07:35:11 -07:00
Nick Winter
6e9945040f
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
2014-03-13 19:20:22 -07:00
Dominik Kundel
7e955c72b8
apply config to editor
2014-03-14 02:49:58 +01:00
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07:00
Dominik Kundel
8a5aeb6227
save editor config to database
2014-03-14 02:09:11 +01:00
Nick Winter
42a8862fa9
Merge pull request #541 from dkundel/master
...
Easy use of coordinates as discussed in #10 and minor fixes
2014-03-13 18:05:04 -07:00
Dominik Kundel
6f2a04c5c0
added new editor config modal
2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32
added button to access new modal for editor config
2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b
highlight lines after insertion
2014-03-14 00:52:18 +01:00
Nick Winter
8554de7c4b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5
Fixed several bugs with Thang selection and the SpellView and HUD.
2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2
Merge branch 'master' of github.com:codecombat/codecombat
...
Conflicts:
app/views/play/spectate_view.coffee
2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c
Various changes to spectate view
2014-03-13 15:22:35 -07:00
Scott Erickson
b2e9768127
Set up a build queue for async sprite sheet building, which lessens blocking the main thread.
2014-03-13 13:25:03 -07:00
Scott Erickson
c238b49f52
Fixed initial wizard position.
2014-03-13 11:07:08 -07:00
Nick Winter
c8103154a9
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
2014-03-13 09:02:19 -07:00
Jayant Jain
c24469e86b
Minor UI updates to level editor's thang tab
2014-03-13 12:19:51 +05:30
Nick Winter
28d56f526e
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
2014-03-12 20:59:19 -07:00
Michael Schmatz
6eda2d24a5
Commented out line 133
2014-03-12 17:52:05 -07:00
Michael Schmatz
aea9e9d1a6
Spectate view is nearing completion
2014-03-12 17:51:13 -07:00
Dominik Kundel
8990b9d194
paste coordiante if click + shift
2014-03-13 01:50:59 +01:00
Nick Winter
7e16821743
Updates for /play levels list.
2014-03-12 16:41:09 -07:00
Nick Winter
ac8f12ef20
I don't think we need this template any more.
2014-03-12 16:03:32 -07:00
Nick Winter
ddea7d1531
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-12 15:44:33 -07:00
Scott Erickson
19184a88b0
Fixed showing the guide at the beginning of the level.... more.
2014-03-12 13:49:28 -07:00
Nick Winter
1ca9b2d3e5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-12 12:45:46 -07:00
Scott Erickson
ed60f5932f
Fixed showing the guide at the beginning of the level.
2014-03-12 12:44:06 -07:00
Scott Erickson
853a80dd23
Fixed loading marks so they are positioned correctly when they load and the world is paused.
2014-03-12 12:43:51 -07:00
Nick Winter
77c9217357
Better handling of refreshing ladder and matches views depending on idle state.
2014-03-12 11:39:09 -07:00
Nick Winter
49ab47e3fe
Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.
2014-03-12 10:01:31 -07:00
Nick Winter
f83fe6ce14
Fixed bugs with sprite rotation updating.
2014-03-12 09:31:45 -07:00
Nick Winter
2e354a7f11
Fixed #519 , pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.
2014-03-12 09:10:36 -07:00
Nick Winter
da762fbc4f
Merge branch 'rubenvereecken-versions_modal'
2014-03-12 08:30:02 -07:00
Nick Winter
0125c46dc2
Resolved merge conflict.
2014-03-12 08:29:42 -07:00
Ruben Vereecken
4b72ee1d04
Clean up
2014-03-12 15:43:49 +01:00
Ruben Vereecken
ddae5d0763
Added Version History to Level Components
2014-03-12 15:32:55 +01:00
Michael Schmatz
a6fb2a3994
Various changes to spectate view
2014-03-12 07:32:30 -07:00
Ruben Vereecken
2a86daaa2a
Added Version History to Thang Types
2014-03-12 15:22:15 +01:00
Prabh Simran Singh Baweja
5e964cd6cf
Update play_view.coffee
...
New Level Added : Sword Loop
2014-03-12 15:58:33 +05:30
Scott Erickson
9cb80783ff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-11 22:01:47 -07:00
Scott Erickson
8ddbb49845
Trying out promises to simplify view loading.
2014-03-11 22:01:38 -07:00
Nick Winter
b560827e32
Working on cleaning up some server errors.
2014-03-11 19:17:58 -07:00
Nick Winter
2b487eeed8
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
2014-03-11 18:30:25 -07:00
Nick Winter
40ea643f67
Merge pull request #523 from dkundel/master
...
Avoid flickering of editor when executing the script.
2014-03-11 18:07:17 -07:00
Nick Winter
8c57b31c54
Fixed a couple bugs with the matches tab.
2014-03-11 18:06:48 -07:00
Dominik Kundel
c7ca878c69
added class property that got missing
2014-03-12 01:26:11 +01:00
Nick Winter
392534878a
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
2014-03-11 16:31:39 -07:00
Dominik Kundel
714c6ddf9b
Merge remote-tracking branch 'upstream/master'
2014-03-11 23:50:51 +01:00
Dominik Kundel
4c7da1ea69
update Gutter only if changed
2014-03-11 23:47:27 +01:00
Nick Winter
852b1c97ac
Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.
2014-03-11 13:59:12 -07:00
Michael Schmatz
4062bba245
Created initial spectate level view
2014-03-11 13:12:45 -07:00
Ruben Vereecken
8709cdc472
Finished Article History
2014-03-11 19:33:27 +01:00
Nick Winter
eac219a2be
Inserted score history graph into ladder update emails.
2014-03-10 22:03:33 -07:00
Nick Winter
32baf2ae79
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
2014-03-10 21:30:46 -07:00
Nick Winter
6ce65488aa
Added simple rank history graph. Improving ladder update mail.
2014-03-10 20:22:25 -07:00
Ruben Vereecken
af73e5a594
Added a versions modal for every type
2014-03-10 23:29:34 +01:00
Ruben Vereecken
8e989ec08f
Got the level history view set up as before, but better
2014-03-10 23:17:19 +01:00
Nick Winter
c4a3b71786
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
2014-03-10 13:57:51 -07:00
Nick Winter
6055512ac7
Working on ladder updates.
2014-03-10 13:20:00 -07:00
Ruben Vereecken
68b10d9023
History now shows a loading bar upon opening
2014-03-10 20:06:36 +01:00
Nick Winter
77f7276759
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
2014-03-10 11:29:47 -07:00
Ruben Vereecken
06ae06fa34
Used mix-ins to combine Modal and VersionView
2014-03-10 19:08:53 +01:00
Nick Winter
234b3f105d
Reworked ladder game victory modal main call to action to actually submit game for ranking.
2014-03-10 10:36:28 -07:00
Nick Winter
6a71e97204
Improvements to HUD actions.
2014-03-10 09:37:05 -07:00
Ruben Vereecken
f6ece2d63e
Created a modal version of Version History
2014-03-10 12:16:08 +01:00
Nick Winter
3d71fcbc70
Wins, losses, and realizing that I'm not doing server code right.
2014-03-09 18:46:11 -07:00
Nick Winter
2d32bc1ac4
Reduced unnecessary name fetching.
2014-03-09 13:22:22 -07:00
Nick Winter
3e82e0b599
Disallow submission of non-denormalized sessions to ladders.
2014-03-09 12:53:11 -07:00
Nick Winter
34983059aa
Fixed bug with trying to show challenger modals with no hash to indicate we should.
2014-03-09 11:52:05 -07:00
Nick Winter
39c4657204
Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.
2014-03-08 15:43:56 -08:00
Nick Winter
b3964571e1
Fixed bug importing animations into existing ThangTypes that had only containers.
2014-03-08 15:04:11 -08:00
Scott Erickson
afbe2200a6
Fixed a bug with the new race condition fix. Moving the schemas to the application would be good.
2014-03-08 13:52:34 -08:00
Nick Winter
b0238d74a4
Let's just show 200 leaderboard entries for now until we have paging.
2014-03-08 11:50:10 -08:00
Nick Winter
1c44e3df1e
Fixed bug with linking to #my-matches tab.
2014-03-08 11:37:33 -08:00
Nick Winter
68099bbd7c
Victory modal for ladder games takes you back to the ladder matches.
2014-03-07 21:20:09 -08:00
Michael Schmatz
2f378106ca
Added checking level ladder status before submitting
2014-03-07 18:16:50 -08:00
Alexei Nikitin
98b36d299c
Update article model
2014-03-08 05:05:35 +04:00
Nick Winter
b6ae73ef29
Merge pull request #492 from Shrihari/issue464
...
Fixed Spell Debug View width bug
2014-03-07 16:14:57 -08:00
Scott Erickson
8fa9c9c410
Set up the level play view to show the guide on startup based on the showGuide property.
2014-03-07 15:18:56 -08:00
Scott Erickson
13b9a9cb58
Added dungeon arena tutorial to a few hardcoded places.
2014-03-07 15:16:13 -08:00
Scott Erickson
17231bce06
Added showsGuide and type properties to level.
2014-03-07 13:13:58 -08:00
Scott Erickson
be03485538
Set up the ladder play modal to be more forthright getting new players to play the tutorial.
2014-03-07 12:58:17 -08:00
Scott Erickson
d8d917ecf9
Set up better teardown for the ladder view.
2014-03-07 12:15:16 -08:00
Scott Erickson
610fc0694b
Turning off view caching by default now. Should help lower the memory footprint.
2014-03-07 11:57:15 -08:00
Shrihari
5274f22467
Fixed Spell Debug View width bug
2014-03-08 01:10:12 +05:30
Scott Erickson
d14f862359
Ladder view can now be linked to to play against a specific team.
2014-03-07 11:23:06 -08:00
Nick Winter
6e47416d24
Fixed some level IDs.
2014-03-06 19:09:15 -08:00
Michael Schmatz
45cd7e31ca
Made simulator level-independent
2014-03-06 18:48:41 -08:00
Scott Erickson
a6c4fe8d02
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
2014-03-05 20:04:14 -08:00
Nick Winter
2d69abf674
Merge pull request #481 from dkundel/master
...
Proposed UX improvement for #6
2014-03-05 13:45:14 -08:00
Dominik Kundel
a033a80722
Merge remote-tracking branch 'upstream/master'
2014-03-05 22:18:53 +01:00
Dominik Kundel
b0d571c7ad
highlight only the executing statement
2014-03-05 22:17:34 +01:00
Scott Erickson
0a8d5b5b97
Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master
2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3
Moved "Skip (esc)" next to Continue button
2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782
further changes in design of highlighting lines in code
2014-03-05 17:06:46 +01:00
Shrihari
0ec431f90a
Moved 'skip tutorial' text to locales.
2014-03-05 13:46:21 +05:30
Dominik Kundel
a0e39480e3
new UI design for executing and executed lines in ACE editor
2014-03-05 02:00:38 +01:00
Nick Winter
4556536df4
Hooked up new HUD icons.
2014-03-04 11:15:31 -08:00
Ruben Vereecken
d43ff5d217
Added an anonymous check on the Fork button
2014-03-04 11:24:38 +01:00
Nick Winter
65d9186ef1
Fixed actions showing up under dialogue bubbles on repeated toggling.
2014-03-03 16:55:36 -08:00
Nick Winter
7b25eeec47
HUD properties now flow into columns more evenly, have max styling.
2014-03-03 16:45:03 -08:00
Nick Winter
873c560a06
Added Alexandru's Bubble Sort Bootcamp Battle to /play.
2014-03-03 16:22:50 -08:00
Nick Winter
c944e78271
Ladder views now show level descvription content if present.
2014-03-03 14:59:39 -08:00
Ruben Vereecken
0aa8e7bb7d
Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet
2014-03-03 22:21:56 +01:00
Scott Erickson
d66a9d6be0
Set up a generic choose tab for root views so hash->tab behavior is baked in.
2014-03-03 13:21:05 -08:00
Nick Winter
0c45b6c0e3
Fixes for ladder refreshing.
2014-03-03 12:21:59 -08:00
Ruben Vereecken
ee920afea9
Disabled buttons for non-owners in Article Editor
2014-03-03 21:13:02 +01:00
Michael Schmatz
a5864c4f0c
Live leaderboard updating
2014-03-03 12:10:27 -08:00
Scott Erickson
fb75ad36e7
Added team icons to the ladder play view.
2014-03-03 12:04:31 -08:00
Ruben Vereecken
942b69ea9f
Created hasWriteAccess on Cocomodel, used it for level access
2014-03-03 20:41:35 +01:00
Scott Erickson
65d39e658d
Removed the old team view cruft.
2014-03-03 11:15:46 -08:00
Scott Erickson
0d054bec8e
Refactored the universal wizard loading to happen silently when you import ThangType.
2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98
Made the wizard icons colored based on user settings.
2014-03-03 10:21:51 -08:00
Scott Erickson
d3b6836a06
Fixed some bugs with the new ladder view when you haven't played before.
2014-03-03 09:20:14 -08:00
Scott Erickson
5bb56ac818
Merge branch 'feature/new-ladder-view'
2014-03-03 09:05:52 -08:00
Scott Erickson
22e80f6d24
Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.
2014-03-03 09:03:44 -08:00
Nick Winter
20fb9ba5b4
Merge pull request #461 from rubenvereecken/master
...
Localization centred patches and additions
2014-03-03 07:37:46 -08:00
Nick Winter
86fd098159
Localized WizardSprite movement hey handling to WizardSprite file.
2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af
Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat
2014-03-03 07:22:44 -08:00
Ruben Vereecken
b8b22bb739
Localized 'Create New ..' and 'Search .. Here'
2014-03-03 12:45:04 +01:00
Nick Winter
82b250b9a3
protectAPI off again for Brawlwood, too slow for now.
2014-03-02 17:51:57 -08:00
Nick Winter
a8ef87c9ea
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686
Editor tables now load i18n correctly after search.
2014-03-03 00:31:49 +01:00
Scott Erickson
956e2b3c40
Set up the my matches tab in the new ladder view.
2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668
Rearranging the ladder view.
2014-03-02 12:43:21 -08:00
Muhammed Thanish
da2ebf857a
Increase delay
2014-03-02 14:02:30 +05:30
Nick Winter
6c48660922
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
2014-03-01 16:57:29 -08:00
Muhammed Thanish
d7e031fd00
Use key.isPressed() to get movement direction
2014-03-02 03:27:06 +05:30
Muhammed Thanish
7ea9260322
Use WizardSprite
2014-03-02 01:45:49 +05:30
Nick Winter
2f130da090
HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing.
2014-03-01 11:06:44 -08:00
Muhammed Thanish
8cc8103288
Add keyboard shortcuts to move the wizard
2014-03-01 19:58:15 +05:30
Tay Yang Shun
47b37426d0
Added Level Editor page breadcrumbs.
2014-03-01 14:52:51 +08:00
Tay Yang Shun
f43dd2f3ff
Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.
2014-03-01 14:47:31 +08:00
Nick Winter
71ebe7a0aa
Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat.
2014-02-28 17:12:23 -08:00
Scott Erickson
4de425bd58
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9
Renamed hardcoded project-dotas to brawlwoods.
2014-02-28 13:59:02 -08:00
Nick Winter
b5ff264ad0
Merge pull request #441 from yangshun/level-editor-freeze
...
Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439 .
2014-02-28 12:48:56 -08:00
Nick Winter
52903cc0de
Using String and Array docs when appropriate now.
2014-02-28 12:43:31 -08:00
Nick Winter
6db8051122
Only show action timeline when 'action' is in the hudProperties.
2014-02-28 11:38:41 -08:00
Scott Erickson
d12b923eaf
Made a casting progress bar on the canvas to test vs having it shown in the cast button.
2014-02-28 11:05:41 -08:00
Tay Yang Shun
8af62d53cd
Redirect to level editor only after modal hidden event is triggered. Fixes #438 .
2014-03-01 01:55:30 +08:00
Nick Winter
aef1bc63ba
Smarter infinite loop detection vs. web-worker-is-still-loading detection.
2014-02-27 20:01:27 -08:00
Scott Erickson
df196cc531
Modals now stop the level from starting until they close.
2014-02-27 16:44:11 -08:00
Scott Erickson
7c734d6bc9
Added an async name checker for the wizard settings modal.
2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0
Improved a bunch of things with the wizard settings view.
2014-02-27 12:25:59 -08:00
Scott Erickson
f991bc3a58
Removed some vestigial wizard coloring code from the settings account view.
2014-02-27 12:02:08 -08:00
Michael Schmatz
5d2c430779
Merge pull request #435 from yangshun/editor-modal-input-focus
...
Auto-focus on the modal's input field for creation of new entities in editor.
2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e
Re-added submit form event
2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77
Merge pull request #434 from yangshun/play-button
...
Deferred saving of latest level
2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f
Merge pull request #427 from yangshun/music-button
...
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950
Added newline to end of file.
2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2
Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379
2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204
Merge branch 'master' into play-button
2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1
Trigger storage of latest level only after the level is guaranteed to be able to load
2014-02-27 14:08:25 +08:00
Scott Erickson
74186b7772
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60
Fixed uploading images for articles.
2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9
Home button on ladder level goes to ladder.
2014-02-26 18:58:25 -08:00
Nick Winter
48122000ed
Gold shows up as an int in the HUD now.
2014-02-26 18:09:09 -08:00
Nick Winter
0cf20b577d
Added a delay to the property documentation on spell debug hover.
2014-02-26 17:23:59 -08:00
Nick Winter
172242d226
Re-denormalize session if things have changed. Removed some logs.
2014-02-26 17:06:21 -08:00
Scott Erickson
0fd1c03b7f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-26 15:56:25 -08:00
Scott Erickson
ea73d91a6b
Made the docs modal larger.
2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95
Implemented espionage mode
2014-02-26 14:14:43 -08:00
Tay Yang Shun
b48a9fabc6
Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306 .
2014-02-27 02:42:25 +08:00
Scott Erickson
f89768d76d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-25 17:15:01 -08:00
Scott Erickson
02d1dc2445
Added a screen for when playback ends.
2014-02-25 17:14:39 -08:00
Nick Winter
3c5902a1d2
Trying to get session code merging to work again.
2014-02-25 14:46:48 -08:00
Nick Winter
b86c32c3e2
Merge pull request #422 from yangshun/level-not-found
...
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff
Moved internationalisation of level load error message into template file
2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a
Used internationalised strings for level not found message
2014-02-26 05:54:33 +08:00
Tay Yang Shun
8a24407d3e
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-26 04:59:35 +08:00
Scott Erickson
1b4699556a
Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily.
2014-02-25 12:39:22 -08:00
Nick Winter
a440c4dff0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522
Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards.
2014-02-25 10:48:23 -08:00
Scott Erickson
168f268d21
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f
Can now drag the mouse to move around the map.
2014-02-24 19:49:05 -08:00
Nick Winter
3472b3da97
Working on different shadow shapes. Fixed bug with palette property ownership.
2014-02-24 17:53:35 -08:00
Scott Erickson
7f738562e9
Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly.
2014-02-24 16:53:55 -08:00
Nick Winter
ab8d63f545
Improved grouping of palette properties.
2014-02-24 15:48:30 -08:00
Scott Erickson
34205a0789
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 14:58:02 -08:00
Nick Winter
32c45b80a9
Fixed performance problem with duplicate user code problem annotations.
2014-02-24 14:12:41 -08:00
Scott Erickson
e48bdfa1a7
Added your score to the ladder/team view.
2014-02-24 13:03:04 -08:00
Scott Erickson
43a49b3e6f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 12:52:43 -08:00
Scott Erickson
77f923752f
Fixed #411 .
2014-02-24 12:52:35 -08:00
Nick Winter
21975bedd2
Fixed #408 .
2014-02-24 11:21:51 -08:00
Nick Winter
10e10aa961
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69
Playback and level editor shortcut tweaks.
2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556
Finished up work on the wizard settings modal.
2014-02-24 09:46:40 -08:00
Scott Erickson
2d6dd36a68
Saturation and lightness was flipped on the spritebuilder. Fixed.
2014-02-24 09:06:22 -08:00
Nick Winter
af43f18c23
Fixed selective includeFlow.
2014-02-24 08:59:50 -08:00
Nick Winter
af965ccb93
Fixes for ThangListEntryView popover hover states.
2014-02-23 17:11:27 -08:00
Nick Winter
933bcf9e6b
Showing property documentation when hovering in code in addition to clicking on palette entries.
2014-02-23 16:34:03 -08:00
Nick Winter
68497b2cf3
Added arg names or ... for functions which take arguments in spell palette entries.
2014-02-23 13:27:02 -08:00
Nick Winter
5b88b58a75
Fixed application of a few i18n tags in wizard/picture settings.
2014-02-23 12:31:41 -08:00
Nick Winter
11f742ff0f
Included Hour of Code explanation in play footer.
2014-02-23 11:48:34 -08:00
Nick Winter
60eb0db1aa
A few fixes for IE, anonymous errors, and cast button overflow.
2014-02-23 11:23:26 -08:00
Nick Winter
0a334b310f
Merge pull request #398 from jmr0/master
...
fixing language selection disappearance when showing cached home view
2014-02-23 08:32:27 -08:00
jmr0
f00d9b2acc
changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender
2014-02-22 21:06:37 -05:00
Nick Winter
43c1240a03
Fixed cast button moving around due to anticipated errors early.
2014-02-22 18:02:58 -08:00
Nick Winter
c21952646a
Stop cast button progress overlay before cast settings gear.
2014-02-22 17:50:45 -08:00
Nick Winter
8565e3f315
Adding the button, not just the shortcut, for beautification.
2014-02-22 17:18:58 -08:00
Nick Winter
9eb8bb97f5
Trying out a Ctrl+Shift+B code beautifier option.
2014-02-22 16:58:54 -08:00
jmr0
1562b02fd1
still need this for rendering after a language switch
2014-02-22 19:32:43 -05:00
jmr0
34df232d4f
fixing language selection disappearance when showing cached home view
2014-02-22 19:32:43 -05:00
Nick Winter
b3009ae909
Fixed #7 with a nice cast-end sound (just reverse of cast sound).
2014-02-22 15:26:38 -08:00
Nick Winter
702eca5c81
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-22 12:04:10 -08:00
Nick Winter
72cfcf96ed
Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.
2014-02-22 12:01:05 -08:00
Scott Erickson
5c85f227c6
Removed the hover playback control.
2014-02-21 17:11:16 -08:00
Nick Winter
26f11f40a9
Fix for destroying level.
2014-02-20 17:21:15 -08:00
Nick Winter
4e5ecb0c9e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 17:21:03 -08:00
Scott Erickson
bf80b806c6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 17:06:25 -08:00
Scott Erickson
da0238ceba
Switched the level view to grab opponent code from submittedCode instead of code.
2014-02-20 16:53:08 -08:00
Nick Winter
06f1e284c9
Added comment highlighting icon.
2014-02-20 16:14:31 -08:00
Nick Winter
edcb7f45b6
Merge pull request #395 from tips48/master
...
Block Ctrl-S while playing
2014-02-20 15:29:16 -08:00
Scott Erickson
d9b86b84dc
Fixed a bug with the coloring of avatars in the hud.
2014-02-20 15:13:15 -08:00
Aidan Matzko
e3ab7a4d7e
Block Ctrl-S while playing
2014-02-20 18:11:20 -05:00
Nick Winter
3c651abe20
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8
Tweaks for ladder views.
2014-02-20 13:58:35 -08:00
Nick Winter
284576521f
Added fullscreen toggle to play with.
2014-02-20 13:19:49 -08:00
Scott Erickson
5cefb8fc30
Merge branch 'production'
2014-02-20 11:47:02 -08:00
Michael Schmatz
a2b811d52f
Added visual feedback for simulation buttons
2014-02-20 10:40:19 -08:00
Nick Winter
bce184b9da
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 10:39:19 -08:00
Nick Winter
f81e0c85ef
Fixes for popover behavior.
2014-02-20 10:39:16 -08:00
Michael Schmatz
cb0c22f0c9
Replaced rank button with button going to ladder page
2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f
Put more security on the session submissions and improved simulation status rendering
2014-02-20 09:44:44 -08:00
Michael Schmatz
e593fd23b4
Improved interface for simulating games
2014-02-20 08:06:14 -08:00
Nick Winter
f85a55c8b7
Cast -> Cast Spell
2014-02-19 18:20:21 -08:00
Nick Winter
7c2960f2ce
Improved visibility of cast button progress overlay.
2014-02-19 18:04:37 -08:00
Nick Winter
0469c918db
Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch.
2014-02-19 17:02:39 -08:00
Nick Winter
01374d63c4
Better comment formatting. Manual cast by default on Project DotA.
2014-02-19 14:00:54 -08:00
Scott Erickson
26af051cca
Set up indie sprites and their avatars to use the new colorConfig property.
2014-02-19 13:43:44 -08:00
Scott Erickson
613e7848dc
Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams.
2014-02-19 11:45:29 -08:00
Scott Erickson
86f94cb5fd
Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading.
2014-02-19 11:42:33 -08:00
Scott Erickson
e85f5c7e6b
Fixed modals not being able to be opened after restarting the level when no scripts are running.
2014-02-19 11:15:36 -08:00
Scott Erickson
0bf772d745
Changing the files view to replace files when there are name collisions.
2014-02-19 10:55:15 -08:00
Scott Erickson
ece08ba366
Fixed the matches order on the ladder team page.
2014-02-19 08:19:13 -08:00
Nick Winter
a8794f4e7e
Merged
2014-02-18 12:55:18 -08:00
Nick Winter
1c82fc5bb0
Fix for opponent teams not working.
2014-02-18 12:54:47 -08:00
Scott Erickson
27fb2ec37d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 12:27:56 -08:00
Scott Erickson
f383e5b9fa
Fixes for the ladder team view.
2014-02-18 12:27:10 -08:00
Nick Winter
f54fcfe6c0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:49:15 -08:00
Nick Winter
636b1bb30d
Fixed home wizard scale.
2014-02-18 11:48:36 -08:00
Scott Erickson
5a436ce10b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:41:29 -08:00
Scott Erickson
d2d2099c4a
Fixing a bug with the tome problem view.
2014-02-18 11:39:11 -08:00
Scott Erickson
cacf6539c1
Working on the ladder and team views.
2014-02-18 11:38:49 -08:00
Nick Winter
9cdc07d07c
Fixed spell palette doc duplication.
2014-02-18 11:23:01 -08:00
Nick Winter
d45f67a8c3
Fixed some popover and modal layout and bugs.
2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9
Working on the ladder and team views.
2014-02-17 17:42:41 -08:00
Nick Winter
6f0ed9040a
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
2014-02-17 17:38:49 -08:00
Nick Winter
2c41d403bc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-16 15:30:07 -08:00
Nick Winter
e3824d7698
Many improvements to the spell palette.
2014-02-16 15:30:00 -08:00
Scott Erickson
bbe5399a97
Fixed #370
2014-02-16 12:51:20 -08:00
Scott Erickson
5bbe829586
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 17:36:40 -08:00
Scott Erickson
be83b5420f
Fixed the goals view, which wasn't being properly shown.
2014-02-15 17:36:27 -08:00
Nick Winter
f3b58a9416
Merged.
2014-02-15 15:45:53 -08:00
Nick Winter
3c7cac8ba9
Trying to do some memory cleanup.
2014-02-15 15:44:45 -08:00
Scott Erickson
72712a349c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 12:07:28 -08:00
Scott Erickson
663a09ed4b
Spell list updates based on the existence of thangs now.
2014-02-15 09:22:13 -08:00
Michael Schmatz
c418e282ae
Put in pairwise simulation button
2014-02-14 16:53:37 -08:00
Nick Winter
fdf1e21e72
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 16:52:54 -08:00
Nick Winter
50f683534f
Support for seeing this.now() in spell palette.
2014-02-14 16:52:50 -08:00
Scott Erickson
597ace25cc
Fixed the spell list tab entry view popover to not popover when using the dropdown.
2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf
Fixed various bugs in simulator and put in home view
2014-02-14 15:50:42 -08:00
Scott Erickson
7faa401177
Trying to improve memory by clearing out all properties of destroyed objects.
2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084
Refactored destroy functions to have super be the last thing.
2014-02-14 10:57:47 -08:00
Scott Erickson
693fa06afb
Fixed a bug in the competitor code session setting when the player has no code yet.
2014-02-14 10:38:20 -08:00
Nick Winter
da866a418c
Fixed cast options clicking.
2014-02-13 17:43:42 -08:00
Michael Schmatz
db0695513e
Implemented reverse sorting of backbone collection
2014-02-13 17:30:59 -08:00
Michael Schmatz
6011ac0df4
Changed subscription frequency to prevent multiple score registrations
2014-02-13 17:19:43 -08:00
Michael Schmatz
ca7376b794
Worked around mongoose toObject
...
Also tried elementary memory leak fix
2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628
Set up the ladder to be able to compete against other sessions.
2014-02-13 16:42:35 -08:00
Nick Winter
9a835ffc0a
Re-enabled spell tab entry docs.
2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e
Added continuous simulation and fix for "no team"
2014-02-13 15:59:40 -08:00
Scott Erickson
8775e86161
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 15:54:01 -08:00
Scott Erickson
97b4e7661d
Level loader now loads session based on the team property in the url.
2014-02-13 15:51:41 -08:00
Scott Erickson
9327d420bc
Fixed a bug.
2014-02-13 15:51:18 -08:00
Michael Schmatz
d6e99273bc
Quick fix for team not being detected
2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba
Merged in Scott's changes manually
2014-02-13 15:14:10 -08:00
Scott Erickson
1d3e013cc6
Merge remote-tracking branch 'origin/master'
...
Conflicts:
app/views/play/ladder_view.coffee
2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156
Trimmed down the ladder view for now.
2014-02-13 15:09:40 -08:00
Michael Schmatz
480de71eb6
Leaderboard is starting to work
2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395
Scoring queues mostly working
2014-02-13 12:59:24 -08:00
Nick Winter
aa282c3a35
Updates for formatting palette docs.
2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a
Refactored scoring submissions, added beginnings of spectator view
2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b
Set up the multiplayer modal with a submit button for the ladder queue.
2014-02-13 10:16:27 -08:00
Nick Winter
9ac0939bb8
Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.
2014-02-13 09:26:21 -08:00
Nick Winter
adaedc240c
Fixed cast button click bug.
2014-02-12 20:45:29 -08:00
Nick Winter
04abe36837
Don't need that Docs import.
2014-02-12 20:36:17 -08:00
Nick Winter
8a80b9770d
More work on docs. Got rid of Docs.coffee.
2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1
Spell palette entries now using property docs from components.
2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f
Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.
2014-02-12 16:20:25 -08:00
Scott Erickson
f3489a6c2f
Added a 'stop' button for viewing end animations on thang types.
2014-02-12 16:18:25 -08:00
Nick Winter
b7be08ac19
Fixed one more leak.
2014-02-12 13:43:17 -08:00
Nick Winter
cdf268ce4f
Merged.
2014-02-12 13:10:58 -08:00
Nick Winter
5655084981
Fixed a ton more leaks.
2014-02-12 12:41:41 -08:00
Scott Erickson
2f48925e86
Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.
2014-02-12 12:27:02 -08:00
Scott Erickson
59f0d8a93e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 09:55:35 -08:00
Michael Schmatz
1a2fa68473
Merge branch 'feature/task-queue'
...
Conflicts:
app/views/play/level/tome/spell.coffee
2014-02-11 15:58:38 -08:00
Scott Erickson
71b6ebf8eb
More memory fixes.
2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e
Various changes before merge
2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1
More memory fixes.
2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2
Fixed simulation goals
2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c
Stupid casting sound effect.
2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2
More memory fixes.
2014-02-11 14:58:45 -08:00
Scott Erickson
b904e1f939
More memory fixes.
2014-02-11 14:24:06 -08:00
Michael Schmatz
a6b15663a4
Merge branch 'master' into feature/task-queue
...
Conflicts:
app/views/play/level/tome/spell.coffee
2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326
Added goal states listener
2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf
Background simulation is now showing signs of life!
2014-02-11 12:58:23 -08:00
Scott Erickson
b0a74e5b1a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb
includeFlow only on the currently selected Thang.
2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45
More memory cleanup.
2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4
Added a whole bunch of view teardown.
2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Scott Erickson
8ff38a724d
Fixing some event tearing down.
2014-02-11 11:31:02 -08:00
Michael Schmatz
612a374b3f
Progress on simulator
2014-02-11 11:27:39 -08:00
Michael Schmatz
c0d43ea32b
Merge branch 'master' into feature/task-queue
2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3
Simulation button
2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d
God prepares Workers for Angelic consumption ahead of time.
2014-02-10 17:09:19 -08:00
Michael Schmatz
cc3b93a0f8
Transfer teamSpellMap from tome to levelBus
2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-10 14:50:35 -08:00
