codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-04 04:41:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3244 commits 27 branches 0 tags 134 MiB
Commit graph

3244 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00
Scott Erickson
9ace31d391 Fixed the target mark. 2014-05-19 16:36:45 -07:00
Scott Erickson
8ae14e21ae Fixed #1029. Refactored scaling for sprites a bit. 2014-05-19 16:36:44 -07:00
Nick Winter
3c3fbf3836 Merge pull request #1036 from domenukk/fixxss 
+ </script> tag in username no longer breaks the page
 2014-05-19 15:47:57 -07:00
Nick Winter
5f5e7afabd Merge pull request #1037 from dpen2000/FixAdminCheckbox 
Fix admin checkbox label for attribute
 2014-05-19 15:47:47 -07:00
dpen2000
10d0ef0606 Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly 2014-05-19 23:28:53 +01:00
George Saines
7c0d73e779 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 15:19:59 -07:00
George Saines
07177e1a89 putting together the prizes page 2014-05-19 15:19:56 -07:00
Dominik Maier
2d03c3f78c + </script> tag in username no longer breaks the page 2014-05-20 00:13:09 +02:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Michael Schmatz
df9e6686ab Merge pull request #1035 from codecombat/master 
Stopgap solution for totalScore being string
 2014-05-19 14:58:35 -07:00
Michael Schmatz
b8dc4ed939 Stopgap solution for totalScore being string 2014-05-19 14:58:08 -07:00
Nick Winter
09686d3cab Merge branch 'master' into production 2014-05-19 12:14:38 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Scott Erickson
179702b0eb Set up the goals view to be more hidden by default, and shows up on mouse hover. 2014-05-19 11:31:18 -07:00
Michael Schmatz
078f6b5dcd Fixed homepath in simulate script 2014-05-19 10:40:22 -07:00
Nick Winter
5dd8bec393 Fixed issues with initial sprite scaling. 2014-05-19 10:39:24 -07:00
Michael Schmatz
b8e6e49a8d Turn simulator testing mode off 2014-05-19 10:14:28 -07:00
Michael Schmatz
4a907ae9cf Merge pull request #1034 from codecombat/master 
Master into production
 2014-05-19 10:12:14 -07:00
Michael Schmatz
6f2fd8e293 Verification simulator changes 2014-05-19 10:11:23 -07:00
Nick Winter
5dffca7a9c Propagated i18n tags. 2014-05-19 10:11:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Michael Schmatz
cb1c21e80a Add simulate script foundation 2014-05-18 20:06:38 -07:00
Michael Schmatz
2cc344c4f0 Merge pull request #1028 from domenukk/master 
Fixed headless client for deferred jQuery
 2014-05-18 14:32:12 -07:00
Dominik Maier
8a96bdd5dc + Fixed headless_client 2014-05-18 23:27:42 +02:00
Dominik Maier
a3389de2d1 + deferred actually deferres 2014-05-18 23:23:11 +02:00
Nick Winter
83df107cdf Merge branch 'master' into production 2014-05-18 13:46:47 -07:00
Michael Schmatz
035cb7d3f7 Fix simulator jquery when dependency 2014-05-18 12:56:32 -07:00
Michael Schmatz
38d732d8bc Disable hover debugger when spell changed 2014-05-18 11:51:31 -07:00
Michael Schmatz
5c72ccdce1 Add support for Aether globals in hover debugger 2014-05-18 11:41:42 -07:00
Nick Winter
9df34875ee Added tournament rules/prizes placeholders. 2014-05-17 20:43:05 -07:00
Michael Schmatz
a46714b1b6 Patching bug if newScoreObject is incomplete 2014-05-17 12:02:34 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Scott Erickson
5907ca8619 Fixed scaling in the thang type editor. 2014-05-17 11:49:11 -07:00
Scott Erickson
df222461bf Fixed a bug that was bringing the thang editor down. 2014-05-17 11:38:33 -07:00
Scott Erickson
f99a95768e Set up CocoSprites to have text appear overhead based on events coming from the ShowsText component. 2014-05-17 11:28:57 -07:00
Scott Erickson
4be67113be Thang events now only appear once per whole frame, rather than for each interpolated frame. 2014-05-17 11:28:57 -07:00
Nick Winter
736fc8c12f Remove overeager transpile problem showing for JS again. 2014-05-17 09:58:35 -07:00
Nick Winter
073e13f1c7 Merge pull request #1022 from zeus1200/patch-1 
Update es-ES.coffee
 2014-05-17 07:21:39 -07:00
Pablo Lobato
8794921018 Update es-ES.coffee 2014-05-17 11:09:55 +02:00
Nick Winter
70f341b17a Merge branch 'master' into production 2014-05-16 17:40:27 -07:00
Nick Winter
418c2f1a2c Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization. 2014-05-16 17:38:33 -07:00
Nick Winter
a36a7792ec Fixed problem with IndieSprites not loading, breaking scripts. 2014-05-16 17:18:56 -07:00
Nick Winter
f64e50f85b Recording flow only for frame of interest. 2014-05-16 16:52:55 -07:00
Michael Schmatz
891471b80a Add time to hover debugger 2014-05-16 16:04:10 -07:00
Scott Erickson
ae64032739 Refactored the Camera to only listen to events that use the same canvas. Fixed the level editor map selection modals. 2014-05-16 15:34:14 -07:00
Michael Schmatz
0457d05b31 Merge pull request #1018 from codecombat/master 
Level session playtime logging
 2014-05-16 15:29:15 -07:00
Michael Schmatz
e631bae248 Level session playtime logging 2014-05-16 15:27:46 -07:00
Michael Schmatz
1b9b145da7 Merge pull request #1017 from codecombat/master 
Add playtime, opponent name, totalScore to match
 2014-05-16 14:53:17 -07:00
Michael Schmatz
5b93414862 Add playtime, opponent name, totalScore to match 2014-05-16 14:52:49 -07:00