codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5961 commits 27 branches 0 tags 134 MiB
Commit graph

4681 commits

Author SHA1 Message Date
Scott Erickson
6b0a196076 Added support for internationalizing audio scripts in levels. 2014-10-29 10:38:01 -07:00
Scott Erickson
642fda9520 Forgot to add world map campaign icons. 2014-10-29 10:07:51 -07:00
Scott Erickson
02eacbbc8f Added a button to switch between world maps. 2014-10-29 09:48:37 -07:00
enricpc
c6490d7c03 Update ca.coffee 2014-10-29 12:58:02 +01:00
Nick Winter
5ba1f61abe Added i18n support for level code comments. 2014-10-28 21:15:47 -07:00
Nick Winter
c7713b4105 Showing i18n in property docs. 2014-10-28 21:15:47 -07:00
Scott Erickson
a4729d9d6b Finished migrating the guide into game menu. 2014-10-28 16:30:40 -07:00
Scott Erickson
dcb7aaf9a4 Removed a TODO. 2014-10-28 14:23:39 -07:00
Scott Erickson
e6c0d53d50 ThangType editor now deletes properties properly. 2014-10-28 14:22:29 -07:00
Scott Erickson
67684b89d5 Fixed #1687, forcing reloads when populating i18n in documents. 2014-10-28 14:21:22 -07:00
Scott Erickson
895645ef6d Levels and Components with i18nCoverage update that coverage from the level editor now. 2014-10-28 13:48:17 -07:00
Scott Erickson
9e6fd119a0 Achievements populate i18n whenever they're edited now. 2014-10-28 13:09:07 -07:00
Scott Erickson
e5ea4f70e9 Added a progress bar to the i18n home view. Sorting models by completion so documents needing translation go to the top. 2014-10-28 11:28:31 -07:00
Scott Erickson
7477633909 Trying to better get around mongoose stripping out empty i18n objects. 2014-10-28 11:21:26 -07:00
Scott Erickson
346f3b33bf Added context to the i18n editor for components. 2014-10-28 11:21:26 -07:00
enricpc
71a4a883e5 Update ca.coffee 2014-10-28 09:29:46 +01:00
Nick Winter
68ac412f2b I think this return is needed to prevent sending the i18n query results twice and crashing the server. 2014-10-27 22:54:50 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Nick Winter
2dbdacd958 GoalsView should now roughly scale with the size of the screen. 2014-10-27 16:37:07 -07:00
Matt Lott
8f923f9e1e Replacing http PATCHs with PUTs 
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
 2014-10-27 16:09:52 -07:00
Nick Winter
eeeb7d47c9 Messing with .executing styles to make them outrageously visible. 2014-10-27 15:54:56 -07:00
Volkan Gezer
75211833b6 Update tr.coffee 2014-10-27 23:03:06 +01:00
Nick Winter
f86c726fc8 Made iPad touch events work on inventory equipping and progress slider. 2014-10-27 13:32:32 -07:00
Nick Winter
5d37e4d34e Merge pull request #1706 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-10-27 13:22:34 -07:00
Imperadeiro98
b6ca682bb9 Update pt-PT.coffee 2014-10-27 19:14:37 +00:00
Titounkle
b3b52727be Update es-ES.coffee 
Autorun can be translated, but it would fit far worse than Autorun itself.Thats why i left it unchanged.
Cheers
 2014-10-27 20:12:07 +01:00
Nick Winter
52b7e464a3 Propagated i18n. 2014-10-27 11:18:40 -07:00
Nick Winter
206f7ee5a4 Upgraded ChooseHeroView: drag onto hero, more visible drag states and animations, emphasize double-click over drag, better programming language selector. 2014-10-27 11:17:34 -07:00
Nick Winter
6b423ed13e Added signup to game menu modal. 2014-10-27 09:27:57 -07:00
Nick Winter
4e947b05ad Merged zh-HANS. Propagated i18n. 2014-10-27 08:47:34 -07:00
Nick Winter
7b2964c6ef Formatting docs popovers for iPad. 2014-10-26 20:21:03 -07:00
Nick Winter
4c8e67efce FastClick avoidance on start level button. 2014-10-26 17:49:45 -07:00
Matt Lott
0f721f9f48 Reducing user code problems view to recent 300 
Loading 1000 took too long (~10min) in production.
 2014-10-26 17:11:51 -07:00
Michael Schmatz
cd0bed2df2 Added FastClick 
iOS artificially introduces 300ms of delay on clicks, which FastClick
eliminates.
 2014-10-26 18:34:04 -04:00
Nick Winter
c0f5c357ba Defense, not defence. 2014-10-26 15:31:20 -07:00
Nick Winter
27d1304c6c Turns out checking Errorception is really useful. 2014-10-26 11:02:34 -07:00
Matt Lott
7c21d5921e Update query for user code problems view 
So it doesn’t explode in production.
 2014-10-26 10:50:30 -07:00
Imperadeiro98
647e578b46 Update pt-PT.coffee 2014-10-26 14:25:53 +00:00
Nick Winter
6473fff940 Implemented stat comparison bars on ChooseHeroView. 2014-10-25 21:53:55 -07:00
Nick Winter
3f5f292f0d Updated how we're sending over spell palette items to iPad app. 2014-10-25 16:26:03 -07:00
George Saines
4b62ba95d3 making the arrow bigger/more visible 2014-10-25 15:59:02 -07:00
Michael Schmatz
56da3af83b Publish "tome:spell-loaded" on spell reloading 2014-10-25 17:00:54 -04:00
Nick Winter
e09b867a93 Propagated i18n. 2014-10-25 11:48:16 -07:00
Nick Winter
66dfa301e5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-25 11:47:39 -07:00
Nick Winter
774ae24b41 Fixed my Camera fix for point/region choosers. Trying to fix #1411 by insisting on monospace fonts in the code editor. 2014-10-25 11:47:04 -07:00
Matt Lott
185c977cdb User code problems admin view 
Shows the most recent 1000 log entries
Url: admin/user-code-problems
 2014-10-24 15:11:55 -07:00
Matt Lott
f4426f2e43 Save user code errors without 'Line N: ' prefix 2014-10-24 14:05:54 -07:00
Nick Winter
42b81fd55e Fix for point/region choosers destroying AudioPlayer's camera. Fix for DOM highlight arrow covering up level info on iPad. 2014-10-24 13:03:15 -07:00
Nick Winter
8cc5c4d873 Merge pull request #1701 from richhiey1996/patch-1 
Update names.coffee
 2014-10-24 11:52:00 -07:00
richhiey1996
ac6b213fee Update names.coffee 2014-10-25 00:11:28 +05:30
Matt Lott
651ff3c8d0 Update attack snippet if no findNearestEnemy 
This is a one-off fix until we have a more general solution to snippet
updating based on available skills.
 2014-10-24 11:38:48 -07:00
Matt Lott
ff2e8eaa21 Update code snippet schema to code format 2014-10-24 10:18:00 -07:00
richhiey1996
d71ddaf74a Update names.coffee 2014-10-24 13:43:49 +05:30
Nick Winter
79ed8b2470 Hooked up some menu music transitions to play menu music during HeroVictoryModal and GameMenuModal. 2014-10-23 20:03:19 -07:00
Nick Winter
4c33b98e27 Fixed building Thangs with new Components that no other Thang uses. Fixed THangs with id 0 in the level editor. 2014-10-23 18:11:12 -07:00
Nick Winter
13fe1bbece Improved branching choices and set up an A/B/C/D test around branching. 2014-10-23 16:37:09 -07:00
Matt Lott
83516f562b Enable local autocomplete 2014-10-23 16:23:46 -07:00
Matt Lott
a5695e896b Increase size of autocomplete popup 2014-10-23 11:16:58 -07:00
Dmitry
5719586645 Update ru.coffee 2014-10-23 14:56:45 +04:00
Dmitry
17dde2487a translations and improvements 2014-10-23 14:11:57 +04:00
Nick Winter
7f8216f482 Experimental branching support, visible to admins. 2014-10-22 15:42:51 -07:00
Nick Winter
039dd4f264 Fixed issue with HeroVictoryModal assuming achievements all have rewards. 2014-10-22 13:57:57 -07:00
Nick Winter
b85d541304 Merge pull request #1697 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-10-22 13:36:07 -07:00
Christelle
32a230548f Update fr.coffee 2014-10-22 16:17:48 -04:00
Christelle
5d4a6b603b Update fr.coffee 2014-10-22 16:12:41 -04:00
Matt Lott
625a34b2e6 Add autocomplete right-justified help text 2014-10-22 12:24:31 -07:00
Imperadeiro98
918e940edd Update pt-PT.coffee 2014-10-22 19:21:57 +01:00
Nick Winter
f2fdd761df Propagated i18n. 2014-10-22 10:47:03 -07:00
Nick Winter
afc6558edc Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging. 2014-10-22 10:46:34 -07:00
Scott Erickson
9392100d3b Removed some logs. 2014-10-22 08:17:30 -07:00
Scott Erickson
4371873d41 Set up thang types to use their raster property as an icon. 2014-10-22 07:53:50 -07:00
Scott Erickson
49c85bce5f Fixed an issue with thang type marks not handling sprite sheet build completion correctly. 2014-10-22 07:53:50 -07:00
Scott Erickson
e38f26a8d0 Fixed a little bit of spritesheet rebuilding cleanup. 2014-10-22 07:53:50 -07:00
Scott Erickson
1f7d098b2e Added rotation buttons in the context menu and shortcuts to the level editor. 2014-10-22 07:53:49 -07:00
Scott Erickson
20595b50da Fixes 1647. Somehow had been under the impression the segmented sprite containers weren't handling clicks correctly and that segments needed to handle them. 2014-10-22 07:53:49 -07:00
Nick Winter
103418fe2b Removed super-aggressive log which has now served its purpose. 2014-10-21 21:37:49 -07:00
Nick Winter
6539adf53d Sure wish I could test this bug without a full production deploy. 2014-10-21 20:29:45 -07:00
Nick Winter
49f3a0a298 More logging for the merged models problem. 2014-10-21 20:12:20 -07:00
Nick Winter
399cd048fc Logging some stuff to get to the bottom of things. 2014-10-21 19:39:13 -07:00
Matt Lott
bb8d1d8362 Adding more analytics even tracking 
Actions on homepage
Path from homepage to first level
 2014-10-21 16:55:16 -07:00
