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

6722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
0a615fc24e Merge branch 'master' into production 2014-10-21 13:58:18 -07:00
Nick Winter
7c2982d3f1 Adding some logging for crazy save validation bugs. Swapping in flag item slot. 2014-10-21 13:57:49 -07:00
Scott Erickson
ba79d59190 Fixed a couple errors in the tests. 2014-10-21 11:54:03 -07:00
Scott Erickson
091910f2ad Fixed debug, and some other mark issues when sprite sheets update, most likely. 2014-10-21 11:36:38 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
Nick Winter
b56d25dd9e Merge pull request #1695 from yjw9012/master 
Fixed #1567
 2014-10-21 07:30:50 -07:00
yjw9012
ca09381d42 Fixed #1567 
Moved the code diff control to the top of the list, and added a short
instructional message.
 2014-10-20 23:12:00 -07:00
Matt Lott
56c15116a7 Swap problem alert error message and hint lines 
Also fixing problem alert border on Firefox.
 2014-10-20 21:20:33 -07:00
Nick Winter
7a9014f83a Several improvements to the victory modal. 2014-10-20 19:01:00 -07:00
Nick Winter
fd83fd5289 Merge branch 'master' into production 2014-10-20 17:53:16 -07:00
Nick Winter
a33bb215d4 Fixed checking compile-time problems for clean code goals. 2014-10-20 17:49:52 -07:00
Nick Winter
fcb8a08d13 Merge branch 'master' into production 2014-10-20 17:04:05 -07:00
Nick Winter
39166b77c3 Merge pull request #1693 from wakeup/patch-1 
some updates to turkish language
 2014-10-20 17:01:18 -07:00
Nick Winter
700b460f91 Fixed bug in fetching submitted ladder sessions that hadn't been scored yet. 2014-10-20 17:00:46 -07:00
Volkan Gezer
0f7fb5d573 fix grouping 2014-10-21 01:51:52 +02:00
Volkan Gezer
e3f894805f some updates to turkish language 2014-10-21 01:44:36 +02:00
Nick Winter
bc15ccd240 Fixed panel vs. total counts on other achievements. 2014-10-20 16:13:56 -07:00
Nick Winter
f80285ae18 Merge branch 'master' into production 2014-10-20 14:47:23 -07:00
Nick Winter
d0b878db37 Implemented lines-of-code goal type. 2014-10-20 14:43:18 -07:00
Nick Winter
cc56fe7768 Merge branch 'master' into production 2014-10-20 13:57:38 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
3d4cc8ec9c Merge branch 'master' into production 2014-10-20 09:42:17 -07:00
Nick Winter
67166f1496 Removed a log. 2014-10-20 09:41:58 -07:00
Nick Winter
04874f84f7 Merge branch 'master' into production 2014-10-20 09:41:35 -07:00
Nick Winter
1219710cbb Starting to work on codeProblems goal type. Rearranged script import for publishing notes earlier. Fallback for Math.log10. 2014-10-20 09:41:28 -07:00
Nick Winter
5f78f57c85 Merge branch 'master' into production 2014-10-20 08:31:50 -07:00
Nick Winter
08d9e39764 LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests. 2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
440e1700b1 Using aiSource now for enemy AIs in multiplayer, separate from sample code source. 2014-10-19 12:44:58 -07:00
Nick Winter
bbd75b1d43 Merge branch 'master' into production 2014-10-19 12:44:18 -07:00
Nick Winter
754f7128bd Merge pull request #1691 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-10-19 11:43:19 -07:00
Imperadeiro98
9fc4498ace Update pt-PT.coffee 2014-10-19 19:16:13 +01:00
Nick Winter
0f6bfddd57 Propagated i18n. 2014-10-19 08:34:15 -07:00
Nick Winter
b7143c32f7 A bit of housekeeping for the last few i18n pull requests in perspicacious preparation for proper propagation. 2014-10-19 08:33:30 -07:00
Nick Winter
51be5f354c Merge pull request #1689 from AbnerZheng/patch-3 
Update zh-HANS.coffee
 2014-10-19 08:29:02 -07:00
Nick Winter
edc24f78e3 Merge pull request #1688 from Imperadeiro98/patch-1 
Fix for #1676
 2014-10-19 08:26:37 -07:00
Li Ma
c0c35cafe5 Update zh-HANS.coffee 
添加一些零散翻译
 2014-10-19 23:00:45 +08:00
AbnerZheng
c722c4cea7 Update zh-HANS.coffee 
由于前面有人把stats翻成"成就"，为保持一致性，也翻译成"成就"
 2014-10-19 22:47:17 +08:00
Imperadeiro98
84c05109ea Update en.coffee 2014-10-19 12:51:50 +01:00
Imperadeiro98
d4f9078980 Update WorldMapView.coffee 2014-10-19 12:50:58 +01:00
Imperadeiro98
d9a32895c7 Update MainPlayView.coffee 2014-10-19 12:49:57 +01:00
Matt Lott
3fd24a28ce Eliminate unjoined file brunch warnings 
By specifying the directories that should be watched/built (i.e.
exclude `test/server`)

Checking this fix in from @es128
 2014-10-18 22:11:39 -07:00
Nick Winter
9f216e3361 Preserving opponent flags. 2014-10-18 18:57:33 -07:00
Nick Winter
66c728210b Fixing flag coloring in new WebGL rendering. 2014-10-18 18:18:12 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
9ce8ebaf25 Merge pull request #1686 from rafajaques/master 
Translation done and spell check
 2014-10-18 15:57:11 -07:00
Rafael Jaques
e32787d25c Translation done and spell check 2014-10-18 19:17:07 -03:00
Nick Winter
4278863c34 Merge branch 'master' into production 2014-10-18 14:56:27 -07:00
Nick Winter
9c8a0e83af Fixed an indentation typo in pt-BR.coffee. 2014-10-18 14:54:04 -07:00