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 |
|
Nick Winter
|
db9230b1b2
|
Merge pull request #1582 from ThatOtherPerson/fix-copy-comments
Fix regex for capturing category names
|
2014-09-20 16:25:03 -07:00 |
|
David Beckley
|
bee779c3c8
|
Propagate locale
|
2014-09-20 16:17:36 -07:00 |
|
David Beckley
|
9210f6ef72
|
Fix regex for capturing category names
|
2014-09-20 16:16:23 -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 |
|
Nick Winter
|
bd3b5c43a5
|
Merge pull request #1580 from ThatOtherPerson/copy-comments
Fix issue #1472
|
2014-09-20 09:11:49 -07:00 |
|
Nick Winter
|
85cf345f78
|
Merge pull request #1581 from Imperadeiro98/patch-1
Update pt-PT.coffee
|
2014-09-20 08:46:05 -07:00 |
|
Imperadeiro98
|
7a4b1c01ed
|
Update pt-PT.coffee
|
2014-09-20 08:53:18 +01:00 |
|
David Beckley
|
983bb5a90c
|
Allow for multiple categories with the same tags
|
2014-09-19 23:05:35 -07: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 |
|
David Beckley
|
624684f9c8
|
Try to conform to guidelines
|
2014-09-19 19:25:33 -07:00 |
|
David Beckley
|
71569d61e0
|
Fix issue #1472
|
2014-09-19 18:34:11 -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
|
2183b7dac1
|
A couple other minor tweaks to a test suite.
|
2014-09-19 15:00:45 -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 |
|
Nick Winter
|
4f2daf1a1d
|
Merge pull request #1579 from glls/patch-2
Update el.coffee
|
2014-09-19 13:59:04 -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 |
|
Nick Winter
|
4689659533
|
Merge pull request #1578 from keenanjohnson/master
#53 Adding more names
|
2014-09-19 11:30:44 -07: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
|
bbb6300f1f
|
Merge pull request #1576 from ThatOtherPerson/fix-misnaming
Renamed sendUnauthorizedUser to sendForbiddenError
|
2014-09-19 08:19:42 -07:00 |
|
Nick Winter
|
40227e32e5
|
Merge branch 'ThatOtherPerson-unpublished_playable'
|
2014-09-19 08:17:41 -07:00 |
|
Nick Winter
|
d610b1633f
|
A bit more CoffeeScripty on the style. Fixes #1558.
|
2014-09-19 08:17:30 -07:00 |
|
Nick Winter
|
c2d81c3f32
|
Merge branch 'unpublished_playable' of git://github.com/ThatOtherPerson/codecombat into ThatOtherPerson-unpublished_playable
|
2014-09-19 08:12:20 -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 |
|
David Beckley
|
527c1ed79d
|
Fix issue #8
|
2014-09-19 03:52:34 -07:00 |
|
David Beckley
|
b9a511155e
|
Remove sendUnauthorizedError, as it merely returned the same value (HTTP 403) as sendForbiddenError
|
2014-09-19 02:26:18 -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
|
7fb261f577
|
Removed some unnecessary expectations.
|
2014-09-18 12:22:54 -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
|
7db73a5ddf
|
Fixed a test.
|
2014-09-18 11:12: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
|
f2765e05b0
|
Added some explanations for the SpriteBoss test setup.
|
2014-09-18 11:04:16 -07:00 |
|
Scott Erickson
|
0b948d4a1e
|
Got the SpriteBoss to handle removing sprites again.
|
2014-09-18 10:03:13 -07:00 |
|