Nick Winter
09e80120bf Fixed issue with progress scrubber hover not showing the right time when hovering over handle. 2014-10-21 15:59:43 -07:00
Nick Winter
7c2982d3f1 Adding some logging for crazy save validation bugs. Swapping in flag item slot. 2014-10-21 13:57:49 -07:00
Scott Erickson
ba79d59190 Fixed a couple errors in the tests. 2014-10-21 11:54:03 -07:00
Scott Erickson
091910f2ad Fixed debug, and some other mark issues when sprite sheets update, most likely. 2014-10-21 11:36:38 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
yjw9012
ca09381d42 Fixed #1567 
Moved the code diff control to the top of the list, and added a short
instructional message.
 2014-10-20 23:12:00 -07:00
Matt Lott
56c15116a7 Swap problem alert error message and hint lines 
Also fixing problem alert border on Firefox.
 2014-10-20 21:20:33 -07:00
Nick Winter
7a9014f83a Several improvements to the victory modal. 2014-10-20 19:01:00 -07:00
Nick Winter
a33bb215d4 Fixed checking compile-time problems for clean code goals. 2014-10-20 17:49:52 -07:00
Volkan Gezer
0f7fb5d573 fix grouping 2014-10-21 01:51:52 +02:00
Volkan Gezer
e3f894805f some updates to turkish language 2014-10-21 01:44:36 +02:00
Nick Winter
bc15ccd240 Fixed panel vs. total counts on other achievements. 2014-10-20 16:13:56 -07:00
Nick Winter
d0b878db37 Implemented lines-of-code goal type. 2014-10-20 14:43:18 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
67166f1496 Removed a log. 2014-10-20 09:41:58 -07:00
Nick Winter
1219710cbb Starting to work on codeProblems goal type. Rearranged script import for publishing notes earlier. Fallback for Math.log10. 2014-10-20 09:41:28 -07:00
Nick Winter
08d9e39764 LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests. 2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
440e1700b1 Using aiSource now for enemy AIs in multiplayer, separate from sample code source. 2014-10-19 12:44:58 -07:00
Imperadeiro98
9fc4498ace Update pt-PT.coffee 2014-10-19 19:16:13 +01:00
Nick Winter
0f6bfddd57 Propagated i18n. 2014-10-19 08:34:15 -07:00
Nick Winter
b7143c32f7 A bit of housekeeping for the last few i18n pull requests in perspicacious preparation for proper propagation. 2014-10-19 08:33:30 -07:00
Nick Winter
51be5f354c Merge pull request #1689 from AbnerZheng/patch-3 
Update zh-HANS.coffee
 2014-10-19 08:29:02 -07:00
Li Ma
c0c35cafe5 Update zh-HANS.coffee 
添加一些零散翻译
 2014-10-19 23:00:45 +08:00
AbnerZheng
c722c4cea7 Update zh-HANS.coffee 
由于前面有人把stats翻成"成就"，为保持一致性，也翻译成"成就"
 2014-10-19 22:47:17 +08:00
Imperadeiro98
84c05109ea Update en.coffee 2014-10-19 12:51:50 +01:00
Imperadeiro98
d4f9078980 Update WorldMapView.coffee 2014-10-19 12:50:58 +01:00
Imperadeiro98
d9a32895c7 Update MainPlayView.coffee 2014-10-19 12:49:57 +01:00
Nick Winter
9f216e3361 Preserving opponent flags. 2014-10-18 18:57:33 -07:00
Nick Winter
66c728210b Fixing flag coloring in new WebGL rendering. 2014-10-18 18:18:12 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
9ce8ebaf25 Merge pull request #1686 from rafajaques/master 
Translation done and spell check
 2014-10-18 15:57:11 -07:00
Rafael Jaques
e32787d25c Translation done and spell check 2014-10-18 19:17:07 -03:00
Nick Winter
9c8a0e83af Fixed an indentation typo in pt-BR.coffee. 2014-10-18 14:54:04 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Dmitry
441b1351aa some translates 2014-10-19 00:45:56 +04:00
Nick Winter
08da130598 Merge pull request #1684 from rafajaques/master 
Almost done
 2014-10-18 08:03:14 -07:00
Rafael Jaques
cf64112d95 Almost done! 2014-10-18 11:29:43 -03:00
Michael Schmatz
4aff89d60a Fixed spell palette changes for iPad 2014-10-18 09:46:08 -04:00
Rafael Jaques
d56b2207da Update pt-BR.coffee 2014-10-18 10:39:44 -03:00
Nick Winter
2e539debbb Added signup poke to HeroVictoryModal. 2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e More blingstrositization for the HeroVictoryModal. 2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54 First set of fixes to HeroVictoryModal. 2014-10-17 18:00:13 -07:00
Matt Lott
f75ff8a236 Don't save duplicate user code problems 2014-10-17 15:53:00 -07:00
Nick Winter
a65dabad04 Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay. 2014-10-17 15:25:31 -07:00
Nick Winter
cc1d247014 Merge pull request #1682 from rafajaques/master 
pt-BR translations
 2014-10-17 14:26:52 -07:00
Rafael Jaques
7ec54720ca Update pt-BR.coffee 2014-10-17 17:01:51 -03:00
Rafael Jaques
b8d59ed78a Update pt-BR.coffee 2014-10-17 16:59:33 -03:00
Rafael Jaques
a3c8621584 Update pt-BR.coffee 2014-10-17 16:13:20 -03:00
Nick Winter
c4207873d7 Merge pull request #1681 from Imperadeiro98/patch-1 
Update cast_button.jade
 2014-10-17 10:11:40 -07:00
Rafael Jaques
34dd1dadca Update pt-BR.coffee 2014-10-17 13:56:44 -03:00
Scott Erickson
0dc050abca Added i18nCoverage backend support. 2014-10-17 12:12:06 -04:00
Imperadeiro98
3b9feebee8 Update cast_button.jade 
Internationalized "Submit".
 2014-10-17 17:06:25 +01:00
Nick Winter
7f60701daa Merge pull request #1678 from yjw9012/master 
#1668: moved the question above the dropdown
 2014-10-17 08:50:42 -07:00
Nick Winter
005b4991cd Merge pull request #1680 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-17 08:48:47 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Imperadeiro98
f496823bb5 Update level_loading.jade 
Removed an unused tip.
 2014-10-17 16:38:21 +01:00
Scott Erickson
36ea415dbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-17 10:11:33 -04:00
Scott Erickson
092997bffe Added i18n coverage logic to the CocoModel. 2014-10-17 10:11:26 -04:00
yjw9012
30b261e40a Merge remote-tracking branch 'upstream/master' 2014-10-16 23:27:50 -07:00
yjw9012
fe66b6e960 #1668: moved the question above the dropdown 
moved the question ‘which programming do you want to use?’ above the
programming language dropdown.
 2014-10-16 21:39:59 -07:00
