Commit graph

5044 commits

Author SHA1 Message Date
Nick Winter
62280bdf7e Merge branch 'master' into production 2014-09-23 10:57: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
Nick Winter
4956fdf1ea Merge pull request #1585 from djsmith85/german-translation
Updated German translations
2014-09-23 07:56:06 -07:00
Daniel James Smith
2bdcdbe2a8 Updated German translations 2014-09-23 15:37:39 +02:00
Nick Winter
9e73bf52e8 Merge branch 'master' into production 2014-09-22 23:06:54 -07: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
b9bd3c6388 Merge branch 'master' into production 2014-09-22 20:16:12 -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
c54bf3553f Added basic JSONP support for /auth/whoami public properties. 2014-09-22 14:56:02 -07:00
Nick Winter
bf0013ea0a Merge branch 'master' into production 2014-09-22 14:05:23 -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
Nick Winter
7b8333be71 Merge branch 'master' into production 2014-09-21 22:19:11 -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
e8a222e6bd Merge branch 'master' into production 2014-09-21 20:20:12 -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
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
Nick Winter
4f2daf1a1d Merge pull request #1579 from glls/patch-2
Update el.coffee
2014-09-19 13:59:04 -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