Commit graph

687 commits

Author SHA1 Message Date
Michael Schmatz
42bf2996af Made Aether ignore variable hoisting
See #813
2014-04-10 10:36:32 -07:00
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
Nick Winter
c226835ff2 Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13: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
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
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
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