Nick Winter
a922c9c6ef First draft of new hero spell palette that groups abilities by item. 2014-10-16 21:38:11 -07:00
Nick Winter
07b988c405 Fixed gear requirements for Closing the Distance. 2014-10-16 12:14:04 -07:00
Nick Winter
54de8482f1 Spell palette now hugs the spell editor, which itself shrinks as needed. 2014-10-16 12:08:21 -07:00
Scott Erickson
fbaced90c3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 16:43:37 -04:00
Scott Erickson
9455199b39 Limited social media library loading to only those views that need it. 2014-10-15 16:43:26 -04:00
Nick Winter
d3f35f024a Fixed #1665. Fixed #1667. 2014-10-15 10:33:33 -07:00
Nick Winter
92ec44ffce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 10:28:39 -07:00
Nick Winter
9826311656 Started playing menu music on WorldMapView. Only go full-screen on squat windows where we really need it (see #1669). 2014-10-15 10:28:29 -07:00
Nick Winter
fbdb666e01 Merge pull request #1664 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-15 08:39:40 -07:00
Nick Winter
5c40f99d99 Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit. 2014-10-14 22:38:22 -07:00
Matt Lott
7cbb5ac45d Pass common 'this' methods to Aether 2014-10-14 17:53:17 -07:00
Matt Lott
ce14f92979 Pass problem context to Aether 
So Aether can craft better error messages.
Bumping Aether to v0.2.39
 2014-10-14 14:02:34 -07:00
Nick Winter
04ec8c5222 Sped up maze levels. Fixed an unhinged world deserialization listener. 2014-10-14 11:53:32 -07:00
Nick Winter
ee9e32af51 Hid play/pause button for first few levels. Hid submit button until run once or won for a few more levels. 2014-10-14 11:11:56 -07:00
Nick Winter
b7fe9398d5 Don't preload when player hasn't finished typing this or self. 2014-10-14 10:39:13 -07:00
Nick Winter
d79d40b98c Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin. 2014-10-14 09:54:36 -07:00
Gabriel Cesar
1493110043 pt-BR.coffee updated. 2014-10-14 12:43:44 -03:00
Nick Winter
69a3f78594 Merge pull request #1662 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-14 08:30:36 -07:00
Nick Winter
136168f928 Merge pull request #1661 from ikks/patch-1 
Update es-419.coffee
 2014-10-14 08:29:47 -07:00
Nick Winter
80537dfac7 Experimented with triggering full-screen on first level start. 2014-10-13 21:45:14 -07:00
George Saines
ee88c0870e pushing my fix 2014-10-13 16:24:54 -07:00
George Saines
6350debf26 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-13 15:51:48 -07:00
Scott Erickson
99e5941126 Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels. 2014-10-13 17:18:33 -04:00
Scott Erickson
6ff7cd12cc Mostly done with the victory modal. 2014-10-13 11:53:08 -04:00
Imperadeiro98
c3a35d5de7 Update pt-PT.coffee 2014-10-12 18:38:16 +01:00
Gabriel Cesar
d75a0653c3 added some pt-br translations 2014-10-12 02:31:36 -03:00
Igor Támara
5016529f6b Update es-419.coffee 2014-10-11 14:09:18 -05:00
Michael Schmatz
dee5d82d61 Added gutter problem support for iPad 2014-10-11 12:57:45 -04:00
Michael Schmatz
e7269a62dd Added line highlighting event for iPad 2014-10-11 11:34:31 -04:00
Nick Winter
281d0ef96e Fixed zh-HANT.coffee merge conflicts. 2014-10-11 08:24:42 -07:00
Nick Winter
af36b3e4ef Merge pull request #1658 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-11 08:20:43 -07:00
Nick Winter
1203efaad0 Fixing el.coffee merge conflicts. 2014-10-11 08:19:37 -07:00
Imperadeiro98
e574843599 Update pt-PT.coffee 2014-10-11 10:49:22 +01:00
Imperadeiro98
3dc9a5dfdc Update pt-PT.coffee 2014-10-11 10:47:39 +01:00
Imperadeiro98
8130c1b3fa Update pt-PT.coffee 2014-10-11 10:46:31 +01:00
Imperadeiro98
3c5adb7bad Update level_loading.jade 
This tip was removed some time ago from the locale files.
 2014-10-11 10:19:30 +01:00
Nick Winter
f80380784a Levels save right away on victory. 2014-10-10 19:20:00 -07:00
Nick Winter
2db637866c Fix for non-Boolean includeFlow. 2014-10-10 18:23:51 -07:00
George Saines
3927371427 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-10 16:55:12 -07:00
George Saines
95afb6c4d3 playing with FPS 2014-10-10 16:55:09 -07:00
Nick Winter
629827f133 Fixed onAnnotationClick handler message. 2014-10-10 13:36:13 -07:00
Nick Winter
7f9fdc7253 Fixed temporarily locking of items. 2014-10-09 19:59:57 -07:00
Nick Winter
a0ad5efba2 Some improvements for exhortation of tunic donning in The Raised Sword. 2014-10-09 19:54:39 -07:00
Matt Lott
37ac9f1a69 Fix highlight error when opening browser tools 2014-10-09 17:55:38 -07:00
Nick Winter
7487df5af8 Point out (and require) equipping of necessary items for first set of levels. Can now drag items to unequip. 2014-10-09 15:54:18 -07:00
Gkntos
e9f0b9f67a Update es-ES.coffee 
Some changes tu un-transaleted phrases.
:)
 2014-10-09 14:01:01 -05:00
Nick Winter
413e99b6ae Merge pull request #1654 from Imperadeiro98/patch-1 
Update victory.jade
 2014-10-09 10:14:34 -07:00
Nick Winter
45471b8030 Fix for streaming new serialized Aethers into worlds where their Thangs hadn't existed before. 2014-10-09 09:53:57 -07:00
Imperadeiro98
cc5a2508d9 Update victory.jade 
Corrected some i18n errors.
 2014-10-09 14:29:48 +01:00
George Litos
f88c889e8f Greek translation update 2014-10-09 12:59:31 +03:00
Matt Lott
b6f37694e1 Autocomplete line endings for javascript 
Fixes #1651
 2014-10-08 14:23:13 -07:00
Nick Winter
f9409488ff Fixed a bug with jerky camera udpates due to dropped frames and camera updating before positions update. Fleshed out default level scripts. Tweaked style on Dropper code. 2014-10-08 12:38:23 -07:00
Nick Winter
589c3b090c Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map. 2014-10-08 10:46:10 -07:00
Nick Winter
c6b398aae2 Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure. 2014-10-08 09:46:56 -07:00
Nick Winter
fcd174ed22 Re-enabled line-by-line highlighting through brute force for hero levels. 2014-10-07 22:28:53 -07:00
Matt Lott
1108159603 Enable updated autocomplete 
Bug fixes for incorrect autocompletes such as “this.this.moveRight()();”
Reducing suggestions to just level snippets to make it more beginner
friendly.
 2014-10-07 15:13:43 -07:00
Nick Winter
ff467d1f31 Don't play a selection sound when adding a Thang. 2014-10-07 12:04:55 -07:00
Nick Winter
5261a7d4d9 Snap to integer meters in the level editor when holding shift. 2014-10-07 10:41:16 -07:00
Nick Winter
ef3edfcc08 Optimization for not rebuilding LevelSession defaults once a second to set playtime. 2014-10-07 10:06:41 -07:00
Nick Winter
67ed73a01f Probably don't need this; it doesn't appear to be storing the NaNs. 2014-10-06 22:29:54 -07:00
Nick Winter
e04a0f33a1 Fixed bug recording level playtime. 2014-10-06 18:55:10 -07:00
Nick Winter
8fdd2c0688 Redid my bobbing fix b286b24 in a way that doesn't break the LankBoss position test. 2014-10-06 18:18:39 -07:00
Nick Winter
ea25224c1e Moved popover navigation fix of #1603 from initialize's link handler to Router's closeCurrentView method. 2014-10-06 18:09:27 -07:00
Nick Winter
c9b01af21c Merge pull request #1603 from ThatOtherPerson/dismiss-popovers 
Fix #1602
 2014-10-06 18:06:32 -07:00
Nick Winter
f9b510aac1 Merge pull request #1645 from kaktycc/patch-2 
Update ru.coffee
 2014-10-06 17:58:37 -07:00
Nick Winter
e6339d68a1 Fixed merge conflicts. 2014-10-06 17:57:47 -07:00
Nick Winter
04939ea690 Merge pull request #1643 from AbnerZheng/patch-2 
Update zh-HANS.coffee
 2014-10-06 17:52:11 -07:00
Nick Winter
dfdcf66f4b A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance. 2014-10-06 17:46:22 -07:00
Scott Erickson
f00fd66bed Fixed displaying raster image thangs in the thang editor. 2014-10-06 16:22:21 -07:00
Nick Winter
b286b24f27 Fixed bobbing. Increased LayerAdapter cleanup vengeancy. Allow dragging without snapping when playback is at the end. 2014-10-06 15:04:42 -07:00
Nick Winter
0fefd627fa Fixed COPPA toggle. 2014-10-06 15:04:42 -07:00
Nick Winter
d6b7616f15 Updated keyboard shortcut symbols. 2014-10-06 15:04:42 -07:00
Matt Lott
efa1f7c4a3 Disable Google+ on login modal for IE 
This is causing script errors in IE10.
 2014-10-06 13:38:08 -07:00
Nick Winter
31056933e9 Added volume control to world map. 2014-10-06 10:17:55 -07:00
Nick Winter
63f518e7c6 Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements. 2014-10-06 10:17:55 -07:00
Evgenii
77f66d1e1b Update ru.coffee 2014-10-04 14:06:59 +04:00
Matt Lott
530da639d8 Removing css background-position-x usage 
Not supported in Firefox or Opera.
 2014-10-03 16:02:50 -07:00
Matt Lott
33055ca0b5 Fix IE9 world map game control button images 
Fixes #1625
 2014-10-03 15:39:33 -07:00
