codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-04 21:01:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4454 commits 27 branches 0 tags 134 MiB
Commit graph

3353 commits

Author SHA1 Message Date
Scott Erickson
597ace25cc Fixed the spell list tab entry view popover to not popover when using the dropdown. 2014-02-14 16:08:01 -08:00
Scott Erickson
a25b1be916 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 15:57:54 -08:00
Michael Schmatz
63a5769bcf Fixed various bugs in simulator and put in home view 2014-02-14 15:50:42 -08:00
Scott Erickson
d55e4cd624 Made sure session objects are loaded from the server fresh, no caching. 2014-02-14 15:35:54 -08:00
Michael Schmatz
643cafc89f Refactored level handler and level session schema 2014-02-14 14:55:30 -08:00
Scott Erickson
13caae2690 Fixed the massive memory leak. 2014-02-14 14:10:55 -08:00
Scott Erickson
a8c483a59f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-14 14:10:35 -08:00
Scott Erickson
55fcad2cc3 Fixed a couple bugs with the wizard. 2014-02-14 14:10:28 -08:00
Scott Erickson
7faa401177 Trying to improve memory by clearing out all properties of destroyed objects. 2014-02-14 13:31:26 -08:00
Scott Erickson
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Michael Schmatz
7cec574e17 Started simulator refactor 2014-02-14 10:49:19 -08:00
Scott Erickson
693fa06afb Fixed a bug in the competitor code session setting when the player has no code yet. 2014-02-14 10:38:20 -08:00
Michael Schmatz
2b1079912a Merge pull request #368 from gintau/master 
Revsing Traditional Chinese translation and adding translation of "about".
 2014-02-13 21:06:57 -08:00
Nick Winter
da866a418c Fixed cast options clicking. 2014-02-13 17:43:42 -08:00
Michael Schmatz
fc76846aa6 Stopped parsing ladder as int 2014-02-13 17:34:31 -08:00
Michael Schmatz
db0695513e Implemented reverse sorting of backbone collection 2014-02-13 17:30:59 -08:00
Michael Schmatz
6011ac0df4 Changed subscription frequency to prevent multiple score registrations 2014-02-13 17:19:43 -08:00
Michael Schmatz
ca7376b794 Worked around mongoose toObject 
Also tried elementary memory leak fix
 2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e Added continuous simulation and fix for "no team" 2014-02-13 15:59:40 -08:00
Scott Erickson
9bea226677 Fixed the ladder table. 2014-02-13 15:57:07 -08:00
Scott Erickson
8775e86161 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 15:54:01 -08:00
Scott Erickson
97b4e7661d Level loader now loads session based on the team property in the url. 2014-02-13 15:51:41 -08:00
Scott Erickson
9327d420bc Fixed a bug. 2014-02-13 15:51:18 -08:00
Scott Erickson
b8051689b3 Fixed the goal manager from polluting the goals in the level with the isPositive property. 2014-02-13 15:50:53 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba Merged in Scott's changes manually 2014-02-13 15:14:10 -08:00
Scott Erickson
1d3e013cc6 Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/views/play/ladder_view.coffee
 2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156 Trimmed down the ladder view for now. 2014-02-13 15:09:40 -08:00
Michael Schmatz
480de71eb6 Leaderboard is starting to work 2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395 Scoring queues mostly working 2014-02-13 12:59:24 -08:00
Ting-Kuan
803770a080 Revise the phrasing of exisitng translations. 
Translate "about".
 2014-02-13 14:32:08 -05:00
Nick Winter
aa282c3a35 Updates for formatting palette docs. 2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a Refactored scoring submissions, added beginnings of spectator view 2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b Set up the multiplayer modal with a submit button for the ladder queue. 2014-02-13 10:16:27 -08:00
Scott Erickson
850942b895 Fixed the chat layout. 2014-02-13 10:10:20 -08:00
Scott Erickson
df2171e921 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level_view.coffee
 2014-02-13 10:04:42 -08:00
Scott Erickson
23964abee9 Set up the goal manager to only use goals from the level.goals property, rather than from scripts. 2014-02-13 09:26:42 -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
Ting-Kuan
559e0b7aa0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 09:21:49 -05:00
Ting-Kuan
ba405b8fed Revise zh-tw translations. 2014-02-13 09:21:40 -05:00
Nick Winter
adaedc240c Fixed cast button click bug. 2014-02-12 20:45:29 -08:00
Nick Winter
04abe36837 Don't need that Docs import. 2014-02-12 20:36:17 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
8176e2258f Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now. 2014-02-12 16:20:25 -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
b7be08ac19 Fixed one more leak. 2014-02-12 13:43:17 -08:00
Nick Winter
cdf268ce4f Merged. 2014-02-12 13:10:58 -08:00
Nick Winter
5655084981 Fixed a ton more leaks. 2014-02-12 12:41:41 -08:00
Scott Erickson
abedd07b04 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 12:27:12 -08:00
Scott Erickson
2f48925e86 Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values. 2014-02-12 12:27:02 -08:00
Michael Schmatz
dae788905a Merge pull request #362 from cassiocardoso/patch-1 
Finished pt-BR translation.
 2014-02-12 11:38:14 -08:00
Cassio Cardoso
32db5244b5 Finished pt-BR translation. 2014-02-12 16:15:21 -02:00
Scott Erickson
59f0d8a93e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-12 09:55:35 -08:00
Scott Erickson
533069dba8 Fixed a bug with the goals. 2014-02-12 09:55:19 -08:00
Michael Schmatz
ad8a8e00e8 Merge pull request #354 from justin-/fix/diplomat-template 
Add indentation to fix template engine output
 2014-02-12 09:09:24 -08:00
Michael Schmatz
a0b02c41fa Merge pull request #351 from liyinkan/master 
Update Chinese (simplified)
 2014-02-12 08:51:08 -08:00
Michael Schmatz
5c7a471667 Merge pull request #349 from cassiocardoso/patch-1 
Update pt-BR.coffee
 2014-02-12 08:47:30 -08:00
Scott Erickson
bdbb1710eb More memory fixes. 2014-02-11 16:09:44 -08:00
Michael Schmatz
1a2fa68473 Merge branch 'feature/task-queue' 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 15:58:38 -08:00
Scott Erickson
71b6ebf8eb More memory fixes. 2014-02-11 15:47:59 -08:00
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1 More memory fixes. 2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2 Fixed simulation goals 2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c Stupid casting sound effect. 2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2 More memory fixes. 2014-02-11 14:58:45 -08:00
Nick Winter
6505064fb6 Slightly less aggressively preload workers. 2014-02-11 14:38:47 -08:00
Scott Erickson
b904e1f939 More memory fixes. 2014-02-11 14:24:06 -08:00
Michael Schmatz
a6b15663a4 Merge branch 'master' into feature/task-queue 
Conflicts:
	app/views/play/level/tome/spell.coffee
 2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326 Added goal states listener 2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -08:00
