Nick Winter
|
4b9c7a3784
|
Fixed bug with sprites being offset incorrectly when starting with an action not in their ThangType.
|
2014-03-15 11:31:12 -07:00 |
|
Nick Winter
|
7b1f8d1114
|
Merge pull request #547 from jayant1992/master
Improved panning and zooming for editor
|
2014-03-15 08:05:02 -07:00 |
|
Nick Winter
|
8276dbf2d1
|
Merge branch 'loading-view'
|
2014-03-14 19:44:33 -07:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
fc7d403785
|
Fixed two bugs with destroying sprites.
|
2014-03-14 17:15:07 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|
Michael Schmatz
|
357b73be93
|
Fixed bug in next game button, fixed wizard positions
|
2014-03-14 16:14:35 -07:00 |
|
Jayant Jain
|
ece932595c
|
Enables drag-panning for editor and region chooser
|
2014-03-14 23:57:00 +05:30 |
|
Jayant Jain
|
d8418f7bb2
|
Fixes issue where panning occurs upon mouse scroll at max/min zoom
|
2014-03-14 23:57:00 +05:30 |
|
Nick Winter
|
795bd8f63b
|
Moved Glen from Archmages to About.
|
2014-03-13 18:27:08 -07:00 |
|
Nick Winter
|
42a8862fa9
|
Merge pull request #541 from dkundel/master
Easy use of coordinates as discussed in #10 and minor fixes
|
2014-03-13 18:05:04 -07:00 |
|
Nick Winter
|
8b572f0647
|
Using isThang instead of instanceof Thang.
|
2014-03-13 17:59:17 -07:00 |
|
Nick Winter
|
e2d2e96cf5
|
Fixed several bugs with Thang selection and the SpellView and HUD.
|
2014-03-13 15:35:28 -07:00 |
|
Nick Winter
|
9d8b8e7395
|
Probably too mean to tell users that their password is wrong three times, so just once will do.
|
2014-03-13 10:27:32 -07:00 |
|
Nick Winter
|
c8103154a9
|
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
|
2014-03-13 09:02:19 -07:00 |
|
Nick Winter
|
2d848b4cce
|
Merged some conflicts.
|
2014-03-13 08:39:53 -07:00 |
|
Nick Winter
|
4ad0fba860
|
Merge pull request #537 from jayant1992/master
UI and UX improvements to editor
|
2014-03-13 07:07:13 -07:00 |
|
Nick Winter
|
10e4bc737a
|
Merge pull request #534 from Shrihari/fix-grid-toggle
Fix Grid Toggle consistency
|
2014-03-13 06:50:56 -07:00 |
|
Jayant Jain
|
17debf49e6
|
Implements smoother panning around the map for keyboard controls
|
2014-03-13 18:32:23 +05:30 |
|
Shrihari
|
fb7f64ddb0
|
Grid toggle consistent with the button and the shortcut
|
2014-03-13 15:21:00 +05:30 |
|
Dominik Kundel
|
5c97fea363
|
fixed issue of multiple insertions due to multiple event handlers
|
2014-03-13 03:38:34 +01:00 |
|
Dominik Kundel
|
60214abb41
|
Change cursor if moving on map with pressed 'shift'
|
2014-03-13 02:50:09 +01:00 |
|
Michael Schmatz
|
aea9e9d1a6
|
Spectate view is nearing completion
|
2014-03-12 17:51:13 -07:00 |
|
Dominik Kundel
|
8990b9d194
|
paste coordiante if click + shift
|
2014-03-13 01:50:59 +01:00 |
|
Ruben Vereecken
|
96ec29d80e
|
Added the finishing touch. Solved issue #15
|
2014-03-13 01:07:47 +01:00 |
|
Ruben Vereecken
|
3856ac597f
|
Finished perfecting i18n
|
2014-03-13 00:47:08 +01:00 |
|
Scott Erickson
|
660e9ceca5
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 15:12:22 -07:00 |
|
Ruben Vereecken
|
dbc37b177a
|
Working on test.
|
2014-03-12 22:48:27 +01:00 |
|
Nick Winter
|
cf663f6775
|
Merge pull request #530 from rubenvereecken/i18n
Added i18n tags for new Ladder views
|
2014-03-12 14:03:44 -07:00 |
|
Ruben Vereecken
|
8c7c49fdbb
|
Reverted work done on wrong branch
|
2014-03-12 21:54:54 +01:00 |
|
Scott Erickson
|
68c5144838
|
Added AoE circles.
|
2014-03-12 13:49:36 -07:00 |
|
Scott Erickson
|
853a80dd23
|
Fixed loading marks so they are positioned correctly when they load and the world is paused.
|
2014-03-12 12:43:51 -07:00 |
|
Ruben Vereecken
|
76110423c0
|
Created i18n utility function
|
2014-03-12 20:30:43 +01:00 |
|
Scott Erickson
|
7e8f74f385
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 10:09:06 -07:00 |
|
Scott Erickson
|
fe93d31929
|
Fixed loading marks so they are positioned correctly when they load and the world is paused.
|
2014-03-12 10:08:57 -07:00 |
|
Nick Winter
|
f83fe6ce14
|
Fixed bugs with sprite rotation updating.
|
2014-03-12 09:31:45 -07:00 |
|
Scott Erickson
|
52733d5a1e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-12 09:15:48 -07:00 |
|
Scott Erickson
|
939c5faa1a
|
Fixed a bug when a thang has multiple effects.
|
2014-03-12 09:15:37 -07:00 |
|
Nick Winter
|
2e354a7f11
|
Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.
|
2014-03-12 09:10:36 -07:00 |
|
Scott Erickson
|
9cb80783ff
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-11 22:01:47 -07:00 |
|
Nick Winter
|
b560827e32
|
Working on cleaning up some server errors.
|
2014-03-11 19:17:58 -07:00 |
|
Nick Winter
|
4f9db0a7f7
|
Merged in all names.
|
2014-03-11 18:11:48 -07:00 |
|
Darredevil
|
012c25a817
|
Added GetALLToLocations and KeepALLFromLocations
|
2014-03-12 01:57:30 +02:00 |
|
Alexandru
|
5f2587da18
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-12 01:38:54 +02:00 |
|
Alexandru
|
4552455284
|
Merge branch 'master' of https://github.com/Darredevil/codecombat
|
2014-03-12 01:23:55 +02:00 |
|
Scott Erickson
|
da58b68fa0
|
Fixed a bug with the music player where sometimes it wouldn't loop.
|
2014-03-11 16:23:04 -07:00 |
|
Sam Epps
|
11ca60765d
|
Added some additional names to names.coffee
|
2014-03-11 17:16:09 +01:00 |
|
Nick Winter
|
234b3f105d
|
Reworked ladder game victory modal main call to action to actually submit game for ranking.
|
2014-03-10 10:36:28 -07:00 |
|
Nick Winter
|
c6b1d9089c
|
Fixed sounds spamming on last frame.
|
2014-03-10 08:45:36 -07:00 |
|
Darredevil
|
c9a56048ca
|
Update GoalManager.coffee
|
2014-03-09 20:35:33 +02:00 |
|
Nick Winter
|
b3964571e1
|
Fixed bug importing animations into existing ThangTypes that had only containers.
|
2014-03-08 15:04:11 -08:00 |
|
Nick Winter
|
5bde534757
|
Fixed parsing for ThangTypes that don't have lib.properties.
|
2014-03-08 14:53:17 -08:00 |
|
Nick Winter
|
be12d38e34
|
Taking into account null rects and library width/height subtraction on sprite parsing.
|
2014-03-08 14:38:35 -08:00 |
|
Nick Winter
|
085fb82cc9
|
Fixed a multiplayer link and debug mark alpha.
|
2014-03-07 21:02:10 -08:00 |
|
Scott Erickson
|
2fa40fb2db
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-07 17:37:19 -08:00 |
|
Scott Erickson
|
fe2ced1a67
|
Gave the health bar a border, made it a little more high res.
|
2014-03-07 17:37:11 -08:00 |
|
Nick Winter
|
ec86a07906
|
Changed Camera min/max zoom.
|
2014-03-07 15:20:54 -08:00 |
|
Scott Erickson
|
8fa9c9c410
|
Set up the level play view to show the guide on startup based on the showGuide property.
|
2014-03-07 15:18:56 -08:00 |
|
Scott Erickson
|
d8d917ecf9
|
Set up better teardown for the ladder view.
|
2014-03-07 12:15:16 -08:00 |
|
Scott Erickson
|
610fc0694b
|
Turning off view caching by default now. Should help lower the memory footprint.
|
2014-03-07 11:57:15 -08:00 |
|
Scott Erickson
|
34278a8648
|
Merge remote-tracking branch 'origin/master'
|
2014-03-06 17:27:01 -08:00 |
|
Scott Erickson
|
a4edb76c98
|
Fixed a couple of the bugs with marks.
|
2014-03-06 17:25:40 -08:00 |
|
Nick Winter
|
40e896868b
|
Fixed CocoSprite getOffset to not apply scale to registration points.
|
2014-03-06 17:21:24 -08:00 |
|
Scott Erickson
|
5b11e132b2
|
Fixed the effect marks so they properly go away.
|
2014-03-06 17:13:16 -08:00 |
|
Nick Winter
|
b6335a30ae
|
More fixes for empty string array serialization.
|
2014-03-06 16:32:13 -08:00 |
|
Scott Erickson
|
2fb1c184f9
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-06 16:22:19 -08:00 |
|
Scott Erickson
|
1b61b928b0
|
Couple tweaks to the cocosprite for effect marks.
|
2014-03-06 16:21:06 -08:00 |
|
Nick Winter
|
ea406bd3c7
|
Fixed some event listeners on destroyed loaders.
|
2014-03-06 15:52:51 -08:00 |
|
Scott Erickson
|
2ac5a94055
|
Merge remote-tracking branch 'origin/master'
|
2014-03-06 15:52:14 -08:00 |
|
Scott Erickson
|
041f4512e8
|
Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple.
|
2014-03-06 15:52:09 -08:00 |
|
Nick Winter
|
40a32d7b43
|
Fixed array / string ThangState key serialization conflicts. Fixed #333.
|
2014-03-06 14:53:37 -08:00 |
|
Nick Winter
|
a03403de94
|
Started some more name categories.
|
2014-03-06 09:35:58 -08:00 |
|
Nick Winter
|
fddd210d34
|
Fixed Archer M names conflict.
|
2014-03-06 09:27:06 -08:00 |
|
Nick Winter
|
b5c72e4b4a
|
Merge pull request #477 from iraladson/patch-1
Update names.coffee
|
2014-03-06 09:25:37 -08:00 |
|
Akaza Akari
|
030da44c23
|
Added volume manipulation, adjusted panning parameters
|
2014-03-05 20:12:42 -08:00 |
|
Akaza Akari
|
51d7bd656d
|
Made updatePosition use getWorldPosition
|
2014-03-05 19:54:58 -08:00 |
|
Akaza Akari
|
99f43028a0
|
Add thang sound panning for #454
|
2014-03-05 19:39:14 -08:00 |
|
Scott Erickson
|
7a2d5b4bff
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-05 12:53:57 -08:00 |
|
Scott Erickson
|
af265ebee8
|
Tweaked an error message to be more generally useful.
|
2014-03-05 12:53:11 -08:00 |
|
Jayant Jain
|
db0fc82eb0
|
Minor bugfix for freezing editor due to out of bounds frame index
|
2014-03-06 01:54:09 +05:30 |
|
iraladson
|
8d046c31b9
|
Update names.coffee
"Added more names for #53
|
2014-03-05 14:06:29 -06:00 |
|
iraladson
|
7885b21b4b
|
Update names.coffee
|
2014-03-05 14:03:57 -06:00 |
|
Nick Winter
|
5ec06159a6
|
Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging.
|
2014-03-05 12:00:29 -08:00 |
|
Scott Erickson
|
03b60838b6
|
Merge remote-tracking branch 'origin/master'
|
2014-03-04 12:21:07 -08:00 |
|
Scott Erickson
|
9726840d8a
|
Trying to handle a case where a user did not have their user account created.
|
2014-03-04 12:21:02 -08:00 |
|
Scott Erickson
|
3680d628e7
|
Fixed showing generic errors.
|
2014-03-04 12:06:31 -08:00 |
|
Yos Riady
|
195b1941ea
|
Added even more names for #53
|
2014-03-05 02:53:54 +08:00 |
|
Nick Winter
|
2f653c966e
|
Simulator now swaps in empty methods when code doesn't compile.
|
2014-03-04 08:30:50 -08:00 |
|
Scott Erickson
|
65d39e658d
|
Removed the old team view cruft.
|
2014-03-03 11:15:46 -08:00 |
|
Nick Winter
|
980a3b6f21
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-03 07:29:07 -08:00 |
|
Nick Winter
|
86fd098159
|
Localized WizardSprite movement hey handling to WizardSprite file.
|
2014-03-03 07:28:40 -08:00 |
|
Nick Winter
|
f2f0a993af
|
Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat
|
2014-03-03 07:22:44 -08:00 |
|
Nick Winter
|
c858fb5e24
|
Merge pull request #440 from FinnDS/patch-1
Update names.coffee
|
2014-03-03 07:20:55 -08:00 |
|
Nick Winter
|
a8ef87c9ea
|
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
|
2014-03-02 16:06:22 -08:00 |
|
Muhammed Thanish
|
da2ebf857a
|
Increase delay
|
2014-03-02 14:02:30 +05:30 |
|
Nick Winter
|
6c48660922
|
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
|
2014-03-01 16:57:29 -08:00 |
|
Muhammed Thanish
|
d7e031fd00
|
Use key.isPressed() to get movement direction
|
2014-03-02 03:27:06 +05:30 |
|
Muhammed Thanish
|
a092557973
|
Add camera zoomTo(pos)
|
2014-03-02 02:13:37 +05:30 |
|
Muhammed Thanish
|
7ea9260322
|
Use WizardSprite
|
2014-03-02 01:45:49 +05:30 |
|
Nick Winter
|
c2f82690b4
|
Put Archmage and Artisan avatars in GitHub README.
|
2014-03-01 11:21:24 -08:00 |
|