Matt Lott
49cf206be7 Border-image fallback for world map level buttons 2014-10-03 15:24:43 -07:00
Scott Erickson
b78c91997c Tweaked associating lanks with layers. 2014-10-03 12:06:04 -07:00
Scott Erickson
3da0ea9d72 Fixed labels and marks not properly updating in the level editor. 2014-10-03 12:00:08 -07:00
Scott Erickson
e504932e5e Added yet another fine tuning of camera movement in the level editor. 2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at. 2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Scott Erickson
df1c72d132 Fixed normalCanvas styling in the level editor. 2014-10-03 09:59:54 -07:00
Scott Erickson
ca9c387964 Fixed singular sprite animations frame ordering. 2014-10-03 09:51:07 -07:00
Scott Erickson
67bd01b397 Fixed a bug where SegmentedSprite would sometimes error out (particularly the door on death). 2014-10-03 09:36:47 -07:00
Scott Erickson
64acbe4580 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-03 09:11:12 -07:00
AbnerZheng
6f0d3fa6e3 Update zh-HANS.coffee 
method是不是要统一成法术？  暂时翻译成了方法，如有出入，请告知。
 2014-10-04 00:03:57 +08:00
Nick Winter
0c09a468c7 Fixed skipping through real-time playback to fire when the final goals are actually ready. 2014-10-02 17:49:14 -07:00
Scott Erickson
d02d58ed4e Improved the LayerAdapter to more accurately adjust its size downward if it renders a spritesheet, handle when a single thang is too large, and cancels in-progress async builds if a new one starts. 2014-10-02 17:38:50 -07:00
Nick Winter
3cdb8ff416 Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map. 2014-10-02 17:21:06 -07:00
Scott Erickson
5bb1275cea Tweaked how movie clips are animated and copied from, sidestepping how adding children from movie clips removes them from the movie clips, and making inheritence fully recursive. 2014-10-02 16:55:03 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Scott Erickson
6bd6b2eea2 Tweaked when and how we shift the bounds of imported sprites. For things like Anya, especially Anya's attack, it wasn't working correctly. 2014-10-02 16:54:58 -07:00
Nick Winter
abf28c2c19 Fixed bug with world deserialization missing state batches. 2014-10-02 15:33:23 -07:00
Scott Erickson
987061cec6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3 moving the level dots to fit the dungeon world map 2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259 Messing with the scaling on the dungeon map. 2014-10-02 14:05:18 -07:00
Nick Winter
5c2b03d245 Propagated i18n. 2014-10-02 12:12:51 -07:00
Nick Winter
16ff8c6601 Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails. 2014-10-02 12:10:24 -07:00
Imperadeiro98
9c97abe6d0 Update pt-PT.coffee 2014-10-02 19:39:23 +01:00
Nick Winter
62fa133075 Merge pull request #1612 from kaktycc/patch-1 
Update ru.coffee
 2014-10-02 11:25:50 -07:00
Nick Winter
47c4ab700a Propagated i18n. 2014-10-02 11:24:16 -07:00
Nick Winter
285264ceb4 Skip past hero selection if hero has already been selected. 2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e Made sure all dots are invisible by default. 2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 09:28:31 -07:00
Nick Winter
40b61c32f2 Linked iPad preview video from teacher's page. 2014-10-02 01:20:45 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a Added new slot icons and dungeon map. 2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f Unlocked all levels again until we can figure out the achievement timing problems. 2014-10-01 17:02:04 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
0290db9cd4 Starting to try to get iPad to work during real-time playback. 2014-10-01 12:08:14 -07:00
Nick Winter
5dd7c3ffa1 Adding some iPad event publishing optimizations. Fixed #1623. 2014-10-01 10:58:19 -07:00
Nick Winter
dce47f6570 Merge pull request #1611 from ClashTheBunny/patch-1 
Rough translations of more phrases to Bulgarian
 2014-10-01 09:11:59 -07:00
Nick Winter
4c1448e818 Merge pull request #1610 from enricpc/patch-2 
Update ca.coffee
 2014-09-30 22:10:07 -07:00
Nick Winter
cbad8d30da Merge pull request #1608 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-30 22:09:35 -07:00
AbnerZheng
74398c43f9 Update zh-HANS.coffee 2014-10-01 11:51:24 +08:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -07:00
Nick Winter
2611e441d7 Trying to standardize sass imports in an effort to test #1615, to no avail. 2014-09-30 16:17:54 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00
Scott Erickson
19e6b9d095 Fixed real-time placement of normal canvas, and brought the stop-real-time-playback-button on top of it. 2014-09-30 14:25:44 -07:00
Scott Erickson
bab7598ce0 Fixed an error wizard sprites were having. 2014-09-30 14:01:29 -07:00
Scott Erickson
ffdb2ef6b4 Fixed position updating for indie sprites. 2014-09-30 14:01:20 -07:00
Scott Erickson
c05cc1c0ad Fixed text box pointers being cut off from caching. 2014-09-30 14:00:47 -07:00
Scott Erickson
528383c0dc Undid the attempted optimization of having the normal stage update half as often. 2014-09-30 13:45:15 -07:00
Scott Erickson
90e21c6085 Did some more missed refactorings from sprite -> lank. 2014-09-30 13:44:03 -07:00
Scott Erickson
34cf6240c1 Refactored heroSprite -> heroLank, replaced a call to LankBoss.spriteFor with LankBoss.lankFor. 2014-09-30 13:41:42 -07:00
Scott Erickson
4a6e8018e4 Fixed choosing the first frame for segmented sprites. 2014-09-30 13:34:55 -07:00
Scott Erickson
b3ae258bed Fixed some issues with the thang editor. 2014-09-30 13:34:44 -07:00
Scott Erickson
8f29d0ee7f Did some tweaking of UserView to handle slugs for ids. 2014-09-30 10:53:01 -07:00
Scott Erickson
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -07:00
Matt Lott
169e5614d6 Merge pull request #1613 from codecombat/feature/browser-support 
Browse support updates
 2014-09-30 10:23:28 -07:00
Scott Erickson
6b03de0235 Merge branch 'master' into feature/webgl 2014-09-30 10:21:51 -07:00
Matt Lott
405c21cba4 Clean up sync world running GoalManager creation 2014-09-30 10:15:33 -07:00
enricpc
eebbe8a130 Update ca.coffee 2014-09-30 15:41:44 +02:00
kaktycc
3b4ceeca3d Update ru.coffee 2014-09-30 14:54:17 +04:00
Matt Lott
8f85e37713 Fix for main thread GoalManager creation 
Using @shared.goalManager.constructor was yielding an incomplete
GoalManager in IE9.

Also fixing up console.debug in CocoModel for IE10 and earlier.
 2014-09-29 17:31:58 -07:00
Matt Lott
1e864d49e2 Box2D in own script, rename Vector 
Renaming Vector to Box2DVector to avoid naming collisions when
including Box2D on the main thread.  There may be a way to change how
scripts are built and included to avoid this rename, but it wasn’t
obvious.

Box2D declares a Vector in the global namespace, which conflicts with
the CodeCombat Vector.
 2014-09-29 12:48:58 -07:00
George Saines
fcd943aa46 adding the teacher's page first draft for HoC 2014-09-29 11:47:40 -07:00
Scott Erickson
b06cd12c5c Some more optimizations, this time in LankBoss update operations. 2014-09-29 11:47:12 -07:00
Scott Erickson
ce9a7e2ed4 Improved performance of the non-webgl stage. 2014-09-29 10:18:27 -07:00
Randall Mason
45daffc2f3 Rough translations of more phrases to Bulgarian 
They should be looked over for grammar and spelling mistakes.
 2014-09-29 16:52:45 +03:00
enricpc
26c4271736 Update ca.coffee 2014-09-29 12:34:47 +02:00
Matt Lott
136af8a0b4 Fixes for world simulation without Web Workers 
Primarily for IE9, which is still blocked by box2d issues with these
changes.

Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.

Work in progress.
 2014-09-28 23:24:18 -07:00
Scott Erickson
326057a816 Fixed another bug from the refactoring. 2014-09-28 14:16:56 -07:00
Scott Erickson
b65b553f2d Fixed some tests broken from the refactoring. 2014-09-28 14:04:01 -07:00
Scott Erickson
f081d9ed4b Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again. 2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Scott Erickson
024cd9c955 Fixed a bunch of tests, and a child animations bug from the MovieClip pooling optimization. 2014-09-28 10:33:24 -07:00
Scott Erickson
6d595705f2 Made the placeholder color and shape different for each layer. 2014-09-26 16:15:44 -07:00
Scott Erickson
8234db333e Reenabled text events. 2014-09-26 15:57:24 -07:00
Scott Erickson
b89a6c41a7 Fixed the surface to not restore state until it's done dropping frames. 2014-09-26 15:23:27 -07:00
Scott Erickson
332f4700f6 Fixed the mark toggle equivalency check. This bug was causing the target mark to be turned on repeatedly. 2014-09-26 15:22:46 -07:00
Scott Erickson
f0e879295c Set back up debug marks. 2014-09-26 14:09:44 -07:00
Scott Erickson
f21083acf5 Set back up highlight mark. 2014-09-26 13:58:35 -07:00
Scott Erickson
2505f50eec Set back up selection and target marks. 2014-09-26 13:45:11 -07:00
Scott Erickson
5b9c7dc8a7 Removed layer's cache function (wasn't used before webgl factoring anyway?). Removed TRANSFORM_CHILD layer transform setting. 2014-09-26 13:02:01 -07:00
Scott Erickson
37e9d7bb2d Enabled the Surface's normalStage and all its layers. 2014-09-26 12:45:27 -07:00
Scott Erickson
c1e7423a64 Fixed sprite coloring and the thangtype-not-yet-loaded placeholder. 2014-09-26 12:17:46 -07:00
Imperadeiro98
b0ae4f1ddb Update pt-PT.coffee 2014-09-26 20:11:14 +01:00
Scott Erickson
6f45eee81d Fixed registration points for scaled raster image thang types. 2014-09-26 11:33:07 -07:00
Scott Erickson
be805ff3c1 Update scale and rotation after playing a new action, since with segmented sprites that often means a new image object. 2014-09-26 11:25:36 -07:00
Scott Erickson
627c56dbb5 Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema. 2014-09-26 11:07:01 -07:00
enricpc
e3e84bef73 Update ca.coffee 2014-09-26 15:53:51 +02:00
Nick Winter
cf9cf6f98b Stopped locking levels for now, since the achievements aren't quite unlocking them correctly. 2014-09-26 03:52:57 -07:00
Nick Winter
f0408a85d3 Recommented a couple ca.coffee section headers that aren't started yet. 2014-09-26 03:43:35 -07:00
Nick Winter
dc18438356 Merge pull request #1605 from enricpc/patch-1 
Update ca.coffee
 2014-09-26 03:42:22 -07:00