Scott Erickson
47eeda5af4 More memory fixes. 2014-02-11 12:54:08 -08:00
Scott Erickson
7ddb97fa22 More memory fixes. 2014-02-11 12:32:12 -08:00
Scott Erickson
b0a74e5b1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb includeFlow only on the currently selected Thang. 2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45 More memory cleanup. 2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4 Added a whole bunch of view teardown. 2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c Added GoldView. 2014-02-11 12:02:27 -08:00
Scott Erickson
7ad6faa0c0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 11:31:13 -08:00
Scott Erickson
8ff38a724d Fixing some event tearing down. 2014-02-11 11:31:02 -08:00
Scott Erickson
21c93e85ed Fixed a bug with tearing down angels. 2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f Progress on simulator 2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff Typoooo 2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8 Trying a faint gold coin noise when you kill something worth money. 2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b Merge branch 'master' into feature/task-queue 2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3 Simulation button 2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d God prepares Workers for Angelic consumption ahead of time. 2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474 Added teamSpells persistence 2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8 Transfer teamSpellMap from tome to levelBus 2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a Turned off includeFlow for horrific performance reasons on project-dota for now. 2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19 Made goals for other teams invisible. 2014-02-10 12:49:38 -08:00
Scott Erickson
d95b66df0a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 12:12:49 -08:00
Scott Erickson
97d823cc48 Made the LatestVersionReferenceNode use projection results. 2014-02-10 12:12:22 -08:00
Nick Winter
26016f48e2 Skip protectAPI for now. Defer worker termination until after it reports stats. 2014-02-09 18:44:31 -08:00
justin
719dbea3bf Add indentation to fix template engine output 2014-02-09 12:31:15 -05:00
Yinkan Li
6ced32a1de update Chinese (simplified) 
update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘：’
update ‘!’ to ‘！’
 2014-02-09 16:43:13 +08:00
Cassio Cardoso
8d383bc7ea Update pt-BR.coffee 
Work in progress.
 2014-02-08 23:25:46 -02:00
Nick Winter
eb3f57ce34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-08 15:32:23 -08:00
Nick Winter
f2bcf019fa Should update code when other player changes it again. 2014-02-08 15:32:14 -08:00
Kushal
40eead0341 use https when linking to wikipedia 
Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :) 

https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/
 2014-02-08 16:31:52 -06:00
Scott Erickson
74ddb1135a Tweaked collision to make missiles not collide with one another. 2014-02-08 12:27:56 -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
Nick Winter
b2bf4db222 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-07 16:47:38 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -08:00
Michael Schmatz
73b0d98538 Merge branch 'master' into feature/task-queue 
Conflicts:
	server/commons/mapping.coffee
 2014-02-07 14:31:34 -08:00
Nick Winter
11c63d262d Merge pull request #347 from monetita/patch-1 
Update he.coffee
 2014-02-07 13:59:27 -08:00
Scott Erickson
72b1b989d8 Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at. 2014-02-07 11:49:16 -08:00
Scott Erickson
c3bd9cef80 Merge remote-tracking branch 'origin/master' 2014-02-07 11:05:43 -08:00
Nick Winter
2efb9a0ea1 Simple team switch links in multiplayer menu. 2014-02-07 10:51:21 -08:00
monetita
89f6282d50 Update he.coffee 2014-02-07 19:12:46 +02:00
Nick Winter
86de427204 Messing with team setting. 2014-02-06 17:31:08 -08:00
Scott Erickson
ee24263232 Added handling for thang type goesTo animation properties. 2014-02-06 17:00:02 -08:00
Nick Winter
2a3e47b08f Using playable team config from Alliance system. 2014-02-06 16:05:41 -08:00
Michael Schmatz
b93b5d3062 Added xavismeh to french translators 2014-02-06 14:42:56 -08:00
Michael Schmatz
7dcc351e75 Merge pull request #346 from xavismeh/i18n-fr 
Improved FR translation
 2014-02-06 14:39:42 -08:00
Nick Winter
642d88fe93 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 14:00:31 -08:00
Nick Winter
6af2d34f59 Fixed a ton of memory leaks, but not all of them. 2014-02-06 14:00:27 -08:00
Scott Erickson
1e184c9590 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 13:23:04 -08:00
Scott Erickson
6484f787c5 Tweaked layer order updating to fallback to sorting by x if y and z are the same. 2014-02-06 13:22:47 -08:00
Michael Schmatz
721ca5f9ca Credits for FR translation 
Merged in xavismeh's translation changes

Dummy credits commit
 2014-02-06 20:57:30 +01:00
Michael Schmatz
f2b4ffb123 Merged in xavismeh's translation changes 2014-02-06 11:20:59 -08:00
Nick Winter
b696a3f188 Don't count on Olark being there. 2014-02-06 11:16:57 -08:00
Scott Erickson
332ea0df2c Fixed the level editor save view knowing if the level has changes to save. 2014-02-06 10:30:49 -08:00
Scott Erickson
f3d1a43bbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 10:19:01 -08:00
Nick Winter
ea99a7b139 Turned off Olark for now. 2014-02-06 10:17:54 -08:00
Scott Erickson
9fd12b15bf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 09:29:13 -08:00
Nick Winter
847faf4d10 Possibly hooked up scaleFactorX and scaleFactorY. 2014-02-06 08:27:49 -08:00
Nick Winter
2a8d0eb694 Updates for ThangsList refreshing its Thangs. 2014-02-05 20:08:28 -08:00
Nick Winter
cc3465fd6f Improvement for errors updating action of non-existent Thangs in HUD. 2014-02-05 15:54:34 -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
7041a12244 Fixed display of actions using container in the thang editor. 2014-02-05 15:16:07 -08:00
Scott Erickson
f900009770 Actions without a container or animation to show don't show anything. 2014-02-05 14:57:05 -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
Scott Erickson
323d3570ec Fix for the dynamic programming level of project dota. 2014-02-05 13:39:41 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -08:00
Michael Schmatz
5c328d09f5 Added scoring and queue modules 2014-02-05 09:39:14 -08:00
Michael Schmatz
a3b17c7d86 Put in basic client-side routes and created server side scoring routing file 2014-02-04 10:07:14 -08:00
Scott Erickson
6533196bc7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-03 14:01:30 -08:00
Scott Erickson
81912d25d1 Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard. 2014-02-03 14:01:20 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Glen De Cauwsemaecker
e920054695 Resolved category-issues for the da.coffee language file. 2014-02-03 13:04:45 +01:00
Glen De Cauwsemaecker
0ead214584 Merge https://github.com/Einar-Rasmussen/codecombat 2014-02-03 12:59:00 +01:00
Einar Rasmussen
5d0084e95d Update da.coffee 
Rådmand -> rådgiver since counselor != chancellor
 2014-02-03 11:35:34 +00:00
Scott Erickson
09bb669439 Fixed #300 2014-02-02 16:51:22 -08:00
Einar Rasmussen
666a85e986 Update da.coffee 
Finished 'classes' + other minor edits.
 2014-02-02 20:33:54 +00:00
Nick Winter
a5065d273d More for #133. 2014-02-02 10:42:18 -08:00
Nick Winter
068f798d58 Fixed bugs in Tome spell views swapping. 2014-02-02 10:26:42 -08:00
Nick Winter
a28ce55793 Localization quote escape typo. 2014-02-02 10:17:23 -08:00
Einar Rasmussen
415b49b661 Update da.coffee 2014-02-02 12:49:24 +00:00
Daniel
517adc9314 Update es-ES.coffee 
Hi!
I have translated the remaining lines and I also have modified a few lines that had some minor grammar mistakes. All the text is translated.
Cheers!
 2014-02-02 00:31:09 +01:00
Nick Winter
f8f3bdd1e3 Improved error alert space usage. 2014-02-01 13:56:55 -08:00
Einar Rasmussen
b602691748 Merged mine and sorsjens versions. 2014-02-01 22:21:15 +01:00
Nick Winter
546914052d A few tweaks to wizard floating. 2014-02-01 11:02:20 -08:00
Nick Winter
9a1afd6772 Merge pull request #320 from vanous/cz-translation 
raw translation to czech finished
 2014-02-01 10:57:10 -08:00
vanous
d2fb1cfa11 raw translation to czech finished 
it will need fine tuning, checking within context and more
 2014-02-01 19:38:47 +01:00
