Commit graph

2016 commits

Author SHA1 Message Date
Aditya Raisinghani
1c3117836f Shifted nanoscroller to vendor. 2014-04-04 00:13:09 +05:30
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
Aditya Raisinghani
deb3ddeece Longer modals are now scrollable. 2014-03-27 12:31:29 +05:30
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
Michael Schmatz
83bfc28a9e Partially refactored scoring callback pyramid of hell 2014-03-24 10:58:43 -07:00
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
Scott Erickson
6de62154bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 09:28:06 -07:00
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
Akaza Akari
3e4d7d745a Script-based movement for all CocoSprites for #140 2014-03-23 23:19:18 -07:00
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
4a47c5b517 Dead Thangs sink down a bit in the layer order. 2014-03-23 16:21:36 -07:00
Nick Winter
fcfa0d4eca Updated Glen's portrait URL in the README. 2014-03-23 16:15:30 -07:00
Nick Winter
656b34fc34 Fixed comment gutter icons jumping all over the place. 2014-03-23 16:00:23 -07:00
Glen De Cauwsemaecker
d6178aa2cc Fixed a small error 2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c Merge branch 'master' of github.com:JasperDhaene/codecombat 2014-03-24 00:45:09 +01:00
Glen De Cauwsemaecker
131b963bfb Merge github.com:codecombat/codecombat 2014-03-24 00:44:46 +01:00
Nick Winter
b922b9dd20 Increased number of matches played. 2014-03-23 15:34:38 -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
JasperDhaene
58601e95f6 finished review of nl.coffee 2014-03-23 22:54:30 +01:00
Nick Winter
9fbd008f59 Merge branch 'ItsLastDay-arrow' 2014-03-23 14:15:24 -07:00
Nick Winter
d85dd9f62c Bringing in #664, but only when maximizesArc is on. 2014-03-23 14:15:06 -07:00
Mikhail Koltsov
13338afe3d Now absolutely done scaling (#46)
also commented math's out.
2014-03-23 23:51:46 +04:00
Mikhail Koltsov
446726acc9 done rotating, looks good in Zone of Danger (#46) 2014-03-23 22:13:07 +04:00
Dominik Maier
459a1f9e48 fixes codecombat/codecombat#655 2014-03-23 18:41:15 +01:00
Nick Winter
111973e1c8 Maybe this will be better - more on #650. 2014-03-23 10:29:08 -07: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
JasperDhaene
e5d2c07ff1 general revision until line 254 2014-03-23 17:30:45 +01:00
Scott Erickson
72b88a3ee9 First pass on setting up gplus friends on the ladder page. 2014-03-23 09:30:01 -07:00
Mikhail Koltsov
edeeb3c3eb some work on arrows 2014-03-23 20:21:11 +04:00
Nick Winter
1789723d4d Merge pull request #650 from dpen2000/Issue390
Fix #390
2014-03-23 09:14:41 -07:00
Nick Winter
f8f5f718bb Merge pull request #660 from dpen2000/SimulatorTextFix
Fix "Simulating game between" line to only have one "and"
2014-03-23 09:13:20 -07:00
Nick Winter
4c1dc0d7f9 Merge pull request #661 from M-r-A/patch-2
Update ru.coffee
2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015 Merge pull request #653 from 3rr3s3v3n/patch-1
Translating Multiplayer lines
2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759 Update nl.coffee - small revisions/additions 2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307 Update ru.coffee 2014-03-23 07:30:14 -07:00
dpen2000
970552a6d6 Fix "Simulating game between" line to only have one "and" 2014-03-23 13:35:24 +00:00
3rr3s3v3n
f4de280cee Translating more Lines.
Password remains password in Italian, such as VS.
2014-03-23 11:53:39 +01:00
3rr3s3v3n
5ef6f6974f Translation actived!
I removed the # mark from the lines I've translated yesterday.
2014-03-23 11:39:35 +01: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
Nick Winter
487b2aae9b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 14:28:25 -07:00
Nick Winter
eec46dcb48 Don't try to draw a grid if it's not going to work (no lands). 2014-03-22 14:28:18 -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