George Litos
a1cf7823de Merge remote-tracking branch 'upstream/master' 2014-09-26 12:31:23 +03:00
George Litos
4fbacda295 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/el.coffee
 2014-09-26 12:30:55 +03:00
Nick Winter
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -07:00
enricpc
37b04c10cb Update ca.coffee 2014-09-26 09:44:10 +02:00
Matt Lott
c50b443eca IE9 compat: css fixes 
Linking to bless-brunch git for fixes that blocked bless from splitting
app.css into multiple files to address IE9 limits.

sass-brunch version update fixes problems during the css file-splitting
that were messing up nested @media queries.
 2014-09-25 16:17:35 -07:00
Nick Winter
9656fd4f49 Propagated i18n. 2014-09-25 15:58:49 -07:00
Nick Winter
4ca7df0b32 A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet. 2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81 Completed transition to new hero levels. 2014-09-25 15:32:33 -07:00
George Litos
384bd4291e Merge remote-tracking branch 'upstream/master' 2014-09-26 01:05:42 +03:00
George Litos
d83e06ee46 updated greek translation 2014-09-26 01:05:28 +03:00
Nick Winter
b7d2bcd222 Decreased severity of camera jerkiness during real-time playback. 2014-09-25 15:01:06 -07:00
Scott Erickson
8aeb6555ec Added MovieClip pooling, improving WebGL performance. 2014-09-25 14:48:17 -07:00
George Saines
8183d671b8 simplifying the homepage 2014-09-25 14:38:02 -07:00
Scott Erickson
14f3fb6486 Fixed one last instance of cocoSprite using its resolutionFactor value. 2014-09-25 14:03:44 -07:00
Nick Winter
61aa2d8b6f Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code. 2014-09-25 13:29:20 -07:00
Scott Erickson
4b87607599 Fixed animations where the frame stays the same for periods of time. 2014-09-25 13:26:05 -07:00
Scott Erickson
d77b87ed22 Fixed raster thang types, and level destruction. 2014-09-25 13:12:47 -07:00
Scott Erickson
10314b8bfa Fixed sprites often disappearing when idle. 2014-09-25 12:43:51 -07:00
Scott Erickson
d4b1849eaf Fixed one other little thing. 2014-09-25 12:22:33 -07:00
Nick Winter
2ed6b737c2 Added WorldMapView ambient sounds. 2014-09-25 11:37:29 -07:00
Nick Winter
68bb1dc135 Sped up "real-time" playback for the maze levels. 2014-09-25 11:17:04 -07:00
Scott Erickson
8fe2ed4438 Resolved conflicts. 2014-09-25 10:52:36 -07:00
Scott Erickson
06b106f42b Merged from master. 2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef Migrating surface to webgl. It sorta works! 2014-09-25 10:47:53 -07:00
Nick Winter
9fc7fca528 Hooked up real-time playback music. 2014-09-25 10:30:43 -07:00
Nick Winter
9ea24f4c74 Added a workaround for Surface resize failure on realtime playback end that Maksym had seen. 2014-09-25 09:48:14 -07:00
David Beckley
7596b887fd Fix #1602 2014-09-25 09:10:32 -07:00
Nick Winter
867279b6b8 Merge pull request #1600 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-09-25 08:47:44 -07:00
Nick Winter
8bf619359c Uncommented some section headers from #1598. 2014-09-25 08:43:23 -07:00
enricpc
38b84af208 Update ca.coffee 2014-09-25 16:16:32 +02:00
enricpc
56aecbab88 Update ca.coffee 2014-09-25 16:15:28 +02:00
Imperadeiro98
d23e752755 Update pt-PT.coffee 2014-09-25 12:46:06 +01:00
enricpc
5dab9f8226 Update ca.coffee 2014-09-25 09:59:55 +02:00
Nick Winter
c0c436189f Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks. 2014-09-25 00:02:53 -07:00
Nick Winter
cce36333dd Set letterbox during real-time playback. 2014-09-24 22:59:13 -07:00
Nick Winter
cde2acaea1 Disabled clicking spell palette entries for hero levels. 2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10 Hid flags view during real-time playback for non-flag-using levels. 2014-09-24 22:23:14 -07:00
Nick Winter
5e0b42068a Scrubber auto-pauses when dragging from ended position. 2014-09-24 22:12:00 -07:00
Nick Winter
2aa274cb2d Fixed bugs with Surface fast-forwarding too fast on short levels and rewinding non-instantaneously when rerunning. 2014-09-24 22:07:55 -07:00
Nick Winter
b2592aad8c Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle. 2014-09-24 21:01:58 -07:00
Nick Winter
b8d59cb179 Fixed a bug with playback never quite getting to the end. 2014-09-24 20:25:30 -07:00
Nick Winter
6441a753d5 Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better. 2014-09-24 20:15:17 -07:00
Nick Winter
e48fa5f0b7 Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits. 2014-09-24 19:14:22 -07:00
Scott Erickson
358b36c1bf Set up custom graphics to be copied from old spritesheets when possible as well. 2014-09-24 18:47:10 -07:00
Scott Erickson
fb30f07f2e Re-enabled effect marks. 2014-09-24 18:42:04 -07:00
Scott Erickson
91f33e49dc Re-enabled shadows. 2014-09-24 17:52:44 -07:00
Nick Winter
da83fee58f Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values. 2014-09-24 16:58:52 -07:00
Scott Erickson
7f90ed18cc Bunch more work on scaling for everything and hit testing for segmented sprites. Also got health bars working again. 2014-09-24 16:53:38 -07:00
Nick Winter
73d6261b5d Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n. 2014-09-24 16:29:28 -07:00
Nick Winter
83fc88e3b6 Propagated i18n. 2014-09-24 15:49:07 -07:00
Nick Winter
6b6d1d3e74 Changed 'Available Spells' to 'Your Skills' in hero levels. 2014-09-24 15:48:18 -07:00
Matt Lott
db525a8073 Fix IE restricted property check 2014-09-24 15:46:53 -07:00
Nick Winter
53ddf0159d Preloaded previous/next heroes in ChooseHeroView. 2014-09-24 15:39:51 -07:00
Nick Winter
a786b1e096 Changed world map to click on iPad, hover otherwise. 2014-09-24 15:21:39 -07:00
Nick Winter
ada65cc290 Lowered master volume temporarily until per-sound instance volumes are fixed. 2014-09-24 15:06:22 -07:00
Nick Winter
dbb3efb6e6 Merged es-419 commits from TitoGa and infoholico. 2014-09-24 14:22:27 -07:00
Nick Winter
a1ed2d4323 Fixed a few typos in es-419.coffee. 2014-09-24 14:17:25 -07:00
infoholico
005d83929f Update es-419.coffee 
Hello, that's my first contribution, but I have to clear something:

    Javascript_blurb: "El lenguaje de la web. Usado en sitios y aplicaciones web, juegos en HTML5, y servidores."
    python_blurb: "Simple pero poderoso, Python es un grandioso lenguaje de programación para uso general."
    coffeescript_blurb: "Mejor JavaScript."
    clojure_blurb: "Un Lisp moderno."
    lua_blurb: "Para Juegos."
    io_blurb: "Simple pero oscuro."

No son exactamente literales  pero traté de que entraran en el espacio asignado.

These are not literal translations but I tried to made them fit into the given space.

What language should I use to communicate with you?

Thanks.
 2014-09-24 16:35:27 -04:30
Matt Lott
b3a841e814 IE10 compatibility: adding console.debug 
Support for console.debug was added in IE11
http://msdn.microsoft.com/en-us/library/ie/dn265066(v=vs.85).aspx
 2014-09-24 13:11:55 -07:00