Nick Winter
663c48c814 Merge pull request #319 from sorsjen/patch-1 
Update da.coffee
 2014-02-01 08:41:44 -08:00
Nick Winter
33bdce8a63 Merge branch 'locale' of git://github.com/HiroP0/codecombat into HiroP0-locale 2014-02-01 08:35:52 -08:00
Einar Rasmussen
582bb15862 Update da.coffee 
Line 173-181
 2014-02-01 16:25:50 +00:00
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08:00
sorsjen
a2e64860dd Update da.coffee 
Added translated strings
 2014-02-01 16:32:55 +01:00
Nick Winter
7ba6e5d0f2 Fixed #316. 2014-01-31 16:32:46 -08:00
Nick Winter
ee7d8a06fe A few SpellView / debugger fixes. 2014-01-31 16:16:59 -08:00
Nick Winter
632316314e Don't include flow for invisible methods, don't include protectAPI for non-writable methods. 2014-01-31 14:51:06 -08:00
Nick Winter
4d891ee7fa Fixed sprite offset positioning bug. 2014-01-31 13:28:42 -08:00
Michael Glass
1df1a2499d Extended German translation (about, minor fixes) 2014-01-31 13:16:58 -08:00
Nick Winter
8d81d75d2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-31 10:50:22 -08:00
Nick Winter
2e9386ab70 Fix for fix for #133. 2014-01-31 10:50:15 -08:00
Michael Schmatz
ce48411ddb Added worker_world.coffee 2014-01-31 10:40:01 -08:00
Nick Winter
cba7807053 Possibly handling #133. 2014-01-31 10:26:24 -08:00
Nick Winter
72a3e82404 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-31 10:21:35 -08:00
Nick Winter
6303d28554 Refactored bobbing. 2014-01-31 10:21:32 -08:00
Nick Winter
d46716eec4 Merge pull request #299 from p-buse/eventcheck-regexp 
Added Regular Expression Event Checker
 2014-01-31 07:58:13 -08:00
vanous
1758246b7b small changes 2014-01-31 09:02:18 +01:00
vanous
c88ad87332 some typo corrections 2014-01-31 09:01:03 +01:00
Nick Winter
d79d66c175 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 16:36:40 -08:00
Nick Winter
6e40fa09a6 Updated some Bootstrap event names. 2014-01-30 16:36:36 -08:00
Scott Erickson
3093b59588 Fixed #296 2014-01-30 16:25:06 -08:00
Scott Erickson
46d1d10abe Removed an unnecessary fat arrow. 2014-01-30 16:20:58 -08:00
Scott Erickson
c376ba6841 Fixed #303 2014-01-30 16:19:55 -08:00
Scott Erickson
1b75ab15db Added some error handlers for messed up thang type configs. 2014-01-30 16:17:41 -08:00
Scott Erickson
591a8e9ab5 Made the revert modal reload the page if anything was reverted. 2014-01-30 15:38:49 -08:00
Scott Erickson
6d5e9d13c9 Changed the links for artisan documentation to the new wiki pages. 2014-01-30 15:29:20 -08:00
Scott Erickson
0415e8ea4c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 15:27:24 -08:00
Scott Erickson
3ca6a5709b Fixed a bug where systems tabs would change components tabs. 2014-01-30 15:27:10 -08:00
Scott Erickson
371bd9f41c Tweaked tab styling on level editor. 2014-01-30 15:22:01 -08:00
Michael Schmatz
fe89c9fbad Fix for #290 2014-01-30 15:03:55 -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
Glen De Cauwsemaecker
eea541aa1c Merge branch 'cz-translation' of https://github.com/vanous/codecombat 2014-01-30 22:22:28 +01:00
Scott Erickson
210235553e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:19:44 -08:00
Scott Erickson
5429e8ad2a Cleaning up editors in the systems and components tabs. 2014-01-30 12:19:25 -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
827b5a3756 Fixed the world select modal. 2014-01-30 11:55:46 -08:00
vanous
0d453f2860 translated about and classes to cz 2014-01-30 20:52:24 +01:00
Scott Erickson
ed1b5c6560 Fixed slowness to editing settings for large levels. 2014-01-30 11:40:24 -08:00
Scott Erickson
65f74e9587 Improved the navbars in the level editor. 2014-01-30 11:37:40 -08:00
Paul Buser
8881a880ea Merge branch 'master' of https://github.com/codecombat/codecombat into eventcheck-regexp 2014-01-29 23:57:47 -05:00
Nick Winter
067d3abd75 Improved handling of spawning Programmables in Tome after the fact. 2014-01-29 16:26:08 -08:00
Glen De Cauwsemaecker
67e575065b quick-fix for the de.coffee locale file 2014-01-29 22:54:23 +01:00
Glen De Cauwsemaecker
94328f202e Merge branch 'locale' of https://github.com/HiroP0/codecombat 2014-01-29 22:52:33 +01:00
Glen De Cauwsemaecker
ca1bb6a1ec Merge branch 'cz-translation' of https://github.com/vanous/codecombat 2014-01-29 22:36:55 +01:00
vanous
35397a356c fixing typo, caused by web editor 2014-01-29 22:28:04 +01:00
vanous
ea458a0edc fixing typo, caused by web editor 2014-01-29 22:27:22 +01:00
vanous
bfcf5b7e39 Halfway through czech translation 2014-01-29 22:25:33 +01:00
Nick Winter
e0108a3166 A few fixes for the Bootstrap 3 migration. Fixed #280. 2014-01-29 12:18:37 -08:00
Scott Erickson
f065406cf5 Merge branch 'feature/bootstrap3' 2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d Fixed naming. 
Improved tome updating of programmable spell thangs.
 2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b Improvements to SpellDebugView hover. 2014-01-29 08:38:37 -08:00
Michael Glass
04f0aa9473 Fixed some German langues issues. Translated good deal of legals page. 2014-01-28 21:20:25 -08:00
Nick Winter
c3f5c1c334 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -08:00
vanous
58569cdd2c Misunderstood the first translation line. Fixed. 2014-01-28 22:53:55 +01:00
vanous
c8260e97ae Correcting typo 
Correcting typo causing The Travis CI build could not complete due to an error
 2014-01-28 22:48:12 +01:00
vanous
470b06d888 Initial work at czech translation 2014-01-28 22:25:58 +01: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
00872f80f9 Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang. 2014-01-28 11:54:16 -08:00
Scott Erickson
e2db421d1c Fixed cloning. 2014-01-28 09:22:23 -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
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -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
096d318e96 Fixed #283 2014-01-27 18:05:39 -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
Scott Erickson
22e6942165 Fixed account settings page. 2014-01-27 16:07:17 -08:00
Scott Erickson
056b81115d Fixed profile page. 2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab Level preview now loads from backups so that brunch reloads don't cause the preview to break. 2014-01-27 11:00:36 -08:00
Scott Erickson
36a46a07f2 Updated the names file. 2014-01-27 10:50:58 -08:00
Scott Erickson
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -08:00
Scott Erickson
8768d710ba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-27 10:06:45 -08:00
Scott Erickson
f1518a28e2 Fixed the camera when locked to never go to a new target. 2014-01-27 10:06:34 -08:00
Michael Schmatz
bf6e91883e Fixed es-ES.coffee compilation errror 2014-01-27 09:00:03 -08:00
Michael Schmatz
668ba81e78 Merge pull request #285 from DanielRodriguezRivero/patch-2 
Update es-ES.coffee
 2014-01-27 08:59:28 -08:00
Michael Schmatz
298057ae58 Merge pull request #288 from atlantisguru/patch-1 
Updated hu.coffee
 2014-01-27 08:30:22 -08:00
