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 |
|
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 |
|
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 |
|