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