Scott Erickson
692b24dde0 #267 2014-01-26 15:59:33 -08:00
Scott Erickson
26e9dc3b09 Fixed system order in the level view. 2014-01-26 15:37:32 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Scott Erickson
ae2bb625c8 Refactored storage module. 2014-01-26 14:44:08 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Bubori Attila
e8c42b8d2b Updated hu.coffe 
Editor section translated to hungarian.
 2014-01-25 23:27:44 +01:00
Nick Winter
d262dfaca7 A few visual tweaks to the spell view flow. 2014-01-24 17:48:11 -08:00
Nick Winter
45329df4cd Temp fix for debugger bug on a relevant session. 2014-01-24 13:46:51 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08:00
Nick Winter
9b9df12ea0 Huge Aether performance fix; spells now scroll while debugging. 2014-01-24 08:01:00 -08:00
DanielRodriguezRivero
2acd67f658 Update es-ES.coffee 2014-01-24 13:15:17 +01:00
Scott Erickson
0727e11669 Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3 
Conflicts:
	app/templates/play/level/playback.jade
 2014-01-23 20:15:36 -08:00
Scott Erickson
9740fe0700 Reworked how sprites flip when rotated. 2014-01-23 20:08:35 -08:00
Paul Buser
e958c1293d Fixing my actual regexp checker 2014-01-23 21:57:12 -05:00
Paul Buser
30d8eb8256 Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-23 21:56:23 -05:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
70d301d1b6 How did this bug not break everything always? 2014-01-23 18:14:25 -08:00
Scott Erickson
0a34bfc7a8 Fixed a couple things with the component versions view. 2014-01-22 18:54:20 -08:00
Scott Erickson
dcaa24ffa9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 17:38:31 -08:00
Scott Erickson
4ff2abc4b0 Refactored a collection into its own file. 2014-01-22 17:38:22 -08:00
Nick Winter
af6abda7cd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 10:56:54 -08:00
Nick Winter
3b7a908dcd Handled a couple errors. 2014-01-22 10:56:49 -08:00
Paul Buser
2b7d18bbfa Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-21 21:32:17 -05:00
Scott Erickson
00a7de12c9 Fixed a selection bug. 2014-01-21 10:54:59 -08:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
GlenDC
c771936f45 Merge branch 'master' of https://github.com/ReiDuKuduro/codecombat 2014-01-21 18:07:02 +01:00
GlenDC
b2ddde96cd Merge https://github.com/codecombat/codecombat 2014-01-21 18:05:14 +01:00
Nick Winter
24c4051442 Merge branch 'feature/time-travel-debugger' 2014-01-21 09:04:09 -08:00
Nick Winter
6ea4f645f8 Added spell toolbar view. Made many time-travel debugger improvements. 2014-01-21 09:03:04 -08:00
GlenDC
c12e232ec1 Merge https://github.com/codecombat/codecombat 2014-01-21 18:01:58 +01:00
André Filipe
da94673fa5 Added some translations 2014-01-21 12:02:54 +00:00
Scott Erickson
956243818a Fixed updating the sprite sheets in the thang type editor. 2014-01-20 23:45:27 -08:00
Scott Erickson
cf0e1d305b Tweaked updateZoom. 2014-01-20 23:23:49 -08:00
Scott Erickson
68567c1366 Fixed level editor preview. 2014-01-20 23:14:34 -08:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
4b1b72627c Reenabled projecting on the search views. 2014-01-20 22:38:36 -08:00
Scott Erickson
cc8bd156ec Put back the portraits in the thang type search view. 2014-01-20 22:38:14 -08:00
Scott Erickson
2cf19a4781 Renamed canvases to spritesheets in the edit thang view. 2014-01-20 22:37:47 -08:00
Scott Erickson
514adb2159 Improved the speed of placing down thangs in levels with lots of extant thangs. 2014-01-20 21:19:54 -08:00
Scott Erickson
222fa6100b Set up the level editor to lazily load thang types. 2014-01-20 17:20:04 -08:00
Scott Erickson
5a78d92173 New graph structure for viewing path finding data. 2014-01-20 16:50:53 -08:00
Scott Erickson
c780863545 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-20 15:27:18 -08:00
Scott Erickson
7c8c2e9381 Fixed distanceSquaredToPoint 2014-01-20 15:27:03 -08:00
GlenDC
262a523458 Merge branch 'FixThangScroll' of https://github.com/phansch/codecombat 2014-01-20 23:50:19 +01:00
GlenDC
b045426740 Fixed some alignment issues caused by the update on the it.coffee file. 2014-01-20 23:48:08 +01:00
GlenDC
fad096047a Merge https://github.com/codecombat/codecombat 2014-01-20 23:35:54 +01:00
Scott Erickson
f0fbfa6cbc Added a system for viewing pathfinding. 2014-01-20 12:57:45 -08:00
Scott Erickson
7f4f268ff8 Improved the refresh rate for the color tab, and made it work with containers. 2014-01-20 12:57:29 -08:00
Scott Erickson
3dfe99045b Fixed a small bug with building sprite sheets. 2014-01-20 12:55:44 -08:00
Michael Schmatz
480b55ded9 Fixed errors in locale file 
Please compile before you commit.
 2014-01-20 07:42:32 -08:00
flauta
9f23d3c989 Update it.coffee 2014-01-20 16:10:49 +01:00
Philipp Hansch
2c6c60307b Disable body scrolling in Thang List 
This overwrites the native scrolling behavior for the
thangs-list div by manually setting the value of
@scrollTop
 2014-01-20 12:15:20 +01:00