Juan Santiago Lucaras Cammisuli
e8d36547c9 Update es-419.coffee 2014-09-24 16:24:33 -03:00
Matt Lott
73e49f9972 IE11 compatibility fixes 
Removing social share buttons from base if IE, except Facebook.
Unrolling restricted property setting loop (weird).
Updating isIE check to support IE11.
 2014-09-24 12:17:13 -07:00
Scott Erickson
6669a01c14 Got rid of some cache functions. Set up area of effect animations in the new spriteSheet system. 2014-09-24 12:08:55 -07:00
Nick Winter
f4cee11ebe ThangsTabView letting you position spike walls on top of walls. 2014-09-24 12:02:45 -07:00
Nick Winter
2d7341224e Uncommented some section headers for ca.coffee. 2014-09-24 11:31:09 -07:00
Nick Winter
c420119212 Merge pull request #1593 from enricpc/patch-1 
Update ca.coffee
 2014-09-24 11:29:37 -07:00
Imperadeiro98
aa6db88718 Update pt-PT.coffee 2014-09-24 19:15:52 +01:00
Imperadeiro98
ed30b7b569 Update pt-PT.coffee 2014-09-24 19:14:09 +01:00
Scott Erickson
c49f894ef2 Refactored SPRITE_PLACEHOLDER_RADIUS to SPRITE_PLACEHOLDER_WIDTH. 2014-09-24 10:55:33 -07:00
james616616
85ad253b80 Update zh-HANT.coffee 2014-09-25 01:35:17 +08:00
Nick Winter
94838af17f Fixed scroll bars messing up inventory view. 2014-09-24 09:38:45 -07:00
Scott Erickson
2cbe498f9a Fixed scaling for singular sprites for all cases. 2014-09-24 09:37:49 -07:00
enricpc
3d07dfb14c Update ca.coffee 2014-09-24 17:39:38 +02:00
Driphter
db61249ac7 Added support for 'codeLanguage' when setting the 'favoriteLanguage' 2014-09-24 02:57:54 -04:00
Nick Winter
8d6b23274b Zoom in on hero during real-time playback. 2014-09-23 22:10:18 -07:00
Nick Winter
225fd0ca18 Moved world map level info to click from hover. 2014-09-23 19:12:05 -07:00
Nick Winter
5397c51819 Fixed world-threatening typo. 2014-09-23 18:59:08 -07:00
Nick Winter
019f634d9f Respecting coordinates setting. 2014-09-23 18:39:52 -07:00
Nick Winter
e493855578 Hiding spell tab hover docs for plan(). 2014-09-23 18:32:07 -07:00
Nick Winter
7b15ecfab2 Improved comment visibility. 2014-09-23 18:29:04 -07:00
Nick Winter
af6e770c30 Changed name of Stop button to Skip in real-time playback. 2014-09-23 18:23:28 -07:00
Nick Winter
71810569dd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-23 18:21:32 -07:00
Nick Winter
c1023b137f Better pointing out of submit button when victory is ready. 2014-09-23 18:21:27 -07:00
Nick Winter
a6473c2cf3 Merge pull request #1588 from ThatOtherPerson/add-quotes 
Add some more quotes for #710
 2014-09-23 17:54:56 -07:00
David Beckley
f27c13e6eb Propagate i18n 2014-09-23 17:48:02 -07:00
David Beckley
8d7ed040af Add more quotes for #710 2014-09-23 17:46:02 -07:00
Nick Winter
a57cc0126e A few more tweaks for #1584. Hero victory now always goes to world map. 2014-09-23 17:13:41 -07:00
Nick Winter
1a46d4345d Merge pull request #1584 from ThatOtherPerson/log-user-ips 
Log last-used IP in User object
 2014-09-23 17:10:00 -07:00
Imperadeiro98
ba4d53e92b Update pt-PT.coffee 2014-09-23 21:37:08 +01:00
Scott Erickson
16cb596a12 Set up scaling and mouse events for segmented sprites with container actions. 2014-09-23 12:08:50 -07:00
Nick Winter
e109cbbbdc Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels. 2014-09-23 11:39:56 -07:00
Scott Erickson
5de5d5658e Working on SegmentedSprite mouse events, hit tests and scaling. 2014-09-23 11:37:05 -07:00
Nick Winter
33080e5a65 Fixed #1586. 2014-09-23 10:56:52 -07:00
Nick Winter
00e2fc99a2 Fixed some issues with the sample code. 2014-09-23 08:58:23 -07:00
Nick Winter
6a8d3082f3 Propagated i18n. Added a fallback for cast button for now until the new run button can be translated. 2014-09-23 08:08:29 -07:00
Daniel James Smith
2bdcdbe2a8 Updated German translations 2014-09-23 15:37:39 +02:00
Nick Winter
f3511a5dde Fixed another bug with loading heroes between levels. 2014-09-22 23:01:19 -07:00
Nick Winter
b0ee2224ae Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping. 2014-09-22 22:26:09 -07:00
Nick Winter
8640369b26 Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor. 2014-09-22 21:50:48 -07:00
Nick Winter
149848c971 Fixed temporary item restrictions. 2014-09-22 20:44:45 -07:00
Nick Winter
1b4e75e7e8 Fix for earned achievement default null worths. Misc other fixes. 2014-09-22 20:15:51 -07:00
Nick Winter
786820e056 Fixed drag and drop for hero inventory. 2014-09-22 16:12:55 -07:00
Nick Winter
ec548fa33a AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison. 2014-09-22 16:09:27 -07:00
Nick Winter
a79976e6a2 Bigass 'Stop' button in lower right during real-time playback. 2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
David Beckley
2acebb54c6 Fix #1005 2014-09-21 23:02:06 -07:00
Nick Winter
42b52f5593 No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization. 2014-09-21 22:10:52 -07:00
Nick Winter
6cb8a2a019 Hero always centered in camera in new hero levels when playing and not panning to drag. 2014-09-21 20:49:45 -07:00
Nick Winter
600e985259 Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected. 2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af Showing goals on level loading view. 2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e Press Start to begin playing levels. Fixed #1574. 2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce Fixed a bug with hero placeholder loading. Improved game menu modal close button usability. 2014-09-21 13:26:56 -07:00
Nick Winter
389f6fb9c1 Pre-assigning and limiting owned items based on level for now. 2014-09-21 11:24:37 -07:00
Nick Winter
e1790d5159 Restored item comparison in InventoryView, now o'ertop the hero. 2014-09-21 09:53:58 -07:00
Nick Winter
4cdff02a32 Implemented most of new inventory view. 2014-09-20 23:11:51 -07:00
David Beckley
bee779c3c8 Propagate locale 2014-09-20 16:17:36 -07:00
Nick Winter
9f6e1e081c Using language choice from ChooseHeroView. 2014-09-20 16:04:13 -07:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
ae7a2dfe6a Testing out the new comment preservation in locale files. 2014-09-20 09:17:10 -07:00
Imperadeiro98
7a4b1c01ed Update pt-PT.coffee 2014-09-20 08:53:18 +01:00
Nick Winter
0a5e1a4b03 Propagated i18n. 2014-09-19 22:17:06 -07:00
Nick Winter
e3b75a69ea Working on PlayLevelModal and ChooseHeroView. 2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93 Fixed a few misc bugs I noticed with the job profiles. 2014-09-19 22:16:05 -07:00
Scott Erickson
39b6b9ef84 Couple remaining refactoring tidbits for the new LayerAdapter. 2014-09-19 15:46:37 -07:00
Scott Erickson
3b7ce76d7d Refactored WebGLLayer and SpriteContainerLayer/ContainerLayer into a single LayerAdapter class that has a Container or SpriteContainer. 2014-09-19 15:46:02 -07:00
Scott Erickson
cc7c65115c Renamed WebGLLayer to LayerAdapter. 2014-09-19 14:59:29 -07:00
Scott Erickson
fbbfb6c0cc Refactored WebGLSprite to SegmentedSprite and SingularSprite, and refactored renderStrategy (container/spriteSheet) to spriteType (segmented/singular). 2014-09-19 14:56:40 -07:00
Scott Erickson
3c9b40e8f4 Set up placeholders for when WebGLSprites don't have their raw data built yet. Not finished yet because of scaling, but will come back to it... Got some refactoring to do first. 2014-09-19 13:50:14 -07:00
George Litos
43d027df45 Update el.coffee 
typographic and grammatical errors fix
 2014-09-19 23:37:16 +03:00
