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
Scott Erickson
fed5d681f2
Merge branch 'master' into feature/loading-views
2014-04-26 12:54:37 -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
Michael Schmatz
97d3b6107d
Merge feature/linkedin into master
2014-04-25 08:47:31 -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
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
Scott Erickson
84d21490ab
Fixed some treema styling.
2014-04-24 11:38:30 -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
628a784ac4
Progress towards LinkedIn integration
2014-04-23 11:25:36 -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
Scott Erickson
f57be1ae52
Migrated to the new email system, along with a setting for recruit notifications.
2014-04-21 16:15:23 -07:00
tmrdja
826a5f56db
Added responsive view for LevelEditor
2014-04-21 21:15:22 +02:00
George Saines
71ee31ef49
styling the community page
2014-04-18 13:02:07 -07:00
Nick Winter
a88089b7fc
Sass don't like that.
2014-04-18 09:54:27 -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
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
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
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
Scott Erickson
6057bd94b9
Refactored how the editor sets up its special nav through base.jade.
2014-04-17 11:27:20 -07:00
Scott Erickson
8859405e18
Reworked the nav bars in the level editor.
2014-04-17 11:02:00 -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
Scott Erickson
c395a3414e
Merge branch 'master' into feature/jsondiffpatch
2014-04-15 15:18:57 -07: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
Nick Winter
03df078d5a
Couple job profile fixes.
2014-04-15 08:39:18 -07:00
Nick Winter
8aa36178af
Fixed #769 . Added some analytics timing tracking. Added replacement for $.browser.
2014-04-13 20:31:23 -07:00
Nick Winter
7b14215339
Fixed footer background color on LevelView.
2014-04-13 16:06:47 -07: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
Nick Winter
059b5e9b66
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 23:08:26 -07:00
Nick Winter
a4284e6209
Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization.
2014-04-11 23:07:48 -07:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -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
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -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
Scott Erickson
177dd2c8cd
Set up Bootstrap 3 glyphicons.
2014-04-11 15:37:04 -07:00
Scott Erickson
bbb9fb7a64
Added a patches view.
2014-04-11 14:19:17 -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
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
a68f3efb99
Added specific job profile photo support. Improved right column design a bit.
2014-04-10 17:54:28 -07: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
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
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
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
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
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07: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
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
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
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
Michael Schmatz
9bb109dd7d
First iteration of mobile styling!
2014-04-03 15:10:24 -07:00
Aditya Raisinghani
1c3117836f
Shifted nanoscroller to vendor.
2014-04-04 00:13:09 +05:30
Michael Schmatz
75b278b333
Fixed table overflow, added wrapper for histogram
2014-04-03 09:57:35 -07:00
Michael Schmatz
3aa31c7246
Graphs with D3!
2014-04-02 18:41:11 -07:00
Aditya Raisinghani
44979c074d
Integrated nanoscroller.
2014-04-03 03:10:06 +05:30
Nick Winter
8c013c1192
Fixed 101: added level completion status to /play.
2014-03-31 15:48:22 -07:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07: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
c076bb1da8
Tweaking some styles; perhaps fixed #6 .
2014-03-27 13:15:22 -07:00
Aditya Raisinghani
deb3ddeece
Longer modals are now scrollable.
2014-03-27 12:31:29 +05:30
Scott Erickson
781b33092c
Added a google plus connect button.
2014-03-26 14:19:05 -07:00
Aditya Raisinghani
6208e8e324
Additional fixes for double scrollbars of modals.
2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9
Fixed issue with two scroll bars appearing.
2014-03-25 16:36:24 +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
Nick Winter
dbeb3d445b
Give focus back to spell view on palette click.
2014-03-23 16:48:30 -07:00
Nick Winter
5e311cdefa
Fixed css for IE warnings.
2014-03-22 10:54:35 -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
Ting-Kuan
0db309f526
Select dependents when a extant component is selected.
2014-03-21 12:19:47 -04: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
096c59b6cf
fix some assymetry
2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e
Thang editor: components tab finally looks good and does not overlay other tabs
2014-03-21 15:40:32 +04: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
Mikhail Koltsov
a6523719e4
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
...
Conflicts:
app/locale/ru.coffee
2014-03-20 09:07:11 +04:00
Nick Winter
b7e8f2ecb5
Merge pull request #605 from kvasnyk/master
...
Fix for #272 bug.
2014-03-19 18:31:20 -07:00
Mikhail Koltsov
c9a08a0b25
thang editor: added i18n binding to 'Save' button
2014-03-19 01:43:27 +04:00
Mikhail Koltsov
62a1701063
even better positioning
2014-03-19 01:26:41 +04:00
Mikhail Koltsov
1cc3e79db9
fixed thang editor appearance: components view was overlapping with tabs.
...
Now looks neat, but still unclickable.
2014-03-19 01:21:11 +04:00
Jayant Jain
80f53d2c6b
Adds search bar for adding thangs in level editor
2014-03-19 00:41:03 +05:30
kvasnyk
5216432bf9
Fix for #272 bug.
2014-03-18 05:47:53 +01:00
Nick Winter
287bf0398e
Embedded new video in multiplayer launch modal.
2014-03-17 03:18:13 -07:00
Scott Erickson
7555dce172
Tweaked the loading page progress bar.
2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f
More tweaks to the video.
2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0
Added a border to the home view video.
2014-03-16 22:46:57 -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
5cb42fa92c
Tweaked the video on the home page.
2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22
Removed the new button from the home view.
2014-03-16 17:48:16 -07:00
Scott Erickson
eee8fbba2c
New level page with new artwork.
2014-03-16 16:59:48 -07:00
Nick Winter
2e2c9459d8
Even better-looking loading background.
2014-03-15 16:06:35 -07:00
George Saines
417ff1e48d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 15:12:09 -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
George Saines
c00c7ed56b
adding the new website background images
2014-03-14 15:24: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
Dominik Kundel
0392f630cc
including i18n support for new editor config and minor styling changes
2014-03-14 03:26:53 +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
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
Jayant Jain
3c1ebc25ca
Sass changes for footer and search in editor
2014-03-13 13:30:30 +05:30
Dominik Kundel
c01d29907d
try to achieve higher contrast between background and 'executing' line
2014-03-13 03:08:28 +01:00
Dominik Kundel
60214abb41
Change cursor if moving on map with pressed 'shift'
2014-03-13 02:50:09 +01:00
Michael Schmatz
aea9e9d1a6
Spectate view is nearing completion
2014-03-12 17:51:13 -07:00
Michael Schmatz
a6fb2a3994
Various changes to spectate view
2014-03-12 07:32:30 -07:00
Dominik Kundel
dd87215012
Avoid overwriting gutter symbols of error, warning, info
2014-03-12 11:26:56 +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
Michael Schmatz
4062bba245
Created initial spectate level view
2014-03-11 13:12:45 -07:00
Nick Winter
6a71e97204
Improvements to HUD actions.
2014-03-10 09:37:05 -07: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
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
Shrihari
5274f22467
Fixed Spell Debug View width bug
2014-03-08 01:10:12 +05:30
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
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
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
Scott Erickson
619b628661
Reworked the victory modal styling a bit.
2014-03-03 16:39:56 -08:00
Scott Erickson
fb75ad36e7
Added team icons to the ladder play view.
2014-03-03 12:04:31 -08:00
Scott Erickson
65d39e658d
Removed the old team view cruft.
2014-03-03 11:15:46 -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
Karthig
b04d63d5bf
- create sass file to center 404 image on page
2014-03-03 11:42:07 -05:00
George Saines
4b6ebd6532
styled the victory modal a bit
2014-03-02 18:21:42 -08:00
Scott Erickson
d0f416f668
Rearranging the ladder view.
2014-03-02 12:43:21 -08:00
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
Nick Winter
7855ca02d8
Hit a really bad victory modal image.
2014-02-28 21:29:14 -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
ea73d91a6b
Made the docs modal larger.
2014-02-26 15:44:46 -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
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
79ce16dbba
Hiding most of the ladder page if not logged in.
2014-02-24 14:57:51 -08:00
Scott Erickson
e48bdfa1a7
Added your score to the ladder/team view.
2014-02-24 13:03:04 -08:00
Scott Erickson
953c9064f5
Fixed #407 .
2014-02-24 11:20:35 -08:00
Nick Winter
97ebe6dec8
Lightened problem info background highlight color for legibility.
2014-02-24 10:36:00 -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
4d9dd9bd36
Fixing the wizard settings modal.
2014-02-24 09:06:50 -08:00
Nick Winter
3a0ed0af9b
Still let people copy out of spell palette entries while suppressing selection color.
2014-02-23 16:49:25 -08:00
Aidan Matzko
8bef99e394
Make spell palette prettier
2014-02-23 18:10:03 -05: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
43c1240a03
Fixed cast button moving around due to anticipated errors early.
2014-02-22 18:02:58 -08:00
Nick Winter
0d9213ad44
Faded Contact link until hover.
2014-02-22 17:45:24 -08:00
Nick Winter
f88cbba262
Got rid of some unnecessary scrolling behavior on /play/level due to footer when aspect ratio is cramped.
2014-02-22 17:40:38 -08:00
Nick Winter
8565e3f315
Adding the button, not just the shortcut, for beautification.
2014-02-22 17:18:58 -08:00
Scott Erickson
90ea365dc6
Fixed the background to match the footer so that there's no white at the bottom of the screen when playing full screen.
2014-02-21 17:07:31 -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
7261f9960c
Tweaked the name column size in the ladder view.
2014-02-20 16:52:46 -08:00
Nick Winter
06f1e284c9
Added comment highlighting icon.
2014-02-20 16:14:31 -08:00
George Saines
c11e1b897f
adding comment text color
2014-02-20 15:32:40 -08:00
George Saines
10b14e3d65
adding comment color
2014-02-20 15:28:20 -08:00
Scott Erickson
eccabd2dc5
Apparently you shouldn't boldify text in ACE.
2014-02-20 15:12:57 -08:00
Scott Erickson
9c30b9f0d0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:49:17 -08:00
Scott Erickson
7ea9f8549f
Fixed some scroll bars from appearing when they shouldn't.
2014-02-20 14:45:54 -08:00
Nick Winter
67e1959341
Merge pull request #393 from daegren/master
...
Misaligned social share buttons
2014-02-20 14:42:24 -08:00
Scott Erickson
0198bd1ec5
Gave the tome popovers a bit of margin on the right so the scroll bars don't hang off the side.
2014-02-20 14:31:04 -08:00
Scott Erickson
8bbce727ee
Made the goals view a little more opaque.
2014-02-20 14:26:04 -08: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
63ef2860d6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02
Upgrading docs return value schema. Added button template for tutorial and screencast on ladder.
2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30
Merge branch 'production'
2014-02-20 11:47:02 -08:00
Scott Erickson
8184d0b9d3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:43:46 -08:00
Scott Erickson
251d483eaa
Tweaked some level view styling.
2014-02-20 11:42:19 -08:00
Nick Winter
f81e0c85ef
Fixes for popover behavior.
2014-02-20 10:39:16 -08:00
David Mills
79a3bea575
Misaligned social share buttons
2014-02-19 22:04:13 -05: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
878d1e4098
Fixed the placement of the music note in the playback view.
2014-02-19 12:27:49 -08:00
Scott Erickson
5a436ce10b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:41:29 -08:00
Scott Erickson
cacf6539c1
Working on the ladder and team views.
2014-02-18 11:38:49 -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
a4f4016c73
Updating i18n tags for new contribute summaries.
2014-02-17 12:23:06 -08:00
Andrew Wong
b1aa65833a
Consolidated text on contribute and removed padding to make the
...
page not as spread out.
Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
2014-02-17 10:24:29 -08:00
Nick Winter
c19c8f3912
Fix for LevelLoader, selection udpating, and non-documentation tome popovers.
2014-02-16 18:29:24 -08:00
Nick Winter
e3824d7698
Many improvements to the spell palette.
2014-02-16 15:30:00 -08:00
Scott Erickson
9bea226677
Fixed the ladder table.
2014-02-13 15:57:07 -08:00
Nick Winter
aa282c3a35
Updates for formatting palette docs.
2014-02-13 11:18:20 -08:00
Scott Erickson
850942b895
Fixed the chat layout.
2014-02-13 10:10:20 -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
Scott Erickson
f3489a6c2f
Added a 'stop' button for viewing end animations on thang types.
2014-02-12 16:18:25 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Nick Winter
22433b14ae
Tweaked about avatar formatting.
2014-02-08 10:30:28 -08:00
Nick Winter
2e7a1fd0ef
Working on the contribute pages -- #314 .
2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e
Starting to add contributor avatars.
2014-02-07 18:38:17 -08:00
Scott Erickson
0365998658
Began work on a ladder view.
2014-02-07 15:51:05 -08:00
Scott Erickson
6728712064
Fixed the thang components edit view in both locations now.
2014-02-05 15:39:08 -08:00
Scott Erickson
25e2895b64
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3
Improvements to how Tome subviews manage Thang updates.
2014-02-05 15:16:59 -08:00
Scott Erickson
88beb4db5f
Fixed the positioning of the thang components view in the thang editor.
2014-02-05 14:39:56 -08:00
Nick Winter
738b791683
Updated to new Aether range info, fixing error line numbers.
2014-02-03 13:58:25 -08:00
Nick Winter
068f798d58
Fixed bugs in Tome spell views swapping.
2014-02-02 10:26:42 -08:00
Nick Winter
f8f3bdd1e3
Improved error alert space usage.
2014-02-01 13:56:55 -08:00
Scott Erickson
371bd9f41c
Tweaked tab styling on level editor.
2014-01-30 15:22:01 -08:00
Scott Erickson
5f81eb670b
Some styling fixes, removed commented out stuff.
2014-01-30 14:37:33 -08:00
Nick Winter
bd45930071
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 14:22:06 -08:00
Nick Winter
7dcbbb983f
Added missing mixins and indoor wall handling.
2014-01-30 14:21:58 -08:00
Scott Erickson
210235553e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 12:19:44 -08:00
Scott Erickson
231e8582fa
Added some basic control tips to the thang components edit view.
2014-01-30 12:07:01 -08:00
Nick Winter
b09d1b1c74
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-30 12:03:35 -08:00
Nick Winter
a6bfb6770c
Matched gradient background colors in HUD to ThangAvatarView.
2014-01-30 12:03:33 -08:00
Scott Erickson
56576dd1a5
Fixed the styling for editing components in the level editor.
2014-01-30 12:01:43 -08:00
Scott Erickson
65f74e9587
Improved the navbars in the level editor.
2014-01-30 11:37:40 -08:00
Nick Winter
e0108a3166
A few fixes for the Bootstrap 3 migration. Fixed #280 .
2014-01-29 12:18:37 -08:00
Scott Erickson
065a1c4c27
New editor layout.
2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768
Merge branch 'master' into feature/bootstrap3
...
Conflicts:
app/styles/editor/level/edit.sass
Also experimenting with a new layout for the level editor.
2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299
Merge branch 'master' into feature/bootstrap3
...
Conflicts:
app/styles/editor/level/edit.sass
Also experimenting with a new layout for the level editor.
2014-01-28 12:46:17 -08:00
Scott Erickson
55ea4d86e4
Made the level editor layout more stretchy.
2014-01-28 12:27:11 -08:00
Scott Erickson
9336a637ce
Merge branch 'master' into feature/bootstrap3
2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188
Systems part of #266 .
2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1
Component part of #266 .
2014-01-27 21:06:27 -08:00
Scott Erickson
0b7224e2f4
Tweaked the home page button. #279
2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4
Fixed #281
2014-01-27 19:03:22 -08:00
Scott Erickson
43193aab4a
Removed a buggy transition.
2014-01-27 18:58:27 -08:00
Scott Erickson
a239ba3465
Removed some more .controls from forms.
2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf
More fixes for #283
2014-01-27 18:44:05 -08:00
Scott Erickson
d6e21192f5
Fixed #278
2014-01-27 16:59:34 -08:00
Scott Erickson
9c7ac3dfdc
Fixed the top nav height.
2014-01-27 16:20:13 -08:00