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
Nick Winter
b84a73cb8e
Don't need huge raster images full-size in the Treema.
2014-05-04 21:29:50 -07:00
Nick Winter
bc349efe4d
Merge pull request #960 from dpen2000/FixServerWatching
...
Change dev server to watch app/schemas
2014-05-04 21:26:50 -07:00
Nick Winter
3b891e6628
Merge pull request #954 from marc-portier/master
...
first translation contribution
2014-05-04 21:25:05 -07:00
Nick Winter
9dc66c1568
Merge pull request #961 from gosnat/patch-3
...
Update GoalManager.coffee
2014-05-04 21:12:50 -07:00
Nick Winter
4d854f6e15
Merge pull request #962 from RoyXue/master
...
Update zh-HANS.coffee
2014-05-04 09:19:34 -07:00
Roy Xue
fd3c008ca7
Update zh-HANS.coffee
2014-05-04 11:03:43 +08:00
gosnat
39b21da035
Update GoalManager.coffee
...
I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.
2014-05-03 21:36:24 -05:00
dpen2000
5d4f5cd97d
Change dev server to watch app/schemas
...
The previous app.js watch wasn't working and we probably only need to see changes in schemas because server code depend on these
2014-05-03 18:39:14 -04:00
Nick Winter
b6a53a83e7
Fixed issue with play button not turning into rewind.
2014-05-03 13:26:37 -07:00
Nick Winter
73222a1a98
Don't start drawing Surface until needed.
2014-05-03 09:13:26 -07:00
Nick Winter
fbf5f52228
Merge pull request #955 from benojan/patch-3
...
Update zh-WUU-HANT.coffee
2014-05-03 07:22:57 -07:00
Nick Winter
7535f5b49d
Merge branch 'benojan-patch-4'
2014-05-03 07:21:23 -07:00
Nick Winter
8fbe2dedfc
Propagated Wu name update.
2014-05-03 07:21:18 -07:00
Marc Portier
5212eca404
fixing typox - thx to @JasperDhaene
2014-05-03 16:04:08 +02:00
Marc Portier
f7b746c3ea
making case consistent - thx to @JasperDhaene
2014-05-03 16:01:17 +02:00
Marc Portier
add2944a28
ogre ==> ork and a serious spelling error
2014-05-03 15:59:16 +02:00
Benojan
8a11990e89
Update locale.coffee
...
巫师吴语->吴语
巫師吳語->吳語
2014-05-03 17:55:36 +08:00
Benojan
50d4078ade
Update zh-WUU-HANT.coffee
...
translate others that was not translated.
2014-05-03 17:14:11 +08:00
Marc Portier
d348c6f333
translate space
2014-05-03 11:06:39 +02:00
Marc Portier
e1482280c3
first translation contribution
2014-05-03 08:23:36 +02:00
Nick Winter
90bbe0bf55
Moved modals down a bit; watch out, not sure why they were !important before.
2014-05-02 19:28:08 -07:00
Nick Winter
77adebe181
Fixed #893 .
2014-05-02 18:53:18 -07:00
Scott Erickson
db9a82d58a
Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload
2014-05-02 17:03:53 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Nick Winter
afbe5b063b
Fix HTML icon syntax in the Markdown.
2014-05-02 15:51:07 -07:00
Nick Winter
a04f74de8b
Implemented George's gold design.
2014-05-02 15:12:30 -07:00
Nick Winter
d54149d0f3
Reworked LevelView loading priorities to try to get world simulating earlier.
2014-05-02 12:32:41 -07:00
Nick Winter
e610ecb476
Propagated new i18n tags.
2014-05-02 11:02:48 -07:00
Nick Winter
9d45b22057
Added some i18n tags.
2014-05-02 11:00:30 -07:00
Scott Erickson
eacbf571c6
Merge branch 'master' into feature/thangload
2014-05-02 10:32:05 -07:00
Scott Erickson
06bc96d7d0
Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering.
2014-05-02 10:31:20 -07:00
Nick Winter
ef036b409b
Merge pull request #930 from M-r-A/patch-1
...
Update ru.coffee
2014-05-02 09:58:55 -07:00