keenanjohnson
bb8f5c41ba #53 Adding more names 2014-09-19 13:25:48 -05:00
Nick Winter
ec21637adf Showing the new hero levels instead of the old campaign levels on the /play-hero map. 2014-09-19 11:03:38 -07:00
Nick Winter
6a5f8b810b Fixed an issue with infinite loops polling workers who weren't working. 2014-09-19 08:11:08 -07:00
Nick Winter
121ff0a4af Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now. 2014-09-18 18:25:33 -07:00
Nick Winter
791c23c7e7 Fixed #1573. 2014-09-18 16:39:50 -07:00
Nick Winter
8042f27ba7 Added the rest of the custom TreemaNodes to the SystemsTabView as well. 2014-09-18 15:26:06 -07:00
Nick Winter
8e17a54dc3 Fixed not being able to add properties in the Systems tab Treemas. 2014-09-18 15:13:17 -07:00
Scott Erickson
a99cdfb957 WebGLLayer now recycles previous sprite sheets, speeding up rendering additional thang types or animations. 2014-09-18 14:36:05 -07:00
Scott Erickson
cc76458942 Normalized the container renderStrategy resolution so that both renderStrategies are the same. 2014-09-18 13:18:44 -07:00
Scott Erickson
c7279e68a8 The whole WebGL system now dynamically renders needed frames when actions it doesn't support get activated. 2014-09-18 12:19:52 -07:00
Scott Erickson
0404b94e5e WebGLSprites of all types no longer display anything at all if their required data hasn't been rendered. 2014-09-18 11:56:49 -07:00
Scott Erickson
b1784a1207 Had apparently switched the SpriteBoss tests to use a regular Stage instead of a SpriteStage. Switched it back, and fixed a subsequent bug with the Layer responding to Camera events (apparently SpriteStage does not take regX/Y or scaleX/Y into account). 2014-09-18 11:12:18 -07:00
Scott Erickson
0b948d4a1e Got the SpriteBoss to handle removing sprites again. 2014-09-18 10:03:13 -07:00
Matt Lott
3209e4f838 Add loop statement to JavaScript and Python 2014-09-18 09:47:29 -07:00
Scott Erickson
63758acd2e Fixed some tests when run on karma. 2014-09-18 09:46:02 -07:00
Scott Erickson
f77f229b09 Fixed rotation not being updated after a new SpriteSheet is built. 2014-09-18 09:03:33 -07:00
Nick Winter
5ddbbe7707 Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting. 2014-09-18 08:12:46 -07:00
Nick Winter
689a4241d4 Final Criss-Cross tournament results. 2014-09-17 22:37:34 -07:00
Nick Winter
95e37fa3b2 Starting new front view (at /front for now) and play view (at /play-hero for now). 2014-09-17 18:56:08 -07:00
Scott Erickson
5fe9a02c06 WebGLLayer now re-renders itself at a lower resolution if it's too big. 2014-09-17 17:08:24 -07:00
Scott Erickson
61a25c5693 Merged conflicts. 2014-09-17 16:53:12 -07:00
Scott Erickson
5af1741333 Merged conflicts. 2014-09-17 16:53:08 -07:00
Scott Erickson
dd81d1d5bc Container renderings are now dependent on resolution. 2014-09-17 16:49:31 -07:00
Scott Erickson
dbfbddeb5d Added a test to make sure the WebGLLayer ended up with the right number of children after multiple renderings. Fixed something that was breaking WebGLLayer and WebGLSprite tests. 2014-09-17 16:06:23 -07:00
Scott Erickson
7387248ffd Initial integration of SpriteBoss with the WebGLLayer and all else. 2014-09-17 15:47:25 -07:00
Nick Winter
d96d0d65f3 Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits. 2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9 Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs. 2014-09-16 20:19:52 -07:00
Nick Winter
687da38667 Made some performance optimizations that all relate to messing with walls in the level editor. 2014-09-16 17:31:00 -07:00
Scott Erickson
1ef3d150a8 Integrated WebGLLayer and WebGLSprite with CocoSprite. 
Disabled some features in CocoSprite that'll have to be added back later.
Moved more logic from CocoSprite, like determining registration points for a given animation, to WebGLSprite.
WebGLSprite can now display either rendering containers or SpriteSheets.
 2014-09-16 15:36:59 -07:00
Nick Winter
c3573b2fbd Adding more error handling for George's inventory saving problems. 2014-09-16 15:22:49 -07:00
TitoGa
aeea0a54af Update es-419.coffee 
Happy to help. The only liberty that i took was to change the provided example name on 266 from Nick Winters to Max Powers, as a reference to The Simpsons, episode S10E13. (=^B)
 2014-09-16 16:27:44 -03:00
Nick Winter
a700b7844f Added a bit of error handling for weird equipment error we were seeing. 2014-09-16 11:13:03 -07:00
Nick Winter
54f56162e9 Place Electrowalls over other walls. 2014-09-16 10:30:27 -07:00
Nick Winter
0a29a374e1 Changed the way numbering works on collect goals. 2014-09-15 17:01:34 -07:00
Nick Winter
925588dfc2 Extended team-based goal completion to collection and leaving sides goal types. 2014-09-15 16:49:08 -07:00
Nick Winter
89aa930803 Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio. 2014-09-15 15:38:07 -07:00
Nick Winter
9acb3670c1 Fixed error when deleting in level editor with nothing selected. 2014-09-15 15:24:11 -07:00
Nick Winter
6176a8f6cb Wall dragging no longer conflicts with wall clicking. 2014-09-15 15:23:09 -07:00
Scott Erickson
9ba11e2354 Got the WebGLSprite to work with nested MovieClips. 2014-09-15 15:08:02 -07:00
Nick Winter
8acaea3d6a Drag walls to place them continuously. 2014-09-15 14:54:21 -07:00
Nick Winter
5f1e9e7e4b Made Plans attach second-to-last always. 2014-09-15 14:06:26 -07:00
Scott Erickson
8e401d6853 Merge branch 'master' into feature/webgl 2014-09-15 13:53:58 -07:00
Scott Erickson
a633f6f82f Built most of the WebGLSprite. 2014-09-15 13:53:20 -07:00
Nick Winter
589268dc4f Fixes for initializing Hero Placeholder Components. 2014-09-15 13:15:18 -07:00
Nick Winter
6ac56030e8 Fixed bug with systems not being addable. 2014-09-15 12:45:10 -07:00
Nick Winter
ee3e1fa58c Merge pull request #1561 from Titounkle/patch-5 
Update es-ES.coffee
 2014-09-15 12:40:55 -07:00
Titounkle
c6384eaf10 Update es-ES.coffee 
Ive got a few questions on the word Thang, and employer... I dont know quite well how to translate them to fix good...
Hope we finish it soon :)
 2014-09-15 21:32:26 +02:00
Imperadeiro98
562a033f46 Update pt-PT.coffee 2014-09-15 20:13:42 +01:00
Nick Winter
d2491dba4f Disabled autocast even more. 2014-09-15 11:56:29 -07:00
Nick Winter
87cde17650 Propagated i18n. 2014-09-15 10:24:13 -07:00
Nick Winter
1f8f5ce8f3 Merge pull request #1554 from djsmith85/i18n 
Added i18n-tags in admin.jade and community.jade and updated the locale ...
 2014-09-15 10:22:29 -07:00
Daniel James Smith
a0fb51ae94 Updated the German translations 2014-09-15 18:57:09 +02:00
Daniel James Smith
3dd888469e Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly 2014-09-15 18:36:45 +02:00
Nick Winter
1d75a9ead3 Uncommented some pt-BR section headers. 2014-09-14 17:13:03 -07:00
Nick Winter
612eccd209 Merge pull request #1551 from gutierri/master 
Translation and corrections to existing translations
 2014-09-14 17:12:01 -07:00
AmyLaPazza
b9be6215ea Added translations 
Translated Lines 193,196 and 267.
 2014-09-14 19:09:22 +02:00
Gutierri Barboza
b00b48450d translation section account 2014-09-14 00:48:36 -03:00
Gutierri Barboza
4d7c0f24eb standard translation for the same word 2014-09-14 00:44:48 -03:00
Gutierri Barboza
127fce2100 translation pt-BR section user 2014-09-14 00:42:18 -03:00
Gutierri Barboza
f4d1ed8a60 partial translation archievements 2014-09-13 23:08:43 -03:00
Gutierri Barboza
e012ea5bbc wrong word 2014-09-13 22:55:50 -03:00
Gutierri Barboza
1e1f384cd3 translate pt-BR 2014-09-13 22:53:25 -03:00
George Saines
4053da3693 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-12 17:46:49 -07:00
George Saines
32ac3c1f95 updating contributor pages 2014-09-12 17:46:44 -07:00
Scott Erickson
c96f5d7bcf Merge branch 'master' into feature/webgl 2014-09-12 16:33:39 -07:00
Scott Erickson
08bdcb2cb6 Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it. 2014-09-12 16:33:01 -07:00
Nick Winter
7a76e9ac77 Fixed a couple formatting issues in es-ES. 2014-09-12 10:22:32 -07:00
Titounkle
9d731ae80e Update es-ES.coffee 2014-09-12 19:06:49 +02:00
Gutierri Barboza
7ac09d09f3 translation pt-BR 2014-09-12 13:31:50 -03:00
Nick Winter
d3245948e2 Sorting addable Thangs in a sensible order. 2014-09-11 13:34:15 -07:00
Michael Schmatz
c08c279f8b Removed net neutrality banner 2014-09-11 16:13:06 -04:00
Nick Winter
e9968b648f Fixed bugs with click coordinates messing up mouse-down targeting. 2014-09-11 13:05:31 -07:00
Nick Winter
d5542ffbbc Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open. 2014-09-11 11:24:06 -07:00
George Saines
11a734b001 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-11 11:08:29 -07:00
George Saines
040b901e41 removed merge junk 2014-09-11 11:08:25 -07:00
Nick Winter
9eb0dbc625 Fixed bug with creating new levels. 2014-09-11 10:50:23 -07:00
George Saines
b81288cf52 changing volume for some SFX 2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a trying to change SFX volume 2014-09-11 09:59:50 -07:00
Nick Winter
8c37fabe79 Merge pull request #1537 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-11 08:45:36 -07:00
Nick Winter
35e1931fc3 Merge pull request #1534 from Titounkle/patch-3 
Update es-ES.coffee
 2014-09-11 08:43:59 -07:00