GlenDC
34846849aa Applied locale changes to es, fa, hu 2014-01-19 23:30:22 +01:00
GlenDC
8073bb77f8 Applied locale changes to it, ms-BA, nb, no, pl, pt-BR, pt-PT 2014-01-19 23:19:09 +01:00
GlenDC
306e26d7a2 Applied locale changes to es-419, es-ES, ja, pt, ru, sk, sr, sv, th, tr, vi, zh-HANS, zh-HANT, zh 2014-01-19 23:00:21 +01:00
GlenDC
7d6548ec6c Applied locale changes to the fr.coffee file (French Language) 2014-01-19 22:03:58 +01:00
GlenDC
23ccaad916 Applied locale update to el, en-AU, en-GB, fi, he, hi, id, ko, lt, nn, ro, sl, ur 2014-01-19 21:32:31 +01:00
GlenDC
7665b043d8 Merge branch 'patch-1' of https://github.com/ferpeter/codecombat 2014-01-19 20:58:03 +01:00
GlenDC
9f98fdd98d Hotfix for cs.coffee, and did part of el.coffee 2014-01-19 20:57:53 +01:00
GlenDC
831ab1cb7a Applied big i18n tag update to ar, bg, cs, da, de, en, nl. 2014-01-19 20:49:37 +01:00
ferpeter
4ff1044169 Update hu.coffee 2014-01-19 18:56:01 +01:00
GlenDC
4186333cce Merge branch 'translation_fr2' of https://github.com/MartinDelille/codecombat 2014-01-19 18:44:25 +01:00
GlenDC
9313e5cc70 Found more tags. ar, bg and nl should have now the correct versions with the (re)moved i18n tags. 2014-01-19 18:43:55 +01:00
MartinDelille
594cbee1c8 french grammar and orthograph fix. 2014-01-19 18:25:50 +01:00
MartinDelille
5caa6870cc fix i18n tag in editor and setting template 2014-01-19 18:20:41 +01:00
Nick Winter
f87c3a37e8 More progress on debugger. 2014-01-19 09:14:42 -08:00
GlenDC
95c81e4672 Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file 2014-01-19 17:19:19 +01:00
GlenDC
6c46dc3fda Tracked down common used i18n tags and applied it already on the nl.coffee file 2014-01-19 17:00:41 +01:00
Nick Winter
0a8d64046a Starting work on time-travel debugging interface. 2014-01-19 07:08:28 -08:00
GlenDC
882302d66e Resolved issue #149 2014-01-19 15:59:33 +01:00
GlenDC
07c80f6354 Added missing i18n tags for issue #198 (now resolved) in all locale files. 2014-01-19 15:10:14 +01:00
GlenDC
464208443b Translated some more words in Dutch and also translated the newly added/shuffled words. 2014-01-19 14:59:59 +01:00
GlenDC
05d43fb63f Added/shuffled (missing) words in locale files. 2014-01-19 14:36:49 +01:00
GlenDC
abbd576b4d Added the else statement. This can be used to make pull request #253 more advanced. 2014-01-19 14:08:32 +01:00
GlenDC
1f486c3cb6 Merge branch 'feature/play-button' of https://github.com/dristic/codecombat into test 2014-01-19 14:04:26 +01:00
GlenDC
364179e140 Merge https://github.com/codecombat/codecombat 2014-01-19 14:02:38 +01:00
GlenDC
9a16f450a4 Added some missing words to the translation lists. Important for pull request #248 2014-01-19 14:02:01 +01:00
GlenDC
e082b0bd87 Merge branch 'master' of https://github.com/faabsen/codecombat 2014-01-19 13:51:28 +01:00
Fab
59b41fc042 Update de.coffee - Space fix 2014-01-19 13:07:36 +01:00
dristic
7f39693d70 Save latest level played to local storage. Change play link when latest level is available on home page. 2014-01-18 23:15:59 -08:00
Michael Schmatz
3ecaee5bce Fixed russian translations 2014-01-18 22:46:57 -08:00
GlenDC
ad7ae2236f Merge branch 'patch-2' of https://github.com/ser-storchak/codecombat 2014-01-19 04:03:36 +01:00
GlenDC
ab4e7204ad Merge branch 'master' of https://github.com/rezahb/codecombat 2014-01-19 03:59:01 +01:00
Rehb
65c734be76 Update fa.coffee 2014-01-19 01:49:15 +03:30
Fab
ea4cc848f2 German translation 
Partly translate some parts of the game
 2014-01-18 22:47:17 +01:00
ser-storchak
c9ea0540ef Update ru.coffee 2014-01-18 12:08:35 -08:00
Nick Winter
b06426c85b Merge pull request #245 from MartinDelille/translation2 
Adding more translation fixes
 2014-01-18 11:45:44 -08:00
guricchi
f0f871d8a5 Updated sr.coffee 2014-01-18 11:27:31 -08:00
Martin Delille
54234f0c9e better description for nick 2014-01-18 19:31:27 +01:00
Martin Delille
0efd7f4066 dix conjugaison 2014-01-18 19:30:54 +01:00
Martin Delille
90edce1db4 fix accent 2014-01-18 19:30:41 +01:00
Nick Winter
ea44047c04 Merge pull request #225 from ser-storchak/patch-2 
Update ru.coffee
 2014-01-18 10:14:08 -08:00
Nick Winter
15717847cd Merge pull request #243 from MartinDelille/mdTranslation 
fix french translation
 2014-01-18 10:13:38 -08:00
Nick Winter
b9ff09b709 Merged meself up some hu and tr. 2014-01-18 10:09:59 -08:00
Martin Delille
8a9859c3f5 more translation 2014-01-18 18:45:29 +01:00
Nick Winter
99a43b97e8 Merge pull request #242 from flauta/patch-1 
Update it.coffee
 2014-01-18 09:39:01 -08:00
Nick Winter
19267505e1 Merge pull request #240 from guricchi/patch-13 
Updated el.coffee
 2014-01-18 09:38:17 -08:00
Nick Winter
11c80f36f4 Merge pull request #239 from guricchi/patch-12 
Updated da.coffee
 2014-01-18 09:38:05 -08:00
Nick Winter
cd605b857b Merge pull request #238 from guricchi/patch-11 
Updated hu.coffee
 2014-01-18 09:37:41 -08:00
Nick Winter
f30340cfda Merge pull request #237 from guricchi/patch-10 
updated pl.coffee
 2014-01-18 09:37:11 -08:00
Nick Winter
1fca0322f3 Merge pull request #236 from cobaimelan/master 
new translate
 2014-01-18 09:36:54 -08:00
Nick Winter
b23609a97b Merge pull request #235 from guricchi/patch-9 
Updated tr.coffee
 2014-01-18 09:36:25 -08:00
Martin Delille
f267971207 fix french translation 2014-01-18 18:35:53 +01:00
Nick Winter
c83708526a Merge pull request #233 from guricchi/patch-7 
Updated zh-HANT.coffee
 2014-01-18 09:35:27 -08:00
Nick Winter
6b6c51ce06 Merge pull request #232 from guricchi/patch-6 
Updated zh-HANS.coffee
 2014-01-18 09:35:08 -08:00
Nick Winter
4654bd5a27 Merge pull request #231 from guricchi/patch-5 
Updated ja.coffee
 2014-01-18 09:34:17 -08:00
flauta
63f712aa8c Update it.coffee 2014-01-18 10:48:26 +01:00
csuvsaregal
c89a88848b Update hu.coffee 
I've made some corrections. Later I'll do some new translations. 

csuvasregal - Sárosi Gergely
 2014-01-18 01:07:19 +01:00
guricchi
c6629e4e48 Updated el.coffee 2014-01-17 12:32:22 -08:00
guricchi
b71c5cd1ef Updated da.coffee 2014-01-17 12:09:23 -08:00
guricchi
7d8d6ed24f Updated hu.coffee 2014-01-17 11:55:14 -08:00
guricchi
c97d67515b updated pl.coffee 2014-01-17 11:45:40 -08:00
cobaimelan
93fc7be44d new translate 2014-01-17 21:42:51 +02:00
guricchi
9bf08b9d20 Updated tr.coffee 2014-01-17 11:08:35 -08:00
guricchi
1c018b0cac Updated zh-HANT.coffee 2014-01-17 11:01:17 -08:00
guricchi
70a3503097 Updated zh-HANS.coffee 2014-01-17 10:51:18 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
guricchi
4cbfd846f4 Updated ja.coffee 2014-01-17 10:37:04 -08:00
Michael Schmatz
91c1b62375 Merge pull request #229 from guricchi/patch-3 
Updated es-ES.coffee
 2014-01-17 10:28:12 -08:00
Michael Schmatz
db96bbaf9a Merge pull request #228 from guricchi/patch-2 
Updated es-419.coffee
 2014-01-17 10:27:57 -08:00
guricchi
3e040d9d30 Updated es-ES.coffee 2014-01-17 10:21:33 -08:00
guricchi
d4fec100de Updated es-419.coffee 2014-01-17 10:17:23 -08:00
guricchi
f898c8d57c Updated pt-PT.coffee 2014-01-17 10:07:38 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Volkan Gezer
f072030198 Updated Turkish translation 
Updated Turkish translation
 2014-01-17 17:23:27 +01:00
ser-storchak
bace74d6ad Update ru.coffee 2014-01-17 00:45:17 -08:00
Nick Winter
053927eaec Fixed home page wizard scale. 2014-01-16 16:27:34 -08:00
Nick Winter
5267febd8f Couple fixes for small errors when running with no Programmables. 2014-01-16 14:29:57 -08:00
Michael Schmatz
389fa9a30b Merge pull request #220 from Elfisen/patch-2 
spelling and grammar mistakes - fr.coffee
 2014-01-16 14:26:10 -08:00
