Nick Winter
5fde9e6a64
Merge pull request #1740 from ann304/patch-1
...
Update vi.coffee
2014-11-14 06:59:17 -08:00
sunxb10
1c560511c3
Simplified Chinese translation (zh-HANS)
2014-11-14 18:01:51 +08:00
Nick Winter
01d6c6d239
Stop whole-line selection on gutter clicks.
2014-11-13 10:54:50 -08:00
Nick Winter
05a3577de9
Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.
2014-11-13 10:49:37 -08:00
Imperadeiro98
4c8d959c8a
Update achievements.jade
...
The titles were not being translated.
2014-11-13 17:02:32 +00:00
Nick Winter
29860caeea
Implemented new blue background texture for dialogue messages.
2014-11-12 20:45:15 -08:00
Nick Winter
4fe6fd3020
Some fixes for loading iPad gem products.
2014-11-12 20:21:14 -08:00
Scott Erickson
ed8285248f
Put in the new InventoryModal background.
2014-11-12 18:01:35 -08:00
Scott Erickson
73fee3e801
Added a gems icon to the world map.
2014-11-12 17:19:56 -08:00
Scott Erickson
5b034194ee
Put in the new BuyGemsModal design.
2014-11-12 17:17:24 -08:00
George Saines
50b4e79c7b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-12 16:48:10 -08:00
George Saines
8440f38bd4
added a buy gems icon to the map icon spritesheet
2014-11-12 16:48:05 -08:00
Scott Erickson
07cf741015
Changed the campaign switching icons arrows nested in the campaign maps.
2014-11-12 16:26:35 -08:00
Nick Winter
ba6565395e
Spell palette cool with multiple items offering same skills.
2014-11-12 15:28:08 -08:00
Scott Erickson
025780a575
Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing.
2014-11-12 15:00:24 -08:00
Scott Erickson
6e433e1b77
Filtered out achievement popups for level achievements.
2014-11-12 14:40:01 -08:00
Scott Erickson
1b73569072
Forgot jade != coffeescript.
2014-11-12 14:34:23 -08:00
Scott Erickson
a7d48f4b3c
Tweaked the gems icon to be visible for ipad and admins.
2014-11-12 14:25:34 -08:00
Scott Erickson
913dda65aa
Created the VectorIconSetupModal, a quick way to get portraits aligned to a container.
2014-11-12 14:14:07 -08:00
Scott Erickson
fc3a5de2f2
Tweaked the BuyGemsModal to not need gems from the iPad app.
2014-11-12 12:15:03 -08:00
Nick Winter
26beb8a034
A few improvements to ItemDetailsView formatting to deal with spells granted.
2014-11-12 11:02:05 -08:00
George Saines
047e0c2f41
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-12 11:01:18 -08:00
George Saines
f0a490f21e
adding matt's profile pic for reals
2014-11-12 11:01:12 -08:00
Scott Erickson
9b33ffe5d8
Tweaked the BuyGemsModal to not care if iPad event handling is synchronous or not.
2014-11-12 10:37:09 -08:00
Scott Erickson
a582717bc3
Set up the BuyGemsModal with Backbone events so the iPad can communicate with it.
2014-11-12 10:23:43 -08:00
Scott Erickson
c3eecd15be
Set up the WorldMapView to update the gem count when a player purchases gems or items.
2014-11-12 10:22:56 -08:00
Anton Alexanin
db71f9b528
tab
2014-11-12 21:15:45 +03:00
Anton Alexanin
4a5a4bc305
Some RU translation and fixes.
...
Added and translated "awaiting_levels_adventurer*".
2014-11-12 21:09:38 +03:00
Scott Erickson
ad35109878
Built the BuyGemsModal stub.
2014-11-12 09:40:55 -08:00
Anton Alexanin
af6d4638d0
Uncommented translated lines
2014-11-12 19:28:46 +03:00
Anton Alexanin
990fd0d4e7
Some translation in ru.coffee
2014-11-12 11:55:40 +03:00
Nick Winter
f1947d7d9d
Fixed a couple bugs.
2014-11-11 18:16:45 -08:00
Scott Erickson
7012d5dfbe
Built payment endpoint for processing Apple IAPs.
2014-11-11 17:40:29 -08:00
Scott Erickson
d1d6a734b4
Added handling for bad sprite data.
2014-11-11 17:40:29 -08:00
Nick Winter
0af7b4d5b7
Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories.
2014-11-11 16:37:00 -08:00
Matteo Canu
ebc35ae0cb
Translated more strings
...
Also modified Wizard translation from "stregone" to "mago"
2014-11-11 20:23:52 +01:00
Nick Winter
9a54cb20f3
Merge pull request #1743 from gorechi/patch-1
...
Some russian translations.
2014-11-11 10:40:48 -08:00
Nick Winter
bc4c4353b2
Added a signup button to the level when not logged in.
2014-11-11 08:49:16 -08:00
Nick Winter
c06f226e72
Renaming A Fiery Trap to Back to Back.
2014-11-11 07:57:29 -08:00
Nick Winter
6dcaf05673
Fix for Simulator level loading.
2014-11-11 07:38:39 -08:00
gorechi
f776295944
Update ru.coffee
2014-11-11 17:57:53 +03:00
An Nguyen
86f0910258
Update vi.coffee
2014-11-11 10:37:36 +01:00
Nick Winter
ce04541d3a
Working on tying item purchasability to player level, plus other small tweaks to the item store.
2014-11-10 22:07:55 -08:00
Nick Winter
bc8a51e023
Added a missing file from last commit.
2014-11-10 18:13:36 -08:00
Nick Winter
eab293cb66
Refactored item-details-view styling and shared styles between InventoryModal and PlayItemsView, fixing scrollbars and text overflow issues in the process. Dragging to unequip now updates restrictions again. Worked on pointer cursors for equippable ittems. Hid items not usable by your hero's class. Stopped silhouetted items from being clickable.
2014-11-10 18:13:04 -08:00
Nick Winter
fbbcf2a925
Replayed useful changes from last few InventoryModal commits after big merge.
2014-11-10 16:09:41 -08:00
Scott Erickson
f21f54cd19
Refactored, mostly redesigned inventory view, modeled after the Heald item store design.
2014-11-10 15:31:32 -08:00
Nick Winter
ffea887330
Revamped real-time playback behavior to kick in on Thornbush Farm. Added a Done button until then.
2014-11-10 15:16:28 -08:00
Nick Winter
3d8f16cd7f
Fixed #1717 with a brilliant LevelLoader refactoring.
2014-11-10 14:48:39 -08:00
Nick Winter
25f157f201
Merge pull request #1738 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-11-10 12:53:09 -08:00
Nick Winter
52ac9446c8
Added a new file.
2014-11-10 12:52:17 -08:00
Nick Winter
d8dfc0a2b3
Fixed some bugs with LevelSetupManager and inventory. Moved hard-coding of level-specific options to a new LevelOptions config file. Fixed a couple minor bugs.
2014-11-10 12:47:24 -08:00
Imperadeiro98
ae61a9d78e
Update pt-PT.coffee
2014-11-10 19:49:53 +00:00
Matt Lott
e253795665
Removing stray test console.log
2014-11-10 11:09:07 -08:00
Matt Lott
c5b26a4376
A/B test experimental languages hero select
...
Test group not shown experimental languages on first hero select.
2014-11-10 11:08:21 -08:00
Nick Winter
97c4ff2e7e
Made flag detection more dynamic.
2014-11-10 10:51:46 -08:00
Nick Winter
956186b538
Fixed #1604 : changing languages and reloading work better now.
2014-11-10 09:36:40 -08:00
Nick Winter
ab448532f5
Fixed bug in achievement popup listing wrong xp left values.
2014-11-10 08:31:26 -08:00
Nick Winter
f78ff257ab
Several improvements to behavior of pointing out next levels.
2014-11-10 08:21:28 -08:00
Nick Winter
563c886bdd
Hide the play button on the inventory screen until the items have fully loaded.
2014-11-10 07:49:30 -08:00
Matt Lott
a3d88eb975
Update a/b test tracking data
...
cast button text was missing group
auto first level and cast button text didn’t need action property
2014-11-09 21:47:51 -08:00
Matt Lott
9c6485b142
A/B test automatically starting first level
...
When loading the world map, if user hasn’t already started it.
2014-11-09 21:33:50 -08:00
Nick Winter
85471badaa
Added callout to become an Adventurer on disabled levels.
2014-11-09 21:27:03 -08:00
Nick Winter
111b9febac
Updated main.html. Removed LinkedIn.
2014-11-09 20:35:46 -08:00
Nick Winter
9b68f03f75
Propagated i18n.
2014-11-09 20:20:01 -08:00
Nick Winter
44d4d13c93
A few tweaks to the GameMenuModal.
2014-11-09 20:19:12 -08:00
Nick Winter
982e85da52
Linked to new i18n page from Diplomat page.
2014-11-09 20:06:55 -08:00
Nick Winter
9104d202c0
Silenced annoying Simlish for announced actions until we can get shorter, more legit audio in there.
2014-11-09 19:45:38 -08:00
Nick Winter
9b074841d6
Messed around with some of the new modals' scroll bars.
2014-11-09 19:39:09 -08:00
Nick Winter
2e413700dd
Don't uncomplete levels by resetting them.
2014-11-09 18:59:40 -08:00
Nick Winter
00b8a62bfb
Don't need this big ol' worker-xquery.js.
2014-11-09 18:48:56 -08:00
Nick Winter
51d8564aac
Lazily loading FilePicker. Reducing number of web workers used on iPad to try to reduce memory pressure.
2014-11-09 17:35:50 -08:00
Nick Winter
2bafad2932
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-09 16:19:28 -08:00
Nick Winter
ad06000ceb
Fixed three big memory leaks: LevelSetupManagers never being destroyed, wall grid closures retaining Lanks, and real-time-multiplayer:new-opponent-code retaining Spells.
2014-11-09 16:19:18 -08:00
Nick Winter
65017a8d58
Merge pull request #1736 from mcaeiror/master
...
Galician translation complete!
2014-11-09 15:19:13 -08:00
Manuel Caeiro Rodríguez
e3df3f50bb
Update gl.coffee
...
Galician translation complete!
2014-11-10 00:11:47 +01:00
Manuel Caeiro Rodríguez
602b0e4ce9
Update gl.coffee
2014-11-09 23:54:16 +01:00
Manuel Caeiro Rodríguez
9eef4e8951
Update gl.coffee
2014-11-09 22:05:54 +01:00
Manuel Caeiro Rodríguez
9702466f1f
Update gl.coffee
2014-11-09 20:45:43 +01:00
Matt Lott
377138f35f
Hide problem alert on code change
2014-11-09 11:36:17 -08:00
Matt Lott
5741968210
Skip delimiters on Enter
2014-11-09 11:28:03 -08:00
Manuel Caeiro Rodríguez
fcf4aa8ac0
Update gl.coffee
2014-11-09 20:18:03 +01:00
Nick Winter
fb040fd882
Fixed some play subview positioning on iPad.
2014-11-09 08:48:11 -08:00
Manuel Caeiro Rodríguez
bf872f2a96
Update gl.coffee
2014-11-09 15:40:58 +01:00
Manuel Caeiro Rodríguez
012c5d72c3
Update gl.coffee
...
Some more translations
2014-11-09 09:50:20 +01:00
Matt Lott
1f11ad66ed
Play problem alert sound on jiggle
2014-11-08 22:17:14 -08:00
Nick Winter
ab9d5b2171
Merge pull request #1735 from thepulkitagarwal/patch-2
...
Updated names.coffee
2014-11-08 22:04:56 -08:00
Matt Lott
cb49a0395a
Update red pulse background css order
2014-11-08 22:04:10 -08:00
Matt Lott
0d2fe9b6e2
Update error code line background
...
Add title to problem alert dialog
2014-11-08 21:51:58 -08:00
Nick Winter
a628372b1b
Enabled some levels for testing.
2014-11-08 21:50:25 -08:00
thepulkitagarwal
68cf9ec05a
Update names.coffee
2014-11-09 10:24:35 +05:30
Nick Winter
14e8f6a653
Preparing for some of these new levels.
2014-11-08 19:33:00 -08:00
thepulkitagarwal
e24ec1d2ae
Update names.coffee
...
Added a few names
2014-11-09 08:23:04 +05:30
Manuel Caeiro Rodríguez
7f2680de78
Update gl.coffee
...
Some more translations
2014-11-08 21:50:20 +01:00
Nick Winter
b74ad24aa8
A few sass tweaks to problem alerts and level loading.
2014-11-08 11:59:39 -08:00
Nick Winter
f9370532af
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-08 11:51:38 -08:00
Nick Winter
8d81445b84
More improvements to level loading view sizing and unveiling.
2014-11-08 11:51:31 -08:00
Nick Winter
1b94868197
Added new LevelDialogueView. Messed around with dimming a bit more.
2014-11-08 11:39:04 -08:00
Nick Winter
4cb641689c
Increased dimming behavior when parts of the DOM are locked.
2014-11-08 08:58:36 -08:00
Nick Winter
a8700f5113
Reload now shows confirmation modal again. Added some stuff missing from the last commit.
2014-11-08 08:38:25 -08:00
Manuel Caeiro Rodríguez
506109864b
Update gl.coffee
2014-11-08 16:51:53 +01:00
Matt Lott
588fa0620e
Jiggle user code problem alert
2014-11-07 22:46:12 -08:00
Matt Lott
d43fd49d12
Use testGroupNumber in cast button text A/B test
2014-11-07 21:56:49 -08:00
Nick Winter
f3dfcdc81d
Implemented new HUD design. Removed more unneeded stuff. Changed reload button to restart level. Still need restart confirmation and to redo the sprite dialogue area.
2014-11-07 19:15:55 -08:00
Nick Winter
cfff09b01e
Merged big .executing arrow.
2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc
Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things.
2014-11-07 16:04:35 -08:00
George Saines
b0533850db
adding matt's avatar
2014-11-07 15:29:18 -08:00
Scott Erickson
75226be778
Experimenting with a larger currently-executing-line pointer.
2014-11-07 13:58:02 -08:00
Scott Erickson
636a46ff00
Removed my testing code for the GameMenuModal.
2014-11-07 13:05:31 -08:00
Scott Erickson
eecdbdbe17
Minor fix for when changing hero from the world map.
2014-11-07 13:02:48 -08:00
Scott Erickson
a087663458
Implemented Heald's design of the GameMenuModal.
2014-11-07 13:02:28 -08:00
Nick Winter
fbc2799211
Startd to implement new code editor design. Fixed #1732 .
2014-11-07 09:09:13 -08:00
Scott Erickson
e23e6f4ad2
Refactored the names of the play modal files.
2014-11-07 07:04:10 -08:00
Matt Lott
b4dde5705b
Place error message over Surface next to line
2014-11-06 21:43:43 -08:00
Nick Winter
f3e4906810
Merge pull request #1731 from kerradus/master
...
Update RU translation
2014-11-06 19:13:47 -08:00
Nick Winter
03852fb44f
Plannable pickUpFlags support and fixes for playing Coinucopia.
2014-11-06 18:21:54 -08:00
Scott Erickson
424c3a6d3e
Integrated the new PlayHeroesModal into the game, refactoring PlayLevelModal into LevelSetupManager.
2014-11-06 16:23:23 -08:00
Scott Erickson
790dd8e7e0
Enabled the heroes button on the world map.
2014-11-06 16:01:40 -08:00
Matt Lott
1630f7e033
Remove time from problem alert message
2014-11-06 15:03:39 -08:00
Matt Lott
453960b3fb
A/B Run and Submit button text
2014-11-06 14:44:56 -08:00
Dmitry
98a0173bad
Update ru.coffee
2014-11-06 21:40:44 +03:00
Dmitry
546b74ae67
update RU translation
2014-11-06 21:36:54 +03:00
Nick Winter
ce6526863d
Support for hiding optional bonus goals until they are achieved instead of until they are failed.
2014-11-06 08:57:13 -08:00
Nick Winter
26f065370c
Finished adding Galician.
2014-11-06 07:26:00 -08:00
Nick Winter
f48fce2fdf
Merge pull request #1726 from mcaeiror/master
...
To be checked
2014-11-06 07:22:22 -08:00
Imperadeiro98
eb96cc8d86
Update pt-PT.coffee
2014-11-06 15:13:40 +00:00
Nick Winter
fe7e96ab4e
Started restricting common items with APIs that will make it impossible to win certain dungeon campaign levels.
2014-11-05 20:56:17 -08:00
Nick Winter
851bf39c5c
Using extendedName.
2014-11-05 20:22:15 -08:00
Nick Winter
ce8b3bc83c
Added hero components projection for good hero stat comparison bars. Fixed overflow/scrolling on code language selector for play-heroes-modal.
2014-11-05 19:37:13 -08:00
Nick Winter
35f5fd1c84
Hid some buttons that take us to old account/settings/achievements pages for now. Made property documentation popovers chill over to the left.
2014-11-05 19:23:55 -08:00
Scott Erickson
c660053dea
Set up the PlayHeroesModal, and hooked it into the world map.
2014-11-05 19:04:14 -08:00
Nick Winter
c48b155413
Allow rerun of level without a code change.
2014-11-05 18:06:21 -08:00
Nick Winter
36c753a828
Returning executed statement highlighting to deemphasized state when playback has ended.
2014-11-05 17:47:23 -08:00
Nick Winter
aa9c3b5eaa
Fixed iPad scrubber positioning. Reworked spell debug progress stepper to use drags instead of hover. Hiding spell debug progress stepper based on level, not statements executed.
2014-11-05 17:34:56 -08:00
George Saines
b751f5ab22
making the selection in the item store lighter
2014-11-05 16:35:59 -08:00
Nick Winter
f8679dfeca
Hide say() until later levels. Fix bug with identifying correct equipped item ThangTypes in the spell palette.
2014-11-05 15:43:08 -08:00
Nick Winter
46409ef10d
Made goals styling more robust to different sizing scenarios.
2014-11-05 15:06:26 -08:00
Nick Winter
189c3d202c
Goals now show status: 'Running...' while the world is simulating.
2014-11-05 14:42:55 -08:00
Nick Winter
fd36dc9d79
Propagated i18n.
2014-11-05 14:35:02 -08:00
Nick Winter
a73b7df179
Added i18n for some more inventory screen strings.
2014-11-05 14:33:56 -08:00
Nick Winter
184e4c124a
Impossible to select another slot and hide the available item the arrow is requiring you to equip.
2014-11-05 14:17:11 -08:00
Nick Winter
2e3755d2b9
Disabled gem/xp pulse animation on iPad, since it's too slow to do it justice.
2014-11-05 14:07:04 -08:00
Nick Winter
081e1ced20
Killed scroll bars on programming language selection fancy select.
2014-11-05 14:02:49 -08:00
Nick Winter
0e1afff318
No fold widgets in ACE.
2014-11-05 13:53:23 -08:00
Nick Winter
6c15833b70
Removed confusing ThangAvatarView title so as not to disturb beginner players in hero levels.
2014-11-05 13:49:49 -08:00
Nick Winter
478cad02d6
Ability to pass hints to argument errors.
2014-11-05 13:44:28 -08:00
Nick Winter
2afc7c830a
Implemented getHeroStats.
2014-11-05 13:28:54 -08:00
Scott Erickson
0d578c84dc
Merge remote-tracking branch 'origin/master'
2014-11-05 12:23:47 -08:00
Scott Erickson
dc48cab6d1
Added a getHeroStats function stub.
2014-11-05 12:23:34 -08:00
Imperadeiro98
8121ce9704
Update pt-PT.coffee
2014-11-05 19:12:04 +00:00
Nick Winter
6efcbc5ead
Hid Crawlways of Kithgard. A/B testing Haunted Kithmaze vs. The First Kithmaze. Renamed New Sight to Dread Door and awarded its glasses later.
2014-11-05 10:40:37 -08:00
Nick Winter
a2554570b0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-05 07:50:13 -08:00
mcaeiror
c2f2bbcd41
gl.coffee
...
Minor edition
2014-11-05 16:22:25 +01:00
mcaeiror
e9b966de83
Update gl.coffee
...
Some more translations into Galician language
2014-11-05 09:17:58 +01:00
Matt Lott
40506d23a6
Admin growth view
2014-11-04 22:17:49 -08:00
Nick Winter
f461aeca95
Implemented new playback scrubber textures.
2014-11-04 19:03:35 -08:00
Nick Winter
49b8c745a0
New GoalsView background. Be my guest with any text color improvements.
2014-11-04 17:20:58 -08:00
Nick Winter
3a811a05fd
Paying attention to level-specific Allied significantProperty overrides in Hero Placeholder replacement.
2014-11-04 16:09:29 -08:00
Nick Winter
b776350e6a
Made item shop fit on iPad and small screens.
2014-11-04 08:39:36 -08:00
mcaeiror
0937dbe75c
Update gl.coffee
...
First edition of the galician translation. To be checked!
2014-11-04 17:31:24 +01:00
mcaeiror
bb7e516521
Create gl.coffee
...
Translation into Galician
2014-11-04 17:28:47 +01:00
Nick Winter
ff1f9d488c
Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins.
2014-11-04 07:52:23 -08:00
Nick Winter
e7e2acf4db
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-04 07:19:40 -08:00
Nick Winter
9dba7ee187
Temporarily making Wizard/Ranger gear unpurchasable while we have no Wizards or Rangers.
2014-11-04 07:19:30 -08:00
Igzok
98cf74e375
Update fr.coffee
...
Corrections & translations
2014-11-04 12:32:18 +01:00
Nick Winter
bfdc671b1d
Made Open Sans Condensed use small-caps in a bunch of the places it's used as a header font to slightly better match the old font weights of Bangers.
2014-11-03 22:19:43 -08:00
Scott Erickson
2dee00883c
Removed the testing code for the PlayItemsModal.
2014-11-03 20:53:49 -08:00
Scott Erickson
33d14918b0
Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed.
2014-11-03 20:48:59 -08:00
Nick Winter
6db298f03c
Merge pull request #1719 from newick/patch-1
...
corrected incomplete translation
2014-11-03 10:03:04 -08:00
Nick Winter
9ac06fc781
Merge pull request #1718 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-11-03 10:02:33 -08:00
Nick Winter
dd8654f325
Fixed fr merge.
2014-11-03 10:02:01 -08:00
Nick Winter
aa0dda7886
Fixed nb merge.
2014-11-03 09:59:55 -08:00
Nick Winter
447432301d
Turning some links into buttons for iPad.
2014-11-03 09:58:57 -08:00
newick
6ac4edcb12
corrected incomplet translation
2014-11-03 13:39:55 +01:00
Nick Winter
441cf8c339
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-02 18:37:36 -08:00
Nick Winter
75f624c10b
More iPad tweaks. Can now switch back to logging in from signing up. Default to signing up instead of logging in.
2014-11-02 18:36:43 -08:00
Michael Schmatz
60d60f8b49
Add logging out event
2014-11-02 19:02:49 -05:00
Nick Winter
6184171f2d
Pushing playback menu down in accordance with control bar.
2014-11-02 15:22:22 -08:00
Nick Winter
ad2fdb9dde
Working on new Fully Illustrated designs for level play view and iPad interface.
2014-11-02 14:51:01 -08:00
Igzok
499851f878
Update fr.coffee
2014-11-02 17:17:17 +01:00
Igzok
8c7d20efc7
Update fr.coffee
2014-11-02 17:16:56 +01:00
Imperadeiro98
14d488c031
Update pt-PT.coffee
2014-11-02 10:16:08 +00:00
Nick Winter
9ebd09ec40
Analytics tracking individual note group starts/ends. Showing next level arrow faster. Added a couple munchkin names from one of yesterday's playtesters.
2014-11-01 16:59:12 -07:00
Nick Winter
af686f562d
Propagated i18n.
2014-11-01 15:58:14 -07:00
Nick Winter
e2680a3382
Tweaking my tweaks.
2014-11-01 15:57:42 -07:00
Nick Winter
a061ab5148
Some styling and animation tweaks to the level loading screen.
2014-11-01 11:10:26 -07:00
Nick Winter
57544c72a8
Moved Tactical Strike in from the edge of the map so it's a little more clickable on iPad.
2014-11-01 10:22:38 -07:00
Nick Winter
e129faf384
A few tweaks here and there.
2014-11-01 09:35:19 -07:00
Nick Winter
19c7d7b3b8
Schema is more lenient for problem we occasionally see with opponent level sessions not having a submittedCodeLanguage. Play dungeon menu music on levels of undefined terrain type.
2014-10-31 18:05:29 -07:00
Matt Lott
35cba4a90d
Sync PVP status view and bug fixes
...
Pvp status view (temp location and UI)
Remove pvp status from control bar
Add game menu param for jumping into a specific tab
Lots of bug fixing and session state cleanup
Does not address problems with executing real-time multiplayer cast
2014-10-31 16:33:43 -07:00
mcclane653
4edc839657
Update nb.coffee
...
added lots of words ;)
2014-10-31 18:41:20 +01:00
Igzok
ef60f5ab51
Update fr.coffee
...
Severals translations & corrections
2014-10-31 16:13:11 +01:00
Nick Winter
4bc5e5d3ad
Gigantic DOM highlight arrow when animating in. A few more tiny tweaks and bugfixes.
2014-10-30 22:31:40 -07:00
Nick Winter
5bbfb70b49
Made name label font size twice as big.
2014-10-30 22:19:32 -07:00
Nick Winter
cd89198f70
Finished rearranging levels on the dungeon map.
2014-10-30 21:34:49 -07:00
Nick Winter
da3872b0a8
Hooked up new inventory recommendations for new levels.
2014-10-30 20:17:57 -07:00
George Saines
a0775e1bf2
moved the practice levels into position
2014-10-30 19:58:11 -07:00
George Saines
c8e5cdefec
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-30 19:47:29 -07:00
George Saines
bab73531f2
modified the map?
2014-10-30 19:47:24 -07:00
Nick Winter
a69e12fbc2
Updated WorldMapView to new levels.
2014-10-30 19:18:03 -07:00
Nick Winter
01fccf5ab7
Started highlight arrow sound A/B test. Hid more of the HUD when hiding. Support for knowing whether your killer was hurt when firing world:thang-died notes.
2014-10-30 19:18:03 -07:00
George Saines
a1695993db
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-30 19:11:16 -07:00
George Saines
40a2c6bbe8
slightly improving forest map icon
2014-10-30 19:11:12 -07:00
Nick Winter
57680f4a83
Hide HUD until Kithgard Gates.
2014-10-30 16:59:32 -07:00
Nick Winter
fa25cd9c32
Hide real-time playback countdown outside of flag levels. Later we can figure this out dynamically.
2014-10-30 16:21:08 -07:00
Nick Winter
cec8350232
Added Missile ThangType kind and a couple misc hero data tweaks.
2014-10-30 15:56:49 -07:00
Nick Winter
47c090f7c7
Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of.
2014-10-30 13:07:04 -07:00
Igzok
4dd3f1724b
BIG Update fr.coffee
...
BIG Translation ! The most is translated !
2014-10-30 20:24:25 +01:00
Christelle
b971a590cb
Update fr.coffee
2014-10-30 13:19:00 -05:00
Michael Schmatz
da2ca3ec63
Temporarily increased serialization limit for iOS
2014-10-30 14:12:58 -04:00
Imperadeiro98
3c71d9901f
Updated obsolete tip
2014-10-30 17:01:31 +00:00
Imperadeiro98
f0c1730a76
Updated obsolete tip
2014-10-30 17:01:27 +00:00
Nick Winter
7da65dec5b
Including leather boots as required gear better. Labeling 'Your Skills'. Not showing a minus for incomplete goals. Adding script triggers for deleting required sample code.
2014-10-29 22:29:36 -07:00
Nick Winter
9b29e9512f
Fixed GameMenuModal sometimes defaulting a Python player back to JavaScript.
2014-10-29 16:49:37 -07:00
Nick Winter
ea349cfa29
Intermediate query state for heroes while still transitioning from Unit to Hero.
2014-10-29 15:54:51 -07:00
Nick Winter
98fe639010
Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor.
2014-10-29 15:34:04 -07:00
Scott Erickson
a123fb4b08
Changed how goal states are stored in the level session. Once a goal is succeeded, it can't be undone.
2014-10-29 14:04:27 -07:00
Nick Winter
4e931ea031
iPad script debugging help. Not sending speech update events if not needed when clearing speech.
2014-10-29 13:45:04 -07:00
Nick Winter
2e3afa989b
Handling some missing comment template errors better. Fixed equipping builder's hammer before Kithgard Gates. Fixed next level branch button linking.
2014-10-29 12:08:03 -07:00
Nick Winter
83bd8d3834
Enabled Forgetful Gemsmith in the world map.
2014-10-29 11:09:54 -07:00
Nick Winter
696b0ba336
Working around DCM's latest (very old) sploit.
2014-10-29 10:51:34 -07:00
Nick Winter
066fab03a3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-29 10:47:31 -07:00
Nick Winter
efa28b1064
Added some levels to the forest map. Beating levels and returning home now takes you to the proper map.
2014-10-29 10:47:17 -07:00
Scott Erickson
d3192dd373
Fixed a bug where the game menu being auto opened was crashing.
2014-10-29 10:43:05 -07:00
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
Scott Erickson
1888e9ea92
Removed a log.
2014-09-03 08:44:46 -07:00
Scott Erickson
a494d1f2c4
Fixed the walls not updating when they are randomly generated.
2014-09-02 19:47:43 -07:00
Scott Erickson
9af460cf42
Fixed #330
2014-09-02 18:43:24 -07:00
Nick Winter
2c2316fff5
Non-integer frame offsets, okay, sure.
2014-09-02 18:42:41 -07:00
Nick Winter
681cc4656f
Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging.
2014-09-02 18:28:02 -07:00
Nick Winter
6eb23349d0
Center camera when level loaded in level editor.
2014-09-02 18:08:41 -07:00
Scott Erickson
5b57fa5c71
Tweaked the color selection for thang types.
2014-09-02 18:08:18 -07:00
Scott Erickson
621c684c74
Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly).
2014-09-02 17:53:39 -07:00
Scott Erickson
4a100a501a
Fixed a bug with new levels in the level editor.
2014-09-02 17:53:39 -07:00
Nick Winter
5b0e996f93
Think I may have fixed the color group setting issue again.
2014-09-02 17:46:52 -07:00
Nick Winter
23516175d4
Adding default IDs to new goals.
2014-09-02 17:28:45 -07:00
Scott Erickson
3fd9cb89ef
Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly.
2014-09-02 17:26:02 -07:00
Scott Erickson
6394482c34
Unjanking getCurrentView.
2014-09-02 17:07:28 -07:00
Scott Erickson
daca7b54f3
Refactored SystemTabView names, hid the add button in the systems tab.
2014-09-02 16:50:54 -07:00
Nick Winter
fa0f904fbb
Fixed a couple bugs with Achievements not getting schema defaults.
2014-09-02 16:48:16 -07:00
Nick Winter
b20b819a1f
Tweaked a few styles on the ThangsTabView.
2014-09-02 16:43:17 -07:00
Scott Erickson
c70ffbeef5
Fixed onBackground for surface:stage-mouse-down events.
2014-09-02 16:42:03 -07:00
Nick Winter
7f9ac5e573
Fixed a few bugs where default hero level type wasn't getting pulled.
2014-09-02 16:02:30 -07:00
George Saines
e0b49ba2aa
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 15:33:28 -07:00
Scott Erickson
55bac798ee
Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width.
2014-09-02 15:33:23 -07:00
Nick Winter
e02431b26b
Fixed color group saving in Thang editor.
2014-09-02 15:25:00 -07:00
Nick Winter
d8ef2f8596
Made new related achievements open in a new tab in the level editor.
2014-09-02 15:00:14 -07:00
Nick Winter
523cbfd38e
Fixed a typo in the achievements:new event schema.
2014-09-02 14:27:13 -07:00
Nick Winter
ba53cb06fe
Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System.
2014-09-02 14:16:41 -07:00
Scott Erickson
1edf3de651
Fixed double clicking sometimes firing when you're just dragging units around in the level editor.
2014-09-02 14:06:37 -07:00
Scott Erickson
7e627277e1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322
Optimized level serialization a little so that level editing is a bit less painful.
2014-09-02 12:33:34 -07:00
Scott Erickson
13b066f6aa
Fixed not being able to drag thangs around every other attempt.
2014-09-02 11:53:03 -07:00
Nick Winter
4b9bf22e22
Thang editor now sets some default Components when you change the kind of a ThangType.
2014-09-02 11:29:33 -07:00
Scott Erickson
9c841991fd
Added links to the versions modal.
2014-09-02 11:07:58 -07:00
Nick Winter
2c22fdf84e
Merge pull request #1498 from 99133799/patch-1
...
Update ro.coffee
2014-09-01 22:21:11 -07:00
Nick Winter
7af2690c47
Propagated i18h.
2014-09-01 22:20:48 -07:00
Nick Winter
2446227387
Merge pull request #1505 from Imperadeiro98/patch-1
...
Update en.coffee
2014-09-01 22:20:02 -07:00
Nick Winter
af42bafb15
Added default goals. Don't show System versions in the Systems list if they're 0.
2014-09-01 21:58:22 -07:00
Nick Winter
e615dde6e2
Show inventory view now, for hero levels.
2014-09-01 21:10:45 -07:00
Nick Winter
632559f7db
Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'.
2014-09-01 20:53:53 -07:00
Nick Winter
9094c0ce19
Add hero placeholder to terrain generator on hero levels.
2014-09-01 20:22:46 -07:00
Nick Winter
b7d9e7a095
Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs.
2014-09-01 20:07:50 -07:00
George Saines
5f9cc2561a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 16:28:03 -07:00
Nick Winter
6085b70dfc
Fixed a bounds offset issue in the Thang Editor colors tab.
2014-09-01 16:22:04 -07:00
Nick Winter
72eb59b7c3
Fixed a few bugs.
2014-09-01 16:14:50 -07:00
George Saines
b278525785
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 16:14:42 -07:00
Imperadeiro98
a28269c531
Update en.coffee
...
I don't know if is necessary to change something in codecombat / app / templates / play.jade
2014-09-01 23:10:14 +01:00
Nick Winter
195e027b53
Fix for null/undefined objects in the diffs.
2014-09-01 14:27:47 -07:00
George Saines
0aea061275
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 14:26:56 -07:00
George Saines
2a3cecb118
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 14:09:43 -07:00
George Saines
d1eac35a4f
fixed transparency issue with thang image
2014-09-01 14:09:39 -07:00
Nick Winter
6df5ca00b2
Fixed #69 .
2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -07:00
Nick Winter
040ac4ff4e
Fixed bug with black flashes during script playback.
2014-08-31 16:05:21 -07:00
Nick Winter
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
George Saines
495247661b
bringing contribute avatars up to speed
2014-08-31 15:21:30 -07:00
MajkPascal
dc81e0d84b
Update pl.coffee
2014-08-31 22:31:28 +02:00
Nick Winter
9b2ee45a4d
Added DPS to item view.
2014-08-31 12:27:52 -07:00
Nick Winter
ef9a983e30
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
2014-08-31 12:21:25 -07:00
Nick Winter
5f132e55ba
Fixed #1414 . Also started lazily loading certain level editor tabs.
2014-08-30 23:04:45 -07:00
Nick Winter
a284c8eb37
Fixed #1428 .
2014-08-30 21:16:01 -07:00
Nick Winter
aa54cc32d1
Fixed #1458 .
2014-08-30 20:27:58 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
George Saines
6549b4ccc0
updating the diplomat list
2014-08-30 18:51:02 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
a8644d030e
Fixed #1355 .
2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -07:00
Scott Erickson
5f11a5ecca
Selected component in the thang components edit view shows up with a blue header.
2014-08-30 09:47:23 -07:00
Scott Erickson
6f2de166c0
Removed destroying scripts, since they don't have ace editors, and it was causing a bug.
2014-08-30 09:42:13 -07:00
Nick Winter
051f1a77ae
Fixed #1152 .
2014-08-30 09:19:41 -07:00
Nick Winter
1b0346a1b7
Propagated volume label i18n.
2014-08-30 08:24:14 -07:00
Nick Winter
da9bda3e8a
Merge pull request #1501 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-08-30 08:16:52 -07:00
Nick Winter
384d702c4b
Merge pull request #1500 from Imperadeiro98/patch-1
...
Fixed errors
2014-08-30 08:15:41 -07:00
Imperadeiro98
1f86430076
Update pt-PT.coffee
2014-08-30 14:04:31 +01:00
Imperadeiro98
93b1f782aa
Added "Volume" and fixed error
2014-08-30 13:48:36 +01:00
Imperadeiro98
caa372628b
Fixed errors
2014-08-30 13:48:19 +01:00
Tore Haugland
635f0224e4
Updated locale\no with a more common norwegian than a direct translation from English to make it easier to read for all ages
2014-08-30 11:06:10 +02:00
Tore Haugland
41e9778b3c
Updated locale\no with correct letter case on several translations
2014-08-30 10:54:30 +02:00
99133799
ece96bce2a
Update ro.coffee
2014-08-30 10:31:24 +03:00
Nick Winter
e5cf6c340b
Fixed #1140 . I just put it on the home page for now, but later we can put it somewhere where it makes sense.
2014-08-29 23:09:38 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
Nick Winter
40aa95ba16
Fixed #1297 .
2014-08-29 18:07:32 -07:00
Scott Erickson
7a9c53e424
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:04:50 -07:00
Scott Erickson
21e0889a86
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:02:29 -07:00
Nick Winter
cb14149816
Fixed #1286 . Sort of.
2014-08-29 17:52:47 -07:00
Nick Winter
63f2c5db4f
Fixed #1268 .
2014-08-29 17:33:25 -07:00
Nick Winter
b918f5adfb
Fixed #1262 .
2014-08-29 17:18:38 -07:00
Scott Erickson
3f6c9c4f02
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-29 17:12:44 -07:00
Nick Winter
5503b3a2bc
Fixed #1147 .
2014-08-29 17:03:02 -07:00
Scott Erickson
b4d9a787f0
Fixed the rest of the server tests.
2014-08-29 16:28:07 -07:00
Matt Lott
8143d9c5ba
Real-time multiplayers to 'coding' after playback
2014-08-29 15:26:39 -07:00
Matt Lott
92cad5f46f
Real-time multiplayer subscription schemas
2014-08-29 15:10:04 -07:00
Nick Winter
68dcdaf223
A couple achievment/item editor error fixes.
2014-08-29 13:00:11 -07:00
Scott Erickson
434a0c071b
Few more bugs fixed for defaults.
2014-08-29 12:29:42 -07:00
Scott Erickson
2dfe39aafd
Migrated Achievement model's getExpFunction to use the new defaults system.
2014-08-29 12:28:45 -07:00
Scott Erickson
f93ef2005e
Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'.
2014-08-29 11:34:32 -07:00
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Matt Lott
68cca74b43
Real-time multiplayer initial commit
...
Simple matchmaking, synchronous multiplayer PVP, flags!
Rough matchmaking is under the game menu multiplayer tab, for ladder
games only. After creating a 2-person game there, you can exit that
modal and real-time cast to play against each other.
If you’re the first person to cast, you’ll sit at the real-time level
playback view waiting until the other player casts. When they do, you
both should start the real-time playback (and start placing flags like
crazy people).
If in a multiplayer session, the real-time simulation runs the players’
code against each other. Your multiplayer opponent’s name should be up
near the level name.
Multiplayer sessions are stored completely in Firebase for now, and
removed if both players leave the game. There’s plenty of bugs,
synchronization issues, and minimal polish to add before we push it to
master.
2014-08-28 23:34:07 -07:00
Nick Winter
a4b2333fd3
Added Systems documentation. Fixed #1115 .
2014-08-28 22:32:55 -07:00
Nick Winter
124f999bc8
Fixed #1105 . Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
2014-08-28 19:39:46 -07:00
Nick Winter
f74a152942
Fixed #1104 .
2014-08-28 18:55:33 -07:00
Scott Erickson
9406a8c920
Merge branch 'master' into feature/defaults
2014-08-28 17:58:58 -07:00
Scott Erickson
5fd154ca8b
Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed.
2014-08-28 17:57:39 -07:00
Nick Winter
e67b4ae064
Fixed #1090 .
2014-08-28 17:08:05 -07:00
Scott Erickson
74ca7fe0cc
Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.
2014-08-28 17:05:46 -07:00
Scott Erickson
608d114c5c
Fixed metaschemas not being found.
2014-08-28 15:54:05 -07:00
Scott Erickson
8f95ad2787
Fixed a few bugs.
2014-08-28 15:42:46 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Scott Erickson
154b91c753
Changed LevelLoader to always deeply load components and thang types, not just for hero levels.
2014-08-28 15:19:04 -07:00
Nick Winter
0fa5d264f4
Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle.
2014-08-28 14:25:37 -07:00
Nick Winter
107a727d02
Fixed a bug in the WizardSettingsModal being destroyed and still trying to do things.
2014-08-28 14:06:53 -07:00
Nick Winter
f79a2848fd
Fixed #1038 . Focus should now remain on code editor when after clicking on Surface.
2014-08-28 14:00:54 -07:00
Scott Erickson
e3bc9045d1
Couple tweaks.
2014-08-28 13:53:00 -07:00
Scott Erickson
8b056cfb8f
Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.
2014-08-28 11:24:45 -07:00
Nick Winter
1094d09aa5
Fixed #1226 . Fixed #1156 . Fixed two other issues with spectate mode.
2014-08-28 11:23:52 -07:00
Nick Winter
d7ae07c012
Fixed Facebook login bug.
2014-08-28 11:16:55 -07:00
Nick Winter
a471462279
Merge pull request #1497 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-28 10:51:30 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Imperadeiro98
92055aaa21
Update pt-PT.coffee
2014-08-28 18:20:52 +01:00
Scott Erickson
94065a0c4c
Merged conflicts.
2014-08-28 09:59:07 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239
Fixed a bug with old, un-migrated level-set-playing events in button handlers.
2014-08-28 09:52:51 -07:00
Nick Winter
a50f6b9224
Fixed a bug with reloading non-writable code.
2014-08-28 09:41:47 -07:00
Nick Winter
a39097b366
Fixed #1494 .
2014-08-28 09:29:38 -07:00
Nick Winter
ec6b3d7e5f
Fixed #1481 . More Mediator schema fixes.
2014-08-28 09:27:42 -07:00
Nick Winter
28431703f5
Fixed #953 .
2014-08-27 22:23:24 -07:00
Nick Winter
02255044e3
Fixed #847 . Fixed some subscription schemas.
2014-08-27 18:43:17 -07:00
Scott Erickson
bcffc5811f
Migrated the Level populating of component and system config defaults to the new Treema utility method.
2014-08-27 18:17:47 -07:00
Nick Winter
cd3bf4d0db
Fixed a few bugs.
2014-08-27 18:05:18 -07:00
Nick Winter
2ef7bff2c5
Fixed #886 .
2014-08-27 17:54:16 -07:00
Scott Erickson
7bdfcb4313
Fixed pasting component configs into the thang component config treema.
2014-08-27 17:29:28 -07:00
Nick Winter
92b29915e2
Finished fixing #841 .
2014-08-27 17:26:56 -07:00
Nick Winter
3f16aaab61
Fixed a few more Backbone Mediator event validation issues.
2014-08-27 16:31:44 -07:00
Rikard Gehlin
7aa1a4112a
Update sv.coffee
2014-08-28 00:08:43 +02:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Scott Erickson
ac2c39a266
Fixed an infinite loop bug in CoordinateGrid.
2014-08-27 09:49:37 -07:00
djsmith85
8b80ac5c44
Added a few German translations
...
Added translations to de.coffee and synced them with de-DE.coffee and
de-AT.coffee.
2014-08-27 11:28:23 +01:00
Nick Winter
6ff01f7deb
Fixed #814 .
2014-08-26 18:11:35 -07:00
Nick Winter
871cd4b3c9
Fixed #784 .
2014-08-26 17:34:00 -07:00
Scott Erickson
607a2a133f
Made the SuperModel a little bit more clever about handling duplicate loaded models, hopefully fixed #1108 .
2014-08-26 16:46:23 -07:00
Scott Erickson
98752159ca
Made the SuperModel a little bit more clever about handling duplicate loaded models.
2014-08-26 16:31:53 -07:00
Nick Winter
1864cb09bc
Fixed #712 . Fixed a bug with listing files/musics in admin files view due to removed trailing slashes.
2014-08-26 15:42:33 -07:00
Scott Erickson
f1bf160755
Fixed merge conflict.
2014-08-26 15:42:03 -07:00
Scott Erickson
5d804c6d9a
Fixed merge conflict.
2014-08-26 15:41:59 -07:00
Scott Erickson
162aa7633e
Fixed the component and system settings treema, clearing out defaults for properties not being edited.
2014-08-26 15:40:51 -07:00
Nick Winter
a5c18a4140
Fixed #453 .
2014-08-26 15:22:13 -07:00
Nick Winter
50ad453345
Fixed #169 .
2014-08-26 14:34:23 -07:00
Scott Erickson
ab669739a6
Fixed a bug with the thang component edit view: labels of new components not showing up.
2014-08-26 14:15:21 -07:00
Nick Winter
7300c4b3b8
Finished removing grid from playback options menu.
2014-08-26 14:00:03 -07:00
Nick Winter
35b107cf58
Refactored grid. Fixed #158 .
2014-08-26 13:56:57 -07:00
Scott Erickson
2f72aa4f47
Fixed adding new components in the thang components edit view.
2014-08-26 13:48:57 -07:00
Scott Erickson
39d0df5153
Fixed name ordering in the thang components editor.
2014-08-26 13:27:17 -07:00
Scott Erickson
5b5bceda3a
Components tab now incorporates components inherited from thang types.
2014-08-26 13:08:56 -07:00
Nick Winter
3e9adf6b1a
Fixed issue with IndieSprites no longer coloring properly.
2014-08-26 12:39:30 -07:00
Nick Winter
a5912c8e40
Merge pull request #1490 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-26 11:34:58 -07:00
Nick Winter
741139db59
Apparently GitHub ids are integers, not strings.
2014-08-26 11:34:33 -07:00
Nick Winter
38dcb7fcef
Fixed #5 .
2014-08-26 11:29:16 -07:00
Imperadeiro98
5dde2572ff
Update pt-PT.coffee
2014-08-26 19:15:50 +01:00
Scott Erickson
ef8ca9874a
For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default.
2014-08-26 10:28:01 -07:00
Scott Erickson
fb06e58201
Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties.
2014-08-26 10:14:36 -07:00
Scott Erickson
3b6de071f7
Getting rid of a debug line.
2014-08-26 09:55:59 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f
Bunch of fixes to the thang component edit view.
2014-08-26 09:48:33 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Nick Winter
397fc02d6c
Realized we still needed nav.editor. Propagated i18n.
2014-08-26 08:20:31 -07:00
Nick Winter
898bb69477
Added missing Countdown Screen file.
2014-08-26 08:18:06 -07:00
Nick Winter
51bc98665a
Removed more old editor root page bits. Like #1486 but keeping the editor titles.
2014-08-26 08:16:29 -07:00
Nick Winter
6c8051bd48
Merge pull request #1487 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-08-26 08:07:33 -07:00
Imperadeiro98
32de00a87f
Update user_home.jade
...
Fixed some errors.
2014-08-26 10:33:00 +01:00
Imperadeiro98
203dc19ee2
Update pt-PT.coffee
2014-08-26 10:31:25 +01:00
Imperadeiro98
732a9b3762
Update pt-PT.coffee
2014-08-26 10:24:14 +01:00
Nick Winter
e666ee1dac
Added stop playback button and real-time countdown screen.
2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea
Bunch of fixes to get the level editor working again.
2014-08-25 20:34:46 -07:00
George Saines
ea3ade5bbc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-25 20:27:54 -07:00
George Saines
f5790907a1
removing editor page
2014-08-25 20:27:50 -07:00
Nick Winter
6fb0073eae
Fixed harmless Wizard startup animation error.
2014-08-25 16:15:34 -07:00
Nick Winter
e48b218533
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
2014-08-25 15:39:47 -07:00
Nick Winter
6eab4ff7a6
Code language nodes that want to skip JavaScript now can.
2014-08-25 14:35:51 -07:00
Nick Winter
9df0cfb93f
A few changes to flags UX.
2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83
Merge branch 'master' into feature/defaults
2014-08-25 13:00:33 -07:00
Nick Winter
e278f3ecb4
Merge branch 'stream'
2014-08-25 09:11:57 -07:00
Nick Winter
ac3f1647e4
Merge pull request #1480 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-25 08:29:50 -07:00
Nick Winter
08f2ee248b
No longer constructing SpellViews for non-readable methods.
2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07
A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in.
2014-08-24 21:39:34 -07:00
Nick Winter
f8ddc17a9f
Merge pull request #1482 from ZephyrSails/master
...
Update zh-HANS.coffee
2014-08-24 20:51:28 -07:00
Nick Winter
1a7e4554f0
Fixed a few minor bugs.
2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129
Add flag cursor and pending flags.
2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934
Fixed a couple bugs. Flags are now colored.
2014-08-24 12:33:46 -07:00
Scott Erickson
297b3e3e63
Last schema refactoring.
2014-08-24 11:19:44 -07:00
Imperadeiro98
4da9b470ab
Update pt-PT.coffee
2014-08-24 09:03:25 +01:00
Nick Winter
be07f9cfb9
Many improvements to real-time streaming and flags.
2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc
Rudimentary flag buttons are in.
2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651
Sending flag history to the World for to make flag Thangs during simulation.
2014-08-23 17:26:56 -07:00
Scott Erickson
78a4000e34
Refactoring defaults in schemas.
2014-08-23 16:06:41 -07:00
Scott Erickson
0721b49216
Refactoring defaults.
2014-08-23 15:51:59 -07:00
Nick Winter
2e23247521
Fixed #811 , a bug where you could pause the world if you clicked on a letterboxed playback scrubber.
2014-08-23 14:55:58 -07:00
Nick Winter
8777a87774
Made a real-time playback button.
2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669
Full-screen playback during real-time mode.
2014-08-23 13:54:52 -07:00
Nick Winter
f2adb7ec7f
Skipping serialization/deserialization of needless Programmable clones.
2014-08-23 11:16:02 -07:00
Scott Erickson
4520c0f2b6
Merge branch 'master' into feature/defaults
2014-08-23 11:08:54 -07:00
Scott Erickson
7d797b9cd9
Removed duplicate goal schemas from the deprecated script goal properties.
2014-08-23 11:08:27 -07:00
Scott Erickson
1c5db3f2b7
First round of getting the site to use the new defaults system, in particular the job profile view.
2014-08-23 11:07:52 -07:00
Nick Winter
0431f70954
Improved Surface playback fast-forwarding.
2014-08-23 09:52:05 -07:00
Nick Winter
92b70ae833
Propagated i18n. Fixed #1478 .
2014-08-23 08:45:14 -07:00
Nick Winter
4e87dc5e46
Uncommented es units header.
2014-08-23 08:32:22 -07:00
Nick Winter
c1aa147f41
Merge branch 'patch-1' of git://github.com/mugenryuk/codecombat into mugenryuk-patch-1
2014-08-23 08:31:55 -07:00
Nick Winter
d70f86b166
Merged conflicting ru translations.
2014-08-23 08:31:17 -07:00
Nick Winter
9b86ccd6d1
Merge pull request #1461 from bonkboykz/patch-1
...
Update ru.coffee
2014-08-23 08:27:55 -07:00
Nick Winter
9c0869e566
Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!
2014-08-22 21:35:08 -07:00
Nick Winter
6fee881efd
Fixed a few more issues with playback.
2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73
Fixed some wonkiness with the playback scrubbing while streaming worlds.
2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1
World streaming is getting there!
2014-08-22 14:59:32 -07:00
Scott Erickson
e7dd88498d
Made more clear when thang types and level thangs are missing dependencies.
2014-08-22 14:52:35 -07:00
Nick Winter
611ecbf470
Fixed many issues with world streaming.
2014-08-22 12:39:29 -07:00
Scott Erickson
f15135efe1
Fixed a terrible bug.
2014-08-22 11:40:31 -07:00
Scott Erickson
e200889f0b
Initial refactoring to use the new version of Treema.
2014-08-22 11:11:05 -07:00
Imperadeiro98
c0c3879bb1
Fixed typo
2014-08-22 13:15:47 +01:00
Nick Winter
9b31e28536
More improvements to world streaming.
2014-08-21 21:23:45 -07:00
Nick Winter
bd380e4a09
World streaming is starting to work!
2014-08-21 17:30:46 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Scott Erickson
76b08f35bb
Removed duplicate goal schemas from the deprecated script goal properties.
2014-08-21 15:44:51 -07:00
Scott Erickson
9a116d81be
Fixed a few forms around the site to properly handle pressing enter.
2014-08-21 12:49:06 -07:00
Xiu Zhiping
3178abab05
Han(s) translation
2014-08-22 00:19:06 +08:00
Nick Winter
7b3fe0a3fb
Merge pull request #1470 from ZephyrSails/patch-1
...
zephyer's change
2014-08-21 08:37:46 -07:00
Imperadeiro98
c0a5e1d646
Update pt-PT.coffee
2014-08-21 09:46:40 +01:00
Xiu Zhiping
71058474b3
zephyer's change
...
does this part of work changed to HANs & HANt?
2014-08-21 10:56:38 +08:00
Nick Winter
4889cc4e62
Moved achievement and contribute images from public to assets.
2014-08-20 19:00:39 -07:00
Nick Winter
3755cb9d66
Fixed some bugs with sprite layer ordering.
2014-08-20 18:57:33 -07:00
mugenryuk
c362024536
Update es.coffee
2014-08-20 16:13:40 -05:00
Nick Winter
28fb435bfe
Merge pull request #1454 from logicomPL/patch-1
...
Update pl.coffee
2014-08-20 14:12:49 -07:00