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
|
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 |
|
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
|
54de8482f1
|
Spell palette now hugs the spell editor, which itself shrinks as needed.
|
2014-10-16 12:08:21 -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 |
|
Scott Erickson
|
6ff7cd12cc
|
Mostly done with the victory modal.
|
2014-10-13 11:53:08 -04: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
|
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 |
|
Nick Winter
|
31056933e9
|
Added volume control to world map.
|
2014-10-06 10:17:55 -07:00 |
|
Matt Lott
|
530da639d8
|
Removing css background-position-x usage
Not supported in Firefox or Opera.
|
2014-10-03 16:02:50 -07:00 |
|
Matt Lott
|
33055ca0b5
|
Fix IE9 world map game control button images
Fixes #1625
|
2014-10-03 15:39:33 -07:00 |
|
Matt Lott
|
49cf206be7
|
Border-image fallback for world map level buttons
|
2014-10-03 15:24:43 -07:00 |
|
Scott Erickson
|
df1c72d132
|
Fixed normalCanvas styling in the level editor.
|
2014-10-03 09:59:54 -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 |
|
Nick Winter
|
3636f3d259
|
Messing with the scaling on the dungeon map.
|
2014-10-02 14:05:18 -07:00 |
|
Nick Winter
|
16ff8c6601
|
Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.
|
2014-10-02 12:10:24 -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 |
|
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
|
0290db9cd4
|
Starting to try to get iPad to work during real-time playback.
|
2014-10-01 12:08:14 -07:00 |
|
Nick Winter
|
2611e441d7
|
Trying to standardize sass imports in an effort to test #1615, to no avail.
|
2014-09-30 16:17:54 -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
|
19e6b9d095
|
Fixed real-time placement of normal canvas, and brought the stop-real-time-playback-button on top of it.
|
2014-09-30 14:25:44 -07:00 |
|
Scott Erickson
|
6b03de0235
|
Merge branch 'master' into feature/webgl
|
2014-09-30 10:21:51 -07:00 |
|
George Saines
|
fcd943aa46
|
adding the teacher's page first draft for HoC
|
2014-09-29 11:47:40 -07:00 |
|
Scott Erickson
|
8adbd87401
|
Merge branch 'master' into feature/webgl
|
2014-09-28 10:38:19 -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 |
|
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
|
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
|
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
|
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
|
94838af17f
|
Fixed scroll bars messing up inventory view.
|
2014-09-24 09:38:45 -07:00 |
|
Nick Winter
|
225fd0ca18
|
Moved world map level info to click from hover.
|
2014-09-23 19:12:05 -07:00 |
|
Nick Winter
|
7b15ecfab2
|
Improved comment visibility.
|
2014-09-23 18:29:04 -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
|
149848c971
|
Fixed temporary item restrictions.
|
2014-09-22 20:44:45 -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
|
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
|
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
|
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
|
8e17a54dc3
|
Fixed not being able to add properties in the Systems tab Treemas.
|
2014-09-18 15:13:17 -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
|
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
|
2f07c3e8d3
|
Adding communication with iPad app.
|
2014-09-06 19:50:31 -07:00 |
|
George Saines
|
d1f6b6ef51
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-09-04 16:59:52 -07:00 |
|
George Saines
|
0beb34e3db
|
redoing the about page
|
2014-09-04 16:59:46 -07:00 |
|
Nick Winter
|
b698200cf0
|
A few minor fixes.
|
2014-09-04 15:14:27 -07:00 |
|
Scott Erickson
|
bfae70ef13
|
Added a close button to the game menu modal.
|
2014-09-04 10:03:34 -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 |
|
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
|
e1abf115f7
|
Folderizing thang types in the level editor.
|
2014-09-03 12:30:08 -07:00 |
|
Scott Erickson
|
5b57fa5c71
|
Tweaked the color selection for thang types.
|
2014-09-02 18:08:18 -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 |
|
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
|
daca7b54f3
|
Refactored SystemTabView names, hid the add button in the systems tab.
|
2014-09-02 16:50:54 -07:00 |
|
Nick Winter
|
b20b819a1f
|
Tweaked a few styles on the ThangsTabView.
|
2014-09-02 16:43:17 -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
|
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 |
|
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 |
|
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 |
|
Nick Winter
|
63f2c5db4f
|
Fixed #1268.
|
2014-08-29 17:33:25 -07:00 |
|
Scott Erickson
|
570380c2a4
|
Merge branch 'master' into feature/defaults
|
2014-08-29 08:14:43 -07:00 |
|
Nick Winter
|
a4b2333fd3
|
Added Systems documentation. Fixed #1115.
|
2014-08-28 22:32:55 -07:00 |
|
Scott Erickson
|
2dde77f8b0
|
Merge branch 'master' into feature/defaults
|
2014-08-28 15:26:04 -07:00 |
|
Nick Winter
|
1094d09aa5
|
Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode.
|
2014-08-28 11:23:52 -07:00 |
|
Nick Winter
|
54207f0f7d
|
Fixed #1000.
|
2014-08-28 10:50:20 -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
|
28431703f5
|
Fixed #953.
|
2014-08-27 22:23:24 -07:00 |
|
Nick Winter
|
2ef7bff2c5
|
Fixed #886.
|
2014-08-27 17:54:16 -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 |
|
Scott Erickson
|
5d804c6d9a
|
Fixed merge conflict.
|
2014-08-26 15:41:59 -07:00 |
|
Nick Winter
|
50ad453345
|
Fixed #169.
|
2014-08-26 14:34:23 -07:00 |
|
Scott Erickson
|
ef8ca9874a
|
For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default.
|
2014-08-26 10:28:01 -07:00 |
|
Scott Erickson
|
f92a665b8b
|
Merge conflicts.
|
2014-08-26 09:53:04 -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
|
9df0cfb93f
|
A few changes to flags UX.
|
2014-08-25 14:02:23 -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
|
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
|
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 |
|
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 |
|
Nick Winter
|
6fee881efd
|
Fixed a few more issues with playback.
|
2014-08-22 17:11:40 -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
|
def4d01c8e
|
Starting to let us control the size of the achievements popup, although much more Sass math is needed.
|
2014-08-19 19:21:36 -07:00 |
|
Scott Erickson
|
9f6bfb854d
|
Fixed the markdown treema node after changes to the ace editor node on treema broke things.
|
2014-08-18 16:04:43 -07:00 |
|
Nick Winter
|
f1a9848366
|
Fixed a couple errors.
|
2014-08-15 10:27:36 -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 |
|
Dominik Kundel
|
755a86e3d3
|
moving some styling
|
2014-08-15 01:56:01 +02: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 |
|
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 |
|
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
|
0084b64d67
|
Made some updates to the community page.
|
2014-08-13 20:45:33 -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 |
|
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 |
|
Scott Erickson
|
8fafd46b7f
|
Reined in an overzealous css rule.
|
2014-08-12 09:04:36 -07:00 |
|
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 |
|
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 |
|
Ruben Vereecken
|
672b0f54f6
|
Worked away our NotifyJS dependency - horrible lib
|
2014-08-11 14:11:26 +02:00 |
|
Nick Winter
|
0074a04cfe
|
Moved Restart into Game Menu.
|
2014-08-10 17:41:18 -07:00 |
|
Nick Winter
|
45c762fddc
|
Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n.
|
2014-08-10 17:26:30 -07:00 |
|
Nick Winter
|
fb95f48f73
|
Implemented GameMenu OptionsView.
|
2014-08-10 16:27:33 -07:00 |
|
Nick Winter
|
4dcc5bd8ee
|
Adding some options to the game menu options tab.
|
2014-08-10 15:56:45 -07:00 |
|
Scott Erickson
|
65658dec78
|
Small styling fix.
|
2014-08-10 13:07:06 -07:00 |
|
Scott Erickson
|
6cac2371c1
|
Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do.
|
2014-08-10 13:03:53 -07:00 |
|
Nick Winter
|
6b2c079ff5
|
More work on game menu skeleton.
|
2014-08-08 15:57:20 -07:00 |
|
Nick Winter
|
dc59aff9d0
|
Starting skeleton for GameMenuModal and its subviews.
|
2014-08-08 11:36:41 -07:00 |
|
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 |
|
George Saines
|
0549273d14
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-06 17:42:33 -07:00 |
|
George Saines
|
b8ea89b4a8
|
community page redesign
|
2014-08-06 17:42:19 -07:00 |
|
Nick Winter
|
4d4e321265
|
Fixed #1062. Added Item kind to level editor Thang filters.
|
2014-08-06 08:24:50 -07:00 |
|
Scott Erickson
|
eceac0bbc9
|
Hiding the randomize button overlay until #1409 is handled.
|
2014-08-05 15:06:11 -07:00 |
|
Ruben Vereecken
|
d42922871e
|
Added related achievements tab to level editor
|
2014-08-05 15:15:53 +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 |
|
Nick Winter
|
3bbdee583d
|
Better problem alert layout for alerts that include hints.
|
2014-08-04 20:16:12 -07: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 |
|
Ruben Vereecken
|
26085f9f3e
|
Added a bunch of achievements to the script. Restyled big parts.
|
2014-08-03 23:58:51 +02:00 |
|
Ruben Vereecken
|
871149b2bc
|
Rechecked and added cool stuff for achievements
|
2014-07-30 22:23:43 +02:00 |
|
Ruben Vereecken
|
d4043ac3db
|
Implemented singleplayer and multiplayer games played on profile
|
2014-07-29 20:11:45 +02:00 |
|
Ruben Vereecken
|
30a6cf1cca
|
Merged in name changes from master
|
2014-07-29 17:28:13 +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 |
|
Jayant Jain
|
69713f5603
|
Adds randomize button in case of level with no thangs
|
2014-07-26 01:55:28 +05:30 |
|
Jayant Jain
|
df554360fe
|
Updates glyphicons for undo-redo, adds placeholder text for add thangs search
|
2014-07-26 01:55:15 +05:30 |
|
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
|
86cf344f28
|
Adds preset images to preview the generated terrain
|
2014-07-25 17:50:02 +05:30 |
|
Dominik Kundel
|
5279b01483
|
fixed showing pinned popover
|
2014-07-23 17:39:16 +02:00 |
|
Dominik Kundel
|
4f6ca5335f
|
fixed spell palette sliding behind HUD
|
2014-07-23 15:50:47 +02:00 |
|
Dominik Kundel
|
72c1bb28b3
|
fixed artefact
|
2014-07-23 15:26:22 +02:00 |
|
Dominik Kundel
|
be50927fb6
|
disabled editor works again
|
2014-07-23 14:38:12 +02:00 |
|
Ruben Vereecken
|
8969311d82
|
Butons on profile page now nicer
|
2014-07-22 21:52:52 +02:00 |
|
Ruben Vereecken
|
411bb87985
|
Added contributor categories to user profile page
|
2014-07-22 12:50:56 +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
|
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
|
e43afcc0a9
|
Docs page enhancement
|
2014-07-21 02:23:01 +03: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 |
|
Nick Winter
|
2d7b6eb145
|
Updated code language logos. Added code language blurb i18n tags.
|
2014-07-17 20:12:59 -07:00 |
|
Nick Winter
|
079d336881
|
Stopped .nano from overriding Bootstrap's column width for component docs page.
|
2014-07-17 16:36:59 -07:00 |
|
Michael Schmatz
|
a9d664b8ec
|
Restored legacy candidates view
|
2014-07-17 13:16:17 -07:00 |
|
Nick Winter
|
855461a67e
|
Don't let test view interfere with normal body styles.
|
2014-07-16 16:01:37 -07:00 |
|
Ruben Vereecken
|
0288786098
|
Merge branch 'master' into achievements
|
2014-07-15 16:16:46 +02:00 |
|
Ruben Vereecken
|
c423fe989b
|
Merge branch 'navbar' into achievements
|
2014-07-15 16:16:01 +02:00 |
|
Ruben Vereecken
|
40ba28f49b
|
Basics for account and user home pages
|
2014-07-15 16:15:21 +02:00 |
|
Nick Winter
|
cfeb6c34a4
|
Merge pull request #1324 from Darredevil/master
docs page minor update
|
2014-07-14 13:23:52 -07:00 |
|
Ruben Vereecken
|
1f1ff25a5a
|
merge
|
2014-07-14 20:27:47 +02:00 |
|
Darredevil
|
c579742955
|
docs page update
|
2014-07-14 21:18:17 +03:00 |
|
Ruben Vereecken
|
a60451368e
|
Merged in master
|
2014-07-14 18:58:25 +02:00 |
|
Ruben Vereecken
|
ae4a5eb460
|
Deduplicated bootstrap include
|
2014-07-14 18:52:23 +02:00 |
|
Ruben Vereecken
|
5aa6db7696
|
Made the sass more snappy
|
2014-07-14 18:40:23 +02:00 |
|
Nick Winter
|
7446c9ee08
|
Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.
|
2014-07-14 09:38:55 -07:00 |
|
Ruben Vereecken
|
7a52c195eb
|
More user navbar styling! Also need to investigate browser reflow
|
2014-07-14 15:32:02 +02:00 |
|
Ruben Vereecken
|
1aa566e4f7
|
Layout of navbar user dropdown about finished
|
2014-07-14 14:56:44 +02:00 |
|
Ruben Vereecken
|
5f2c7665ea
|
Navbar refactored, starting to look good already.
|
2014-07-14 14:20:13 +02:00 |
|
Nick Winter
|
1a016394fe
|
Starting to show opponent code languages.
|
2014-07-13 20:19:51 -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 |
|
Ruben Vereecken
|
bd7c2d0d36
|
Bootstrappified Wizard Settings modal
|
2014-07-14 00:25:24 +02:00 |
|
Ruben Vereecken
|
9c0353a2f0
|
Merged in master
|
2014-07-13 21:18:32 +02:00 |
|
Nick Winter
|
45545796a0
|
Fixes, tweaks, and i18n for the employers page.
|
2014-07-10 19:17:51 -07:00 |
|
Michael Schmatz
|
80e7b7664e
|
Changed employer artisanal message font
|
2014-07-10 15:42:45 -07:00 |
|
Jayant Jain
|
1436a4dac7
|
Cleans up some css for terrain generator modal
|
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 |
|
Nick Winter
|
bcf3c19f81
|
Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.
|
2014-07-09 15:32:57 -07: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
|
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 |
|
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 |
|
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 |
|
Michael Schmatz
|
aa40257034
|
Table styling/ copy edit
|
2014-07-07 23:23:36 -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
|
5d00aedac7
|
Widened the click area on the wizard settings view for color config.
|
2014-07-07 18:13:19 -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 |
|
Scott Erickson
|
a2740279bc
|
Added styling for tables in the guide.
|
2014-07-06 15:00:51 -07:00 |
|
Scott Erickson
|
37a28cf826
|
Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor.
|
2014-07-06 09:35:28 -07:00 |
|
Ruben Vereecken
|
39fb2cb1b4
|
Added achievement preview, exp test, stuff
|
2014-07-04 19:27:37 +02:00 |
|
Ruben Vereecken
|
45798aab02
|
added images for achievements! Demo is now operational
|
2014-07-04 19:27:37 +02:00 |
|
Ruben Vereecken
|
a933f9737d
|
Creating achievement demo
intermediate
|
2014-07-04 19:27:37 +02:00 |
|
Michael Schmatz
|
cc917162a7
|
Fixed doober alignment
|
2014-07-03 17:01:09 -07:00 |
|
Michael Schmatz
|
d3cc9ae179
|
10 pixel margin on photos
|
2014-07-03 16:33:10 -07:00 |
|
Michael Schmatz
|
45e3da0945
|
Hover on logout button
|
2014-07-03 16:32:20 -07:00 |
|
Michael Schmatz
|
615303395c
|
Various fixes for recruiting page
|
2014-07-03 16:30:27 -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
|
ae63461ef3
|
Filter functional
|
2014-07-03 11:39:44 -07:00 |
|
Michael Schmatz
|
ed30d3292a
|
Filter button
|
2014-07-03 10:14:32 -07:00 |
|
Michael Schmatz
|
fe328a766b
|
Basic filtering functionality
Still has a few bugs
|
2014-07-02 15:48:26 -07:00 |
|
Michael Schmatz
|
7eeb964d3e
|
Restyled employers page
|
2014-07-02 11:44:45 -07:00 |
|
Michael Schmatz
|
fe08fdb2b0
|
Made new recruitment base styles
|
2014-07-02 11:43:39 -07:00 |
|
Nick Winter
|
d360ecac94
|
Merged in the language-war branch.
|
2014-06-25 23:00:03 -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 |
|
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
|
8719b80663
|
Showing expired profiles to admins.
|
2014-06-24 10:15:38 -07:00 |
|
Nick Winter
|
1e9b403ce5
|
More zazz for home page code language selection.
|
2014-06-19 14:55:16 -07:00 |
|
Nick Winter
|
666c020389
|
Switching code language based on selection now.
|
2014-06-19 13:42:25 -07:00 |
|
Nick Winter
|
a58f3e0fb6
|
More styling work on code language selector.
|
2014-06-19 12:31:56 -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 |
|
Nick Winter
|
0b8a0c8f6f
|
Added UserRemarks.
|
2014-06-17 13:03:13 -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
|
66e2805a9a
|
Added StackLead integration. Employerified profile backgrounds.
|
2014-06-14 20:59:28 -07:00 |
|
Nick Winter
|
28264d5ace
|
Added tournament results and a way to email them out.
|
2014-06-12 17:52:08 -07:00 |
|
George Saines
|
fb7b3f8580
|
adding a top info arena on top of the employers page
|
2014-06-12 16:01:34 -07:00 |
|
Ruben Vereecken
|
2a5c2020ca
|
Added recalculation button to the achievement editor
|
2014-06-12 19:41:07 +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 |
|
Nick Winter
|
77920b5416
|
Improvements to profile views. Added links to players' code.
|
2014-06-11 19:38:47 -07:00 |
|
Nick Winter
|
22ca9507d0
|
Upgrades to employer's candidate indexing.
|
2014-06-09 22:17:53 -07:00 |
|
Nick Winter
|
bb5d23e6ba
|
Wrapped LinkedIn button in a .btn.
|
2014-06-08 18:51:45 -06:00 |
|
Nick Winter
|
67b10474e8
|
Suggested improvements to profile pages.
|
2014-06-07 00:33:18 -06:00 |
|
Scott Erickson
|
49c9c6bfc9
|
Built the client test view (rebased from feature/testclient).
|
2014-06-05 16:56:29 -07: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
|
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 |
|
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 |
|
Jayant Jain
|
241adafad8
|
Adds nanoscroll for other tabs in editor
|
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 |
|
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
|
513a73c62e
|
Added grayscale filter until hover for tournament sponsor logos.
|
2014-05-19 22:07:36 -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 |
|
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
|
62ad8dd26a
|
Added a status message to the goals view.
|
2014-05-19 16:36:45 -07:00 |
|
George Saines
|
7c0d73e779
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-19 15:19:59 -07:00 |
|
George Saines
|
07177e1a89
|
putting together the prizes page
|
2014-05-19 15:19:56 -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 |
|
Nick Winter
|
3c9428ffd3
|
Refactored game ranking buttons into a LadderSubmissionView.
|
2014-05-17 11:55:51 -07:00 |
|
Scott Erickson
|
66af855497
|
Merge branch 'master' into feature/thangload
|
2014-05-13 10:27:10 -07:00 |
|
Nick Winter
|
78a0efac78
|
Fixed long words in Labels and empty GoldView.
|
2014-05-12 15:03:53 -07:00 |
|
Nick Winter
|
589410ed8e
|
Merged master into feature/thangload.
|
2014-05-09 12:56:58 -07:00 |
|
dpen2000
|
4ff1e9a3a3
|
Make components' patches tab and systems' patches tab look consistent
Mix of previous stylings with spacing at top and white background
|
2014-05-06 17:34:13 -04:00 |
|
Nick Winter
|
82529c781b
|
Fixed some ladder home links.
|
2014-05-05 15:33:08 -07:00 |
|
Nick Winter
|
b84a73cb8e
|
Don't need huge raster images full-size in the Treema.
|
2014-05-04 21:29:50 -07:00 |
|
Nick Winter
|
8fbe2dedfc
|
Propagated Wu name update.
|
2014-05-03 07:21:18 -07:00 |
|
Nick Winter
|
90bbe0bf55
|
Moved modals down a bit; watch out, not sure why they were !important before.
|
2014-05-02 19:28:08 -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 |
|
Nick Winter
|
0f33bae1f1
|
Hid level done button better. Avoiding building wizard sprite when not needed.
|
2014-05-01 14:36:26 -07:00 |
|
Nick Winter
|
f7bdb7e840
|
Upgrades for teleportation imnterpolation performance, ACE search box styling.
|
2014-05-01 10:44:17 -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 |
|
Nick Winter
|
9fb549a394
|
Fixed Guide tabs cursor.
|
2014-04-29 08:46:57 -07:00 |
|
Nick Winter
|
2d057fa81f
|
Cursor: pointer on docs modal tabs.
|
2014-04-28 19:57:59 -07:00 |
|
Scott Erickson
|
17a0bf54c6
|
Merge branch 'master' into feature/loading-views
|
2014-04-28 10:10:57 -07:00 |
|
Nick Winter
|
fc6ad1dd01
|
Properly tracking first-frame team gold. Slightly more visible team gold on hover.
|
2014-04-27 20:11:11 -07:00 |
|
Nick Winter
|
a7179ae3b2
|
Fixed some more gold view stuff.
|
2014-04-27 15:33:16 -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 |
|