GlenDC
553ad833ed Merge https://github.com/codecombat/codecombat 2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2 Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable. 2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60 Hotfix for previous commit, forgot to uncommit some stuff 2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f Resolved issue #160 2014-01-16 22:18:38 +01:00
Allisson
580a439fab spelling and grammar mistakes - fr.coffee 
Just a correction of what really hurt the eye
 2014-01-16 21:15:39 +01:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -08:00
Michael Schmatz
d0f1510623 Merge branch 'pr/197' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:46:56 -08:00
Michael Schmatz
6e43daa98a Revert "Merge branch 'pr/190'" 
This reverts commit 457accf729, reversing
changes made to 9df9f75f64.
 2014-01-16 10:40:05 -08:00
Michael Schmatz
457accf729 Merge branch 'pr/190' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:33:00 -08:00
Michael Schmatz
9df9f75f64 Merge branch 'pr/200' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:24:55 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
 2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Scott Erickson
ba01101ae0 Cleanup from the system tracked properties refactoring. 2014-01-16 10:04:52 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading 
Also using the level:session-will-save callback
 2014-01-16 17:13:14 +01:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Nick Winter
84e268a88c Removed some logs. 2014-01-15 19:03:10 -08:00
Scott Erickson
f230e8983c Fixed the level preview view. 2014-01-15 18:37:47 -08:00
Michael Schmatz
6bc3924af0 Merge pull request #208 from kengos/update_ja_coffee 
Update ja.coffee
 2014-01-15 15:58:53 -08:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master 
Issue #30 is resolved + Added Dutch Translations + Hotfixes
 2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
GlenDC
556149f756 Resolved issue #162 2014-01-16 00:08:35 +01:00
Nick Winter
172d97ed83 Fixed #87 I hope; at least, dramatically reduced memory leakage. 2014-01-15 13:04:48 -08:00
Michael Schmatz
236c323b43 Merge pull request #194 from brunoporto/patch-1 
Update pt-BR.coffee
 2014-01-15 12:53:15 -08:00
Michael Schmatz
f9970f0ddb Merge pull request #203 from jaybi/patch-1 
Update fr.coffee
 2014-01-15 12:03:22 -08:00
Michael Schmatz
6d20d34048 Merge pull request #204 from rezahb/patch-3 
Update fa.coffee
 2014-01-15 12:00:50 -08:00
Michael Schmatz
0e40c8b20a Removed comma from diplomats template 2014-01-15 11:59:34 -08:00
Michael Schmatz
5c3ce7459c Merge pull request #192 from rezahb/patch-2 
Update diplomat.jade
 2014-01-15 11:59:00 -08:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator 
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
 2014-01-15 20:58:39 +01:00
kengos
8e6271854d Update ja.coffee 2014-01-16 00:06:38 +09:00
Rehb
ac86e08902 Update fa.coffee 2014-01-15 18:19:43 +03:30
GlenDC
6e5cf30c29 Hotfix for 2 url i18n tags. The Category wasn't prefixed. 2014-01-15 14:49:17 +01:00
GlenDC
8acc4d7071 Translated 1/3 of the Contribute web page as well. + Added a missing tag to the nl.coffee document. 2014-01-15 14:45:18 +01:00
GlenDC
72cb62f607 Translated the Legal page completly in Dutch. (nl.coffee) 2014-01-15 13:48:24 +01:00
jaybi
99f8343df4 Update fr.coffee 
edited by jaybi
 2014-01-15 12:32:09 +01:00
