codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9136 commits 27 branches 0 tags 134 MiB
Commit graph

9136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
305cffb5ea Finish hooking up prerendered spritesheets with LayerAdapter 2015-10-14 14:33:26 -07:00
Scott Erickson
1085731fdd Fix colorConfig prerendered sprite sheet data, comparison 2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e Have LayerAdapter use prerendered spritesheets (unfinished) 2015-10-13 16:43:56 -07:00
Scott Erickson
3fc7b71f7a Remove log 2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498 Remove vestigial test code 2015-10-13 12:30:18 -07:00
Scott Erickson
2f9a689106 Fix LayerAdapter test 2015-10-13 10:40:11 -07:00
Nick Winter
7584872c9f Fix #3106 introduced by b38a6c50 2015-10-13 08:22:13 -07:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -07:00
Imperadeiro98
c969768800 Merge pull request #3104 from tufik000/patch-2 
Link to Ace of Coders
 2015-10-13 14:58:22 +01:00
Matt Lott
eda10a55ec Update /courses?_ppc= logged out instructions 2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2 Merge remote-tracking branch 'origin/master' 2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9 Add spriteSheets to ThangType, export modal to Thang Editor 
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
 2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060 Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context 2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c Add teacher HoC instructions to /courses 2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166 Add HoC blurb to top of /teachers pages 
Replacing courses beta testing blurb.
 2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b Route /hoc to courses 
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
 2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3 Merge pull request #3105 from AkaKaras/translation 
Translation
 2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be zh-hant latest translation 
finally finished the translation, proud of myself (●—●)  b
 2015-10-12 16:54:14 -04:00
Nick Winter
f723fcbd39 Fix geolocation code 2015-10-12 13:12:34 -07:00
tufik000
00170d6821 Link to Ace of Coders 
Changed "torneir" to "torneio" and  "Era dos Programadores" to "Ás dos Programadores"
 2015-10-11 23:02:20 -03:00
Imperadeiro98
cac0739084 Merge pull request #3101 from HelloSeaNation/patch-2 
Fix another typo
 2015-10-11 20:01:57 +01:00
Imperadeiro98
2832a57a24 Merge pull request #3100 from HelloSeaNation/patch-1 
Fix typo
 2015-10-11 20:01:46 +01:00
AkaKaras
3325b91b5a Merge remote-tracking branch 'codecombat/master' into translation 
Conflicts:
	app/locale/zh-HANT.coffee
 2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626 zh-hant 
translation
 2015-10-11 09:15:28 -04:00
Nick Winter
ec685078b8 Merge pull request #3102 from Imperadeiro98/cleanup 
Remove duplicated key
 2015-10-10 13:57:40 -07:00
Imperadeiro98
b046be44f3 Remove duplicated key 2015-10-10 21:52:31 +01:00
HelloSeaNation
e75413fbe2 Fix another typo 2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c Fix typo 2015-10-11 00:54:59 +13:00
Imperadeiro98
eb3d4ce5f4 Merge pull request #3099 from kumabotz/patch-1 
Some zh-HANS translations
 2015-10-10 11:11:44 +01:00
Tery Lim
0b9e78e2b8 Some zh-HANS translations 
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
 2015-10-10 22:38:21 +13:00
Imperadeiro98
7445987061 Merge pull request #3098 from kumabotz/patch-3 
Update harry's tips
 2015-10-10 10:34:42 +01:00
Tery Lim
124b61a70c Update harry's tips 
`Yer a Wizard,`
 2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Matt Lott
67d088262c 🐛Fix user admin query tests 2015-10-09 15:54:05 -07:00
Matt Lott
8fce82ce72 Update trial requests approval page query to grab latest 
Used to be limited to first 2000 requests, which was hit on 10/7/15.
 2015-10-09 14:26:04 -07:00
Matt Lott
2d8d107a58 Update Handler admin get query params 
Unclear how this was supposed to work before these changes.
 2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765 Remove placeholder text in invite email box in course details page 
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
 2015-10-09 13:45:33 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
Nick Winter
6fb14559ab Merge branch 'Fokusnica-master' 2015-10-09 06:08:50 -07:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
ded6b14b6a Better indented soundjs-NEXT.combined.js 2015-10-09 12:36:36 +01:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2 
Translate careers
 2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1 
Update to zh-HANS period ( 。)
 2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up 
Cleaned up a couple of files
 2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00