Nick Winter
ba554f3ff0 Fixed some indentation from #1532. 2014-09-11 08:43:36 -07:00
Nick Winter
0990a45802 Merge pull request #1532 from lukigno95/patch-1 
Update it.coffee
 2014-09-11 08:41:19 -07:00
Nick Winter
68808d0e07 Some fixes for how audio is triggered. 2014-09-11 08:38:30 -07:00
Imperadeiro98
74afea5efa Update pt-PT.coffee 2014-09-11 14:38:11 +01:00
Nick Winter
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
Imperadeiro98
10132c6fd1 Update pt-PT.coffee 2014-09-10 11:02:01 +01:00
Nick Winter
0b1f4ebada Fixed two extra spaces in DE localizations. 2014-09-09 18:58:04 -07:00
djsmith85
19d3a6cc9f Updated German translations (de-DE & de-AT) 
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
 2014-09-10 02:57:47 +02:00
Titounkle
d9ee5c248d Update es-ES.coffee 
Number 219 im not quite sure...I'll think about it.
 2014-09-09 18:43:28 +02:00
Michael Schmatz
b35a0161e8 Inserted Battle For The Net banner 2014-09-09 12:34:30 -04:00
Nick Winter
2396f9c26d Updates to go along with latest iPad app spell palette loading. 2014-09-08 21:40:52 -07:00
lukigno95
fa7f827fcb Update it.coffee 2014-09-09 01:10:24 +02:00
Nick Winter
dd2cdf3ef9 Fixed bugs with forking ThangTypes. 2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74 Workaround for missing document.location inside child window in Windows Chrome. 2014-09-08 14:31:52 -07:00
Nick Winter
8dad2bf12d Fixed some typo. 2014-09-08 14:26:17 -07:00
Scott Erickson
6c12384fe9 Reenabling on surface mouse moved. 2014-09-08 14:13:19 -07:00
Nick Winter
eb4293fee5 Temp: ThangTypes don't require kind. 2014-09-08 13:02:39 -07:00
Nick Winter
6ed89a2d79 Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView. 2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb Fixed typo in spell palette event. 2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
40c37a8be1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-07 20:48:36 -07:00
Nick Winter
6ac8dc1d2d Merge pull request #1531 from gutierri/master 
more translations of phrases
 2014-09-07 20:47:57 -07:00
Nick Winter
4908cb4d0a Merge pull request #1529 from MajkPascal/patch-2 
Polish translation
 2014-09-07 20:47:38 -07:00
Nick Winter
25334d59a0 Merge pull request #1527 from Titounkle/patch-2 
Update es-ES.coffee
 2014-09-07 20:46:51 -07:00
Nick Winter
68812eef0a Fixed a couple types in new ar.coffee. 2014-09-07 20:41:47 -07:00
Gutierri Barboza
9f6870130f more translations of phrases 2014-09-07 23:18:35 -03:00
MajkPascal
f20b963a2b Polish translation 2014-09-07 21:31:46 +02:00
Titounkle
ff3b718bf2 Update es-ES.coffee 2014-09-07 19:59:58 +02:00
CodeIter
35382ff57c update ar 
another trans.
 2014-09-07 13:20:15 +01:00
CodeIter
fb7509612f ترجمة- translate 
it 's too hard to complete it now.
however  google translate is very useful (most translation from google are good but it always need a human verification.that 's because it 's hard to complete it)
 2014-09-07 11:54:53 +01:00
Nick Winter
19720c38be Propagated i18. 2014-09-06 19:57:03 -07:00
Nick Winter
75538a158e Merge pull request #1523 from Imperadeiro98/patch-3 
Level editor fixes
 2014-09-06 19:56:22 -07:00
Nick Winter
18114af2a3 Merge pull request #1521 from Imperadeiro98/patch-2 
Update pt-PT.coffee
 2014-09-06 19:56:01 -07:00
Nick Winter
067b32dfbf Merge pull request #1520 from Imperadeiro98/patch-1 
Fixed a typo
 2014-09-06 19:55:26 -07:00
Nick Winter
df131ca90a Merge pull request #1519 from keenanjohnson/master 
Added Potion Master names for #53
 2014-09-06 19:55:02 -07:00
Nick Winter
78a0568594 Merge pull request #1518 from Titounkle/patch-1 
Update es-ES.coffee
 2014-09-06 19:53:37 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Imperadeiro98
c6f6282ae1 Update edit.jade 
Fixed some errors
 2014-09-06 17:32:01 +01:00
Imperadeiro98
253b0dc35c Update en.coffee 
Added "Documentation"
 2014-09-06 17:31:24 +01:00
Imperadeiro98
8ada8c3a88 Update pt-PT.coffee 2014-09-06 10:41:01 +01:00
Imperadeiro98
66451b6ef0 Fixed a typo 2014-09-06 10:18:16 +01:00
keenanjohnson
d79fc4c62f Added Potion Master names for #53 2014-09-05 20:18:05 -05:00
Titounkle
0246bc8070 Update es-ES.coffee 
He hecho algunos cambios, pero no se muy bien como trabajais esto ya que es la primera vez que me involucro en github, basta con quitar el # de delante de las cosas que vayamos traduciendo o hay que marcarlas de alguna otra manera??

Un saludo
 2014-09-05 22:51:39 +02:00
Nick Winter
8de75024fc Implemented placeholders for a bunch of sound triggers. 2014-09-05 13:04:05 -07:00
kotvaska
0383b2ce2b Update ru.coffee 2014-09-05 12:49:23 -07:00
Nick Winter
ddddc44651 Fixed en-GB.coffee. 2014-09-05 12:49:23 -07:00
Scott Erickson
64ea670ebd Reorganized the Surface into groupings. Changed no logic, just shuffled things around. 2014-09-05 09:21:00 -07:00
Nick Winter
ca8df87f8a Propagated i18n. 2014-09-05 09:13:09 -07:00
Nick Winter
88144024c4 Updated about page i18n. 2014-09-05 09:12:05 -07:00
Nick Winter
14b50f8b57 Merge pull request #1517 from Imperadeiro98/patch-1 
Updated i18n
 2014-09-05 09:02:52 -07:00
Nick Winter
5b3dc75d86 Merge pull request #1515 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-05 08:50:05 -07:00
Imperadeiro98
319b9a3400 Update about.jade 
Updated some i18n (it is also needed to add line 42, 45-47, 56)
 2014-09-05 09:25:32 +01:00
Imperadeiro98
2c2811fc25 Update en.coffee 
Removed redundant code and updated some i18n
 2014-09-05 09:24:08 +01:00
Nick Winter
9604ed8508 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 20:10:36 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
George Saines
d1f6b6ef51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 16:59:52 -07:00
George Saines
0beb34e3db redoing the about page 2014-09-04 16:59:46 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Imperadeiro98
aeafc6b648 Update pt-PT.coffee 2014-09-04 21:26:38 +01:00
Scott Erickson
fca9a92167 Flattened the queries the NewAchievementModal creates. 2014-09-04 11:17:07 -07:00
Scott Erickson
ef8342efdd Refactored the achievement schema, un-nesting definitions and bringing the query operator into force. 2014-09-04 11:17:06 -07:00
Nick Winter
8c45e22741 Protection and logging for #1463. Fixed an issue with spectate camera script bounds. 2014-09-04 11:04:23 -07:00
Scott Erickson
bfae70ef13 Added a close button to the game menu modal. 2014-09-04 10:03:34 -07:00
Nick Winter
b1de5e0045 Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.) 2014-09-03 19:19:04 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
1094487072 Fixed #1511 2014-09-03 17:47:29 -07:00
Scott Erickson
65c0d74a79 Added a new searchStrings property to level components to improve their search. 2014-09-03 17:33:10 -07:00
Scott Erickson
7fb89a9e7e Making the thangs column in the level editor hidden by default again. 2014-09-03 17:27:19 -07:00
Scott Erickson
f519df6189 Wrapping up work on the folderized thangs treema in the level editor. 2014-09-03 16:51:09 -07:00
Nick Winter
8f38d57aaa Merge branch 'feature/realtime-multiplayer' 2014-09-03 16:14:58 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Scott Erickson
9439f0d47d Some tweaks and fixes to the folderized thangs in the level editor. 2014-09-03 15:38:57 -07:00
Scott Erickson
0cc593e3ac Thangs tab now maintains the order of thangs independently of how thangs are reorganized into folders. 2014-09-03 15:38:57 -07:00
Nick Winter
24a2373d54 Fixed editor config change event schema. 2014-09-03 13:08:09 -07:00
Scott Erickson
e1abf115f7 Folderizing thang types in the level editor. 2014-09-03 12:30:08 -07:00
Nick Winter
c1a7b70849 Missed committing part of previous fix. 2014-09-03 10:58:43 -07:00
Scott Erickson
975c6ad2a6 Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid. 2014-09-03 09:33:21 -07:00