GlenDC
8f5e80d101 Translated most of the Dutch version. (It's my native language) 2014-01-15 03:39:20 +01:00
GlenDC
eba0665616 Hotfix for issue #30 2014-01-15 03:38:33 +01:00
Thomas Triboult
e713fe828f Translation of new elements 2014-01-15 02:36:39 +01:00
GlenDC
c14c55e382 Applied fix for issue #198 on vi.coffee + added a couple of translations done by An as a test (succesful) 2014-01-15 02:17:04 +01:00
GlenDC
d5907059ed Resolved issue #30 2014-01-15 01:58:37 +01:00
GlenDC
92416dc4f2 Created view versions for components, systems and thangs (fix #30) 2014-01-15 01:33:24 +01:00
Alliss
4ce5a95e22 Update fr.coffee 
Here's a little contribution, everything I changed I'm 100% sure of. Hope it'll help !
 2014-01-15 01:32:16 +01:00
GlenDC
4633ced78d Created superclass & common templates for article & level (fix for #30) 2014-01-15 01:12:21 +01:00
Nick Winter
7f1f0fadff Fixed System deserialization. 2014-01-14 14:03:55 -08:00
brunoporto
fda49c888f Update pt-BR.coffee 2014-01-14 19:59:15 -02:00
Nick Winter
156c6734ac Merge pull request #189 from rezahb/master 
Update fa.coffee
 2014-01-14 13:49:44 -08:00
Rehb
17803d018c Update fa.coffee 
Delet #
 2014-01-15 01:11:54 +03:30
Rehb
8e4c246e5e Update diplomat.jade 
Add name 91-Persian
 2014-01-15 01:05:10 +03:30
Scott Erickson
bf4011044f Initially working on using team colors, but it's not working yet. 2014-01-14 13:16:30 -08:00
Rehb
a63f8afff0 Update fa.coffee 2014-01-15 00:40:59 +03:30
Rehb
e13a68df66 Update fa.coffee 2014-01-15 00:39:58 +03:30
Rehb
415bd36f73 Update fa.coffee 2014-01-15 00:37:55 +03:30
Elio
237b97ac5a Update fr.coffee 2014-01-14 22:05:15 +01:00
Scott Erickson
f4a2209d6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 12:53:18 -08:00
Scott Erickson
83e7a98869 Fixed the versions pages. 2014-01-14 12:53:06 -08:00
Rehb
182548402e Update fa.coffee 2014-01-15 00:15:39 +03:30
Nick Winter
704f9af864 Updated language progress; added Slovene placeholder. 2014-01-14 12:18:05 -08:00
Nick Winter
a291dd9364 Added new i18n tags to all locales. 2014-01-14 10:30:18 -08:00
Nick Winter
60850d5c48 Updated some tags. Added a script to copy tags from en.coffee. 2014-01-14 10:29:23 -08:00
Nick Winter
6a40e27bdd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 09:15:32 -08:00
armaldio
a0f5eece96 Update fr.coffee 
just stay few english words that I can't translate
 2014-01-14 12:37:40 +01:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Scott Erickson
37f1ccdb51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 20:32:41 -08:00
Scott Erickson
810eabef46 Tweaked some copy in prep for the new translations to be sent out. 2014-01-13 20:32:21 -08:00
Nick Winter
1041ce4b17 Added GitHub stars button. 2014-01-13 18:19:28 -08:00
Nick Winter
5405423510 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 17:17:48 -08:00
Nick Winter
40bd91f415 Working on adding i18n tags from #23. 2014-01-13 17:17:41 -08:00
Scott Erickson
0fda326858 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 16:59:13 -08:00
Scott Erickson
05f4840369 Added tracking properties to systems. 2014-01-13 16:58:56 -08:00
Michael Schmatz
eb04575294 Merge pull request #157 from shiyingzheng/master 
Randomized Thang Names #128
 2014-01-13 16:50:55 -08:00
Paul Buser
f6ada477ef Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-13 16:59:36 -05:00
Nick Winter
69a6070e02 Merge branch 'master' of git://github.com/p-buse/codecombat into p-buse-master 2014-01-13 13:18:52 -08:00
Philipp Hansch
ee06d40974 Update de.coffee 
Updated missing translations with the translations from the
Google Doc.

Ref #123
 2014-01-13 14:54:55 +01:00
Paul Buser
bfe2ab0f1e Add regexp event checking 2014-01-12 21:26:07 -05:00
Paul Buser
485bc4d6cf Remove common scripts from user-created levels 2014-01-12 21:15:31 -05:00
Paul Buser
8838903d58 Remove common scripts from user-created level packaging 2014-01-12 21:13:03 -05:00
Michael Schmatz
60abd9f794 Merge pull request #168 from schmatz/master 
Fixed some client-side tests
 2014-01-12 14:04:57 -08:00
Michael Schmatz
718e7ebd22 Fixed failing createPath test 
There was a misnamed variable, incorrect expect, and outdated calling
style
 2014-01-12 12:44:22 -08:00
Scott Erickson
dbbfbcf861 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:27:26 -08:00
Scott Erickson
de258fdf20 Set up wizard sprites to use the color config. 2014-01-12 12:27:10 -08:00
Nick Winter
d6f2f41cf8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:24:24 -08:00
Nick Winter
acc6c2e4e6 Fixed a couple typos. 2014-01-12 12:24:02 -08:00
Scott Erickson
c4028a8036 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:06:48 -08:00
Nick Winter
1572228aa5 Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master 2014-01-12 12:01:56 -08:00
Nick Winter
8ab997680e Turned off A/B test for Break the Prison. 2014-01-12 12:00:38 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Nick Winter
fbd7d4a0c5 Fixed up some syntax errors in #147. 2014-01-12 11:40:38 -08:00
Nick Winter
34ee6778b9 Merge pull request #147 from mlewisno/master 
Added a file and translations for Bahasa Malaysia
 2014-01-12 11:37:25 -08:00
Mischa Lewis-Norelle
958c3e5bae Made it clear that this is the Bahasa region of the Malay macro language 2014-01-12 14:20:29 -05:00
Mischa Lewis-Norelle
1d7a01fd5c Fixed the language issues 
Still not sure about the language code, as there are several Malay
languages, but since this is the only one we have right now, I suppose
it’ll do. Google has it as .my, but BCP 47 says that is Burmese. I’ll
look into this more later on.
 2014-01-12 14:09:56 -05:00
SHIYING
b6c499db72 Better randomized orders. Better styled code. 2014-01-12 12:59:51 -05:00
GlenDC
1032fdb1d3 Enchangement for issue #23. Removed classes related ids from account_settings to classes category 2014-01-12 11:20:07 +01:00
SHIYING
524b2318f8 Better comment for randArray 2014-01-11 16:15:46 -05:00
SHIYING
08a1668bcc Bug fixed where ordering of thang names becomes undefined sometimes 2014-01-11 16:09:25 -05:00
SHIYING
ae67a9dc23 Added comments and made code more readable 2014-01-11 15:43:34 -05:00
SHIYING
00cdb1e5ad Randomized naming for Thangs 2014-01-11 15:41:13 -05:00
GlenDC
683b72f67a First big fix for issue #23. The issue is as good as fixed besides some details I think. 2014-01-11 17:25:04 +01:00
Adam23
0fc8643133 update zh-HANT.coffee + zh-HANS.coffee 
fix something
 2014-01-11 21:45:08 +08:00
Adam23
016dc1a3f6 Chinese (Traditional) 
zh-HANT.coffee  +  zh-HANS.coffee
 2014-01-11 21:17:47 +08:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
52eae882e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:14:31 -08:00
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
Nick Winter
033e3a6c0b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:04:21 -08:00
Nick Winter
2383d5dd3a An improvement for containingString in #133. 2014-01-10 17:04:12 -08:00
Scott Erickson
1f9c531938 Got rid of a bunch of logs. 2014-01-10 16:57:38 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Nick Winter
a6f1ce53ba Merged #152, and slightly improved update interval handling. 2014-01-10 16:36:36 -08:00
dristic
21915f358c Add clear timers to not have timer running in the background on home page. 2014-01-10 16:18:39 -08:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
2b6a7cf753 Merge pull request #145 from fess89/master 
Update uk.coffee
 2014-01-10 09:42:16 -08:00
mlewisno
c6e81f909c Added a file and translations for Bahasa Malaysia 2014-01-10 10:09:45 -05:00
mlewisno
9318675447 Merge remote-tracking branch 'upstream/master' 
Updated my local copy to match the public copy
 2014-01-10 10:08:02 -05:00
Oleksii Chyrkov
8902ba91e2 Update uk.coffee 
Copied Ukrainian strings from Google doc to uk.coffee.
 2014-01-10 14:55:56 +02:00
Adam23
29a302aaa9 update zh-HANS.coffee 
make the string blank, and comment out the line
 2014-01-10 14:54:22 +08:00
Adam23
cf6b6c11ce update zh-HANS.coffee 
two places
 2014-01-10 14:19:25 +08:00
Adam23
e01db58608 updating zh-HANS.coffee 
I have finished the  first draft.
 2014-01-10 13:43:59 +08:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Nick Winter
25d2f95db9 Not using subreddit any more. 2014-01-09 18:29:57 -08:00
Nick Winter
027cddd151 Increased matching bracket highlighting visibility. 2014-01-09 18:02:16 -08:00
Nick Winter
05d7562c78 Copied Norwegian also Norwegian (Bokmal). 2014-01-09 17:43:13 -08:00
Nick Winter
7cbd1605e4 Merge pull request #139 from rhc2104/dutch 
Add Dutch translations
 2014-01-09 17:28:13 -08:00
Nick Winter
4502492d8a Merge pull request #138 from rhc2104/italian 
Add support for Italian
 2014-01-09 17:27:47 -08:00
Ronald Cheng
014fd0d608 Add Dutch translations 2014-01-09 17:15:44 -08:00
Ronald Cheng
309e2c7467 Add support for Italian 2014-01-09 16:50:59 -08:00
Ronald Cheng
36c8e96450 Add Swedish translations, plus a couple of Polish translations 2014-01-09 16:08:57 -08:00
Oleksii Chyrkov
8931a01ae3 Update ru.coffee 
Added a missing quote at the last line.
 2014-01-10 00:47:14 +02:00
Nick Winter
0c6b1257ff Fixed a couple syntax issues in Russian locale.. 2014-01-09 14:46:00 -08:00
Nick Winter
7cda5dcbc5 Merge pull request #130 from fess89/master 
Update ru.coffee
 2014-01-09 14:43:22 -08:00
Oleksii Chyrkov
96b995ed60 Update ru.coffee 
Updated ru.coffee with the actual Russian translation of all the strings.
 2014-01-10 00:24:35 +02:00
Michael Schmatz
faac70bee9 Merge pull request #125 from p-buse/master 
Fix "Contact" link in footer not properly changing cursor to pointer
 2014-01-09 14:18:15 -08:00
Scott Erickson
2d5ca50e89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585 Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
mlewisno
414bb4d07a Added a file for Bahasa Malaysia, will update soon 2014-01-09 16:30:03 -05:00
Dman19993
6f094f0f38 Update names.coffee 2014-01-09 14:47:24 -06:00
Paul Buser
7af5804e29 Fix "Contact" link in footer not properly changing cursor to pointer 2014-01-09 15:31:56 -05:00
Tavio
850313ca70 Update names.coffee 2014-01-09 18:00:39 -02:00
Nick Winter
98245d0fb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c A bit more CoffeeScript-y. 2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level/hud_view.coffee
 2014-01-09 11:05:51 -08:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Nick Winter
e2414f7c5a Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded. 2014-01-09 10:49:34 -08:00
Bård Eik-Hvidsten
1d525bad37 Update no.coffee 
Translated the text into Norwegian (Bokmål)
 2014-01-09 19:35:11 +01:00
Ronald Cheng
278b4d8754 If you have pressed esc, do not get prompted about it 2014-01-08 23:09:58 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Nick Winter
03a5614a18 Fixed #96. 2014-01-08 19:18:23 -08:00
Scott Erickson
50beeb93bc Merge branch 'production' 2014-01-08 14:59:49 -08:00
Scott Erickson
4b8c8f22c1 Fixed logging out to update the header properly. 2014-01-08 14:57:59 -08:00
Scott Erickson
aab11ea5f7 Fixed logging in with facebook and google plus to not overwrite existing user settings. 2014-01-08 14:57:42 -08:00
Nick Winter
2fdb8c2dc2 Merge pull request #116 from rhc2104/press-esc 
Create notification that esc can skip dialogs
 2014-01-08 14:35:58 -08:00
Ronald Cheng
81eed31714 Create notification that esc can skip dialogs 
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
 2014-01-08 14:23:36 -08:00
Ronald Cheng
a717ee80fb Add more peasant names, and soldiers cannot be both Will and William 2014-01-08 11:34:52 -08:00
Michael Schmatz
ee3841b32c Merge pull request #110 from rhc2104/google-plus 
Make G+ button same size as other buttons
 2014-01-08 05:56:31 -08:00
Michael Schmatz
119812e126 Merge pull request #109 from rhc2104/404 
Center text in 404 page
 2014-01-08 05:13:06 -08:00
Ronald Cheng
3658d5ca3a Make G+ button same size as other buttons 
The default G+ button size is slightly larger than the Facebook and Twitter buttons.  Use the "medium" size to make the size even.
 2014-01-08 02:15:52 -08:00
Ronald Cheng
a61756a816 Center text in 404 page 2014-01-08 01:28:38 -08:00
engstrom
21536794be added peasant names 2014-01-07 20:59:43 -07:00
Tavio
07df7be1f4 Update names.coffee 
A few more names.
 2014-01-08 00:26:16 -02:00
Tavio
32eaf4a891 Update names.coffee 2014-01-07 23:02:55 -02:00
armaldio
9f4188da09 Update fr.coffee 
Hi, I'm French and I like CodeCombat.
I enjoy translate things from English to French.
If you agree, I can translate many of levels dialogues :D
 2014-01-07 23:56:41 +01:00
Gabriel Cebrian
74bcc4ec1b Increase element padding to avoid cutting words off 2014-01-07 14:05:39 -05:00
Gabriel Cebrian
ad12680ce9 Make language options menu right aligned instead of left aligned 
Remove horizontal scrollbar that is shown when vertical scrollbar is shown
Changed top property to improve look
 2014-01-07 13:27:46 -05:00
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
Scott Erickson
250b7322a9 Fixed #56 2014-01-06 21:25:18 -08:00
Scott Erickson
a988c91a63 Fixed blog links. 2014-01-06 20:17:27 -08:00
Scott Erickson
f0147e8f7c More tweaks to the thang editor. 2014-01-06 19:33:36 -08:00
Scott Erickson
7d638b596f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 19:10:57 -08:00
Scott Erickson
ddbf45b50c Made the thang editor a little more organized. 2014-01-06 19:09:43 -08:00
Nick Winter
845601ed96 No need for wallNameFor any more. 2014-01-06 19:07:13 -08:00
Scott Erickson
59ec63c041 Fixed #60. 2014-01-06 18:12:57 -08:00
Scott Erickson
aeaeb84fe5 Fixed general articles showing up in the guides. 2014-01-06 18:03:17 -08:00
Scott Erickson
5a4de61999 Bug fix. 2014-01-06 17:56:34 -08:00
Scott Erickson
975a7453bd Refactored initial User creation. 2014-01-06 17:45:35 -08:00
Scott Erickson
a9c70f9a7d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 17:15:24 -08:00
Scott Erickson
94cb6ea4e1 Fixed up the search optimization and installed thang portraits into the level editor. 2014-01-06 17:11:57 -08:00
Nick Winter
1297126abd Added back lang val instead of attr setting. 2014-01-06 16:58:50 -08:00
Scott Erickson
fe984d7c73 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 15:36:50 -08:00
Scott Erickson
27e7b6c240 Tweaks for thang portraits. 2014-01-06 15:36:35 -08:00
Nick Winter
8b4ec9b263 Merged and cleaned up #79. 2014-01-06 15:18:40 -08:00
Nick Winter
f53f20a6ad Fixed #86. 2014-01-06 14:53:21 -08:00
Tom Steinbrecher
60c4b360d5 Added ContribueClassView, which all contribute pages are now based off of. 
Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages.

Fixed other small bugs.
 2014-01-06 17:30:35 -05:00
Nick Winter
fa687c4c30 Increase infinite loop timeout wait slightly to bandage #81. 2014-01-06 12:47:50 -08:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
George Saines
7758ecc91b Added additional names for units. 2014-01-06 11:06:03 -08:00
George Saines
387eab5592 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 11:02:03 -08:00
George Saines
123affeec6 Fixing a typo in the CLA 2014-01-06 11:02:00 -08:00
Nick Winter
316b382d81 Fix for announcement duplicates. 2014-01-06 10:33:52 -08:00
Tom Steinbrecher
75894d1160 Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before 2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14 2014-01-06 00:41:31 -05:00
Scott Erickson
d1c33430d8 Tweaked the Archmage contribute copy. 2014-01-05 17:01:23 -08:00
Nick Winter
3a448d589a Merge pull request #77 from chloester/master 
Fixed #13
 2014-01-05 15:59:30 -08:00
Chloe Fan
5a9b55342e Aligning intro to rest of the page 2014-01-05 15:55:36 -08:00
Chloe Fan
b7ecab102e Issue 13. Pushed header and image down to compensate for fixed top bar 2014-01-05 15:51:46 -08:00
Nick Winter
1185731fd0 Fixed two bugs with the CLA. 2014-01-05 15:07:30 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7 Allowed access to character class emails by prompting for signup on check. 2014-01-05 14:20:48 -08:00
Nick Winter
fa1d24ba8f Updated README. 2014-01-05 12:32:44 -08:00
Nick Winter
164dd49933 Fixed a GitHub link. 2014-01-04 22:20:17 -08:00
Tom Steinbrecher
d50c362286 Refactored ticker, fixed from all instances were using same ticker. 2014-01-05 01:05:03 -05:00
Tom Steinbrecher
b5bb1b13a1 Completed issue 48: Adds bobbing to thangs with 'bobs' property. 
Thangs with 'bobs' must also set 'bobSpeed' and 'bobHeight'
 2014-01-04 22:51:53 -05:00
Nick Winter
1d223f790b Trying to force soft tabs and Unix newlines. 2014-01-04 16:41:25 -08:00
Nick Winter
01cfcbedc7 Updated some $attr, $val, and $prop calls. 2014-01-04 15:49:13 -08:00
Scott Erickson
0499cddbe6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-04 08:56:29 -08:00
Scott Erickson
c4bfcd5c2d Refactored portraits to be built in sprite sheets separately. 2014-01-04 08:55:12 -08:00
Mischa Lewis-Norelle
c35cd3437f Added a bunch of names 
Added a bunch of names, will come up with more tomorrow and add them in
the evening.
 2014-01-03 23:28:09 -06:00
Scott Erickson
56fa98e76b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-03 14:31:27 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
ffebe45267 Updated uglify-brunch options to not break on for(;;). 2014-01-03 13:49:36 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00