Scott Erickson
d62f04cf88
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-06 14:52:28 -07:00
Scott Erickson
56cd19a697
Merge branch 'dpen2000-PatchesLayoutInconsistency'
2014-05-06 14:52:22 -07:00
Scott Erickson
c345a31d14
Merge branch 'PatchesLayoutInconsistency' of https://github.com/dpen2000/codecombat into dpen2000-PatchesLayoutInconsistency
2014-05-06 14:50:01 -07:00
dpen2000
4ff1e9a3a3
Make components' patches tab and systems' patches tab look consistent
...
Mix of previous stylings with spacing at top and white background
2014-05-06 17:34:13 -04:00
Nick Winter
1f166406ac
Some new names.
2014-05-06 12:47:38 -07:00
Michael Schmatz
e8d26af985
Implemented caching and fixed off by one error
2014-05-06 11:36:46 -07:00
Scott Erickson
c58a27fcbf
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-06 11:21:15 -07:00
Scott Erickson
6bf7652080
Merge branch 'dpen2000-SetReadOnlyChanges'
2014-05-06 11:21:04 -07:00
Scott Erickson
ffdf11133e
Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges
2014-05-06 11:19:11 -07:00
Nick Winter
ca8d5c1f3b
Stop bobbing and more marks when world ended.
2014-05-06 11:02:53 -07:00
Michael Schmatz
dddd617a08
userCodeMap issues fixed
...
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Nick Winter
2e6bec5454
Some fixes for my accidental merge of #970 .
2014-05-06 09:49:04 -07:00
Nick Winter
1f3cc8a004
Merge branch 'master' of git://github.com/domenukk/codecombat
2014-05-06 08:00:39 -07:00
Nick Winter
41e190e754
Merge branch 'gosnat-patch-5'
2014-05-06 07:58:06 -07:00
Nick Winter
09c8a99a9b
Merge branch 'patch-5' of git://github.com/gosnat/codecombat into gosnat-patch-5
2014-05-06 07:23:51 -07:00
Nick Winter
dfa6a59ee8
Merge branch 'gosnat-patch-4'
2014-05-06 07:22:10 -07:00
Nick Winter
acccee33a3
Cleaner conditional init syntax.
2014-05-06 07:22:09 -07:00
Nick Winter
3e7edd8c61
Merge branch 'patch-4' of git://github.com/gosnat/codecombat into gosnat-patch-4
2014-05-06 07:18:26 -07:00
Nick Winter
9e40dcd2e3
Added a couple i18n tags.
2014-05-06 06:58:20 -07:00
Nick Winter
73f38f84ac
Merge branch 'RoyXue-master'
2014-05-06 06:56:17 -07:00
Nick Winter
af5b878166
Fixed wizard setting things.
2014-05-06 06:56:14 -07:00
Roy Xue
03e5d1ca50
Merge pull request #1 from codecombat/master
...
Update CodeCombat
2014-05-06 14:09:42 +08:00
Dominik Maier
6d244e8560
+ Merged Simulators
2014-05-06 05:07:34 +02:00
Nick Winter
c444bf9c59
Merge branch 'master' into production
2014-05-05 19:14:55 -07:00
Nick Winter
81634190ef
Added i18n for translating specific articles now, too.
2014-05-05 19:14:38 -07:00
Dominik Maier
ad85bf5b77
Merge remote-tracking branch 'upstream/master'
2014-05-06 03:12:24 +02:00
Nick Winter
0f5ee67fe1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-05 17:59:32 -07:00
Scott Erickson
cde50a241f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-05 17:47:32 -07:00
Scott Erickson
8865a9035f
Merge branch 'adi2412-anonNameCollide'
2014-05-05 17:47:22 -07:00
Dominik Maier
c9bb488794
Created headless-client and an alternative implementation of god
2014-05-06 02:37:14 +02:00
Michael Schmatz
1793d9a882
Fixed testing logic
2014-05-05 17:33:47 -07:00
Nick Winter
0e0ca785d9
Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.
2014-05-05 16:59:12 -07:00
Scott Erickson
1869bbe859
Merge branch 'tests' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
2014-05-05 16:49:15 -07:00
Scott Erickson
056f081cdb
Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
...
Conflicts:
app/views/modal/signup_modal.coffee
2014-05-05 16:48:35 -07:00
Scott Erickson
8d67e28977
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-05 16:35:45 -07:00
Scott Erickson
684e61532a
Fixed a bug with the deltas library identifying conflicts between patches.
2014-05-05 16:35:26 -07:00
Michael Schmatz
20a5ae1b8c
Merge pull request #969 from codecombat/master
...
Master into production
2014-05-05 15:42:24 -07:00
Michael Schmatz
bdf6d9e759
Fixed recipient address
2014-05-05 15:41:04 -07:00
Nick Winter
82529c781b
Fixed some ladder home links.
2014-05-05 15:33:08 -07:00
Scott Erickson
cb736bbf6f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-05 15:19:54 -07:00
Scott Erickson
8f9aea1b9b
Fixed the patches view.
2014-05-05 15:19:35 -07:00
Michael Schmatz
a737085757
Merge pull request #968 from codecombat/master
...
Master into production
2014-05-05 15:17:01 -07:00
Michael Schmatz
bf8feb216a
Fixed ladder mail handler
...
oh mongoose
2014-05-05 15:11:00 -07:00
Michael Schmatz
97f3694dbf
Basic backend functionality is there
2014-05-05 13:26:37 -07:00
gosnat
939509849c
Update GoalManager.coffee
...
Justification:
For a negative goal like saveThangs, let's say you have 5 thangs on the save list. As things stand, if you don't have a HowMany defined, then the number of needed deaths to fail is
numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.min(1, 5) + 1
numNeeded = 5
So you would only fail the goal if all 5 thangs you were supposed to save died. This is contrary to the comment right above this line:
# saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"
Therefore, I think it should be Math.max rather than Math.min.
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(1, 5) + 1
numNeeded = 1
So any of the Thangs on the save list dying is enough to fail the goal.
As a double check, what if the level designer designated a HowMany of 5?
numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1
numNeeded = 5 - Math.max(5, 5) + 1
numNeeded = 1
So this is consistent.
2014-05-05 14:08:41 -05:00
gosnat
93d117100a
Update GoalManager.coffee
...
For compound goals like GetAllToLocation, you should continue adding to the existing list of thang states.
2014-05-05 13:22:57 -05:00
Nick Winter
d94856d00c
Merge pull request #963 from Vic020/patch-2
...
Update zh-HANS.coffee
2014-05-05 07:22:37 -07:00
Roy Xue
2b2fea3092
Update zh.coffee
2014-05-05 21:33:01 +08:00
Vic___
e64ba30d33
Update zh-HANS.coffee
2014-05-05 20:05:57 +08:00
Nick Winter
9703333d1c
Merge branch 'master' into production
2014-05-04 21:29:58 -07:00
