Burlutskiy Ivan
65a364d3f7
Update ru.coffee
2014-05-21 00:21:10 +04:00
Nick Winter
88a5685c37
Fix for WizardSprite scale thing.
2014-05-20 12:32:26 -07:00
Scott Erickson
86736d8f4a
Fixed a bug.
2014-05-20 12:22:24 -07:00
Scott Erickson
2b56dffcb0
Fixed a bug where sometimes scripts setting playback would be overridden by the surface resetting playback after casting is done.
2014-05-20 12:21:43 -07:00
Scott Erickson
3f884e71e5
Fixed the LevelLoader in headless settings.
2014-05-20 11:25:32 -07:00
Scott Erickson
93c6f72f07
Asynchronously building things again.
2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a
Fixed a bug with ladder tab not reloading.
2014-05-20 10:40:15 -07:00
Michael Schmatz
b31e6312ac
Updated rules to be subject to change
2014-05-20 10:10:40 -07:00
Nick Winter
022722a19f
Fixed cosmetic GoalManager destruction error.
2014-05-20 09:19:31 -07:00
Nick Winter
248cec1e6e
Transpile code properly.
2014-05-20 08:23:25 -07:00
Nick Winter
d058b16283
Fixed some memory leaks.
2014-05-20 08:00:49 -07:00
Scott Erickson
04da5b4714
Fixed thang avatar view thang loading some more.
2014-05-19 23:02:02 -07:00
Scott Erickson
a8abe8c887
Fixed mark sprite scaling some more.
2014-05-19 23:01:48 -07:00
Scott Erickson
042fd7ac0d
Made the guide, when it shows up the first time, only show the first doc.
2014-05-19 22:25:40 -07:00
Scott Erickson
f24ee98295
More work on mark sizing.
2014-05-19 22:17:23 -07:00
George Saines
5d8e199c2d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-19 22:14:09 -07:00
George Saines
5d603f625e
removing China
2014-05-19 22:14:05 -07:00
Nick Winter
513a73c62e
Added grayscale filter until hover for tournament sponsor logos.
2014-05-19 22:07:36 -07:00
Nick Winter
b6406b9b0e
Put some tournament details in there. Muted some extra casting sounds during level load.
2014-05-19 21:56:20 -07:00
Scott Erickson
f463966a22
Fixed a bug with thangs not being properly scaled when first created sometimes.
2014-05-19 21:55:41 -07:00
Scott Erickson
6c3ff16bed
Fixed setting registration points for thangs that match world dimensions.
2014-05-19 21:55:31 -07:00
Scott Erickson
ae8d28182c
Fixed a bug where sometimes thang avatar views wouldn't render the portrait, because 'loading' wouldn't be set to false properly.
2014-05-19 21:55:30 -07:00
Scott Erickson
b816055f9e
Fixed goal states to handle teams.
2014-05-19 21:55:30 -07:00
George Saines
8b5014a053
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-19 21:39:45 -07:00
George Saines
5b6b26415b
making the Firebase logo look good
2014-05-19 21:39:41 -07:00
Nick Winter
39178daff6
Trying to show loading ready and initialize the Surface earlier.
2014-05-19 20:49:17 -07:00
Nick Winter
b2cc3d0692
Fixed bug with preloading the world replacing casting the same world if timing was wrong.
2014-05-19 20:12:16 -07:00
Scott Erickson
9ad4602e0f
Fixed a bug with the new goal view.
2014-05-19 20:11:33 -07:00
Nick Winter
341097c5ca
A couple improvements for the LadderSubmissionView.
2014-05-19 19:51:24 -07:00
Michael Schmatz
d8df61f94b
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/templates/play/ladder/ladder.jade
2014-05-19 19:43:47 -07:00
Michael Schmatz
ca2e48b491
Edited judging criteria
2014-05-19 19:37:25 -07:00
Nick Winter
116965fcdc
Rules wording tweaks; highlighting new matches and end of ranking with sounds.
2014-05-19 19:13:36 -07:00
Michael Schmatz
aba0120e88
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/queues/scoring.coffee
2014-05-19 19:04:47 -07:00
Michael Schmatz
97cbf55695
Simulator fetch random Greed games when queue empty
2014-05-19 18:58:45 -07:00
George Saines
8277472fda
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-19 17:59:48 -07:00
George Saines
4f763d0203
added the rules section
2014-05-19 17:59:43 -07:00
Nick Winter
af31bcf008
Fleshed out tournament prizes tab.
2014-05-19 17:40:06 -07:00
Scott Erickson
b410d91203
Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier.
2014-05-19 17:10:41 -07:00
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
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
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
b8dc4ed939
Stopgap solution for totalScore being string
2014-05-19 14:58:08 -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
Nick Winter
5dd8bec393
Fixed issues with initial sprite scaling.
2014-05-19 10:39:24 -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
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
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
Gutierri Barboza
589de9b4b2
correction in "candidate_location"
2014-05-17 13:11:05 -03:00
Gutierri Barboza
ac3c5276b5
update PT-BR
2014-05-17 13:07:51 -03:00
Pablo Lobato
8794921018
Update es-ES.coffee
2014-05-17 11:09:55 +02: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
e631bae248
Level session playtime logging
2014-05-16 15:27:46 -07:00
Michael Schmatz
5b93414862
Add playtime, opponent name, totalScore to match
2014-05-16 14:52:49 -07:00
Michael Schmatz
2e36a3352e
Modified level session schema to log playtime, renormalize score and name in matches
2014-05-16 14:13:59 -07:00
Michael Schmatz
21ccaa2d8a
Adjust histogram height downwards
...
Make room for ranking text
2014-05-16 13:33:41 -07:00
Michael Schmatz
ab1b0cac42
Added "Rank your session" message
2014-05-16 13:30:55 -07:00
Michael Schmatz
bd1261802d
Fix rank for unranked sessions on ladder histogram
2014-05-16 13:27:42 -07:00
Michael Schmatz
934c853789
Live simulation count and fixed double simulator leaderboard session
2014-05-16 13:16:35 -07:00
Michael Schmatz
60342cc40e
Hover debugger optimization for "this"
2014-05-16 10:19:36 -07:00
Nick Winter
5d30cc7eab
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-16 10:04:03 -07:00
Nick Winter
c1052d8d7e
Fixed bug with trying to play selection sound for nonexistent sprites.
2014-05-16 10:03:45 -07:00
Michael Schmatz
206d63231e
Fixed teamSpells instantiation
2014-05-16 09:47:15 -07:00
Nick Winter
7811bda6c3
Use ace/mdoe/python for Python instead of ace/mode/lua.
2014-05-16 08:55:59 -07:00
Nick Winter
cff00f90b5
Stopped bug with useTranspiledCode; it will need more work later to get right.
2014-05-15 21:53:23 -07:00
Nick Winter
fabf607b6a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-15 20:49:15 -07:00
Nick Winter
ca6ea474bf
Fixed some bugs with sprite sound loading and playback.
2014-05-15 20:49:10 -07:00
Scott Erickson
eebbae9b13
Added a global SPRITE_RESOLUTION_FACTOR property.
2014-05-15 17:09:35 -07:00
Michael Schmatz
65aae86dcc
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/lib/simulator/Simulator.coffee
2014-05-15 16:44:16 -07:00
Michael Schmatz
a21d17a168
Have simulator use transpiledCode
2014-05-15 16:43:16 -07:00
Nick Winter
c7ca081df9
Merged ProblemAlertView fixes.
2014-05-15 15:36:06 -07:00
Nick Winter
c2a7530b62
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-15 15:35:08 -07:00
Michael Schmatz
0bb1422d6c
Switch spectate and level view to use transpiled code
2014-05-15 15:18:17 -07:00
Nick Winter
763e0500b2
Tracking simulator clicks.
2014-05-15 15:10:50 -07:00
Nick Winter
b973b749c0
Merged.
2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc
Moved random seed initialization to Existence System, where it can be configured.
2014-05-15 14:54:31 -07:00
Scott Erickson
2a1d9a3c6c
Turned shadow caching back on, with a little buffer. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.
2014-05-15 13:19:10 -07:00
Vicky Chijwani
0a14681e7b
Correctly parse multi-line error messages in the editor.
2014-05-16 01:41:26 +05:30
Scott Erickson
3a1afbb7ca
Turned shadow caching back on. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.
2014-05-15 13:06:42 -07:00
Scott Erickson
c03004166c
Set up the save version modal/patch modal to submit on submit form (like pressing enter in an input).
2014-05-15 12:37:39 -07:00
Nick Winter
c1f9d51b37
Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world.
2014-05-15 11:27:51 -07:00
Scott Erickson
f653aa3375
Fixed #1008
2014-05-15 10:51:38 -07:00
Michael Schmatz
338b613074
Added transpiledCode to victory modal
2014-05-15 09:30:59 -07:00
Nick Winter
dbcafbb29b
Working on level-specific coding languages, with non-writable code in JavaScript.
2014-05-14 21:54:36 -07:00
Scott Erickson
2a17ec5cb9
Refactored out displayObject from CocoSprites.
2014-05-14 17:05:13 -07:00
Michael Schmatz
4e268d8dc6
Add codeLanguage to level session
2014-05-14 16:41:02 -07:00
Nick Winter
dd1acb94ed
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-14 16:06:09 -07:00
Nick Winter
c420209a6b
Improved GoldView tooltip.
2014-05-14 16:06:00 -07:00
Michael Schmatz
f32a0ca963
Added transpile to in-game rank button
2014-05-14 15:45:38 -07:00
Nick Winter
d61922ae42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-14 15:31:19 -07:00
Nick Winter
cc7808251f
Zoom/scroll, ModelModal, and coordinate grabber fixes.
2014-05-14 15:29:55 -07:00
George Saines
75ab5d6435
making our recruitment % consistent
2014-05-14 14:55:04 -07:00
Scott Erickson
a1474652f6
Merge branch 'feature/thangload'
2014-05-14 14:21:40 -07:00
Scott Erickson
00fdaa1d0f
Fixed raster image sprites to update their scales when they load, and to properly place themselves if matching world dimensions.
2014-05-14 12:28:47 -07:00
Nick Winter
698207f533
Merge pull request #996 from gosnat/patch-8
...
Update world.coffee
2014-05-14 11:55:01 -07:00
Nick Winter
7f3e769cbd
Merge pull request #997 from gosnat/patch-6
...
Update GoalManager.coffee
2014-05-14 11:54:50 -07:00
Nick Winter
57f3846abb
Merge pull request #998 from gosnat/patch-7
...
Update thang.coffee
2014-05-14 11:54:46 -07:00
Scott Erickson
7a381df348
Merge branch 'feature/thangload'
2014-05-14 11:48:19 -07:00
Michael Schmatz
b11112c0aa
Merge pull request #1001 from codecombat/transpiledCode
...
Include transpiled code in submission process
2014-05-14 11:43:53 -07:00
Michael Schmatz
a1360d6cb8
Include transpiled code in submission process
2014-05-14 11:42:15 -07:00
Scott Erickson
09fbfdb360
Fixed a bug with the simulator due to the changes made to the supermodel.
2014-05-14 11:13:36 -07:00
Michael Schmatz
19a637aaa4
Open candidates in new tab
2014-05-14 10:37:16 -07:00
Scott Erickson
0be813e424
Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.
2014-05-14 10:35:16 -07:00
Michael Schmatz
9f9d651b3b
Updates to transpile script and updated aetherOptions
2014-05-14 10:14:18 -07:00
Scott Erickson
cab1adf8fc
Merge branch 'master' into feature/thangload
2014-05-14 09:31:59 -07:00
Scott Erickson
54af58baee
SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading.
2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124
Finished tuning the supermodel loading and progress.
2014-05-13 14:39:45 -07:00
Nick Winter
ab37646cb6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-13 11:04:20 -07:00
Nick Winter
53870a89a5
Python allowed, and better support for transpile errors.
2014-05-13 11:04:04 -07:00
Scott Erickson
b4ad34eb8f
LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily.
2014-05-13 10:51:55 -07:00
Michael Schmatz
961fea7d5c
Update level session schema
2014-05-13 10:49:02 -07:00
gosnat
12f351197d
Update world.coffee
...
add getGoalState
2014-05-13 12:43:39 -05:00
gosnat
72b2c84705
Update thang.coffee
...
add getGoalState
2014-05-13 12:42:48 -05:00
gosnat
25287e0298
Update GoalManager.coffee
...
add getGoalState
2014-05-13 12:41:39 -05:00
Scott Erickson
66af855497
Merge branch 'master' into feature/thangload
2014-05-13 10:27:10 -07:00
Scott Erickson
1d88b6eefe
Most of the way there getting it to work with loading thang types dynamically throughout the play view.
2014-05-13 10:26:33 -07:00
Nick Winter
69dc96c7c8
Fixed Rank My Game on my matches.
2014-05-12 19:56:12 -07:00
Dominik Maier
bb562aba32
+ Overly lengtly comment changed.
2014-05-13 04:40:15 +02:00
Nick Winter
09bdc9bad9
Fixed initial team setting.
2014-05-12 19:39:16 -07:00
Dominik Maier
521bc31fa5
+ Created function for generating a reproducable seed out of user code - as using JSON.stringify is not garanteed to be the same on every browser for objects.
2014-05-13 04:32:29 +02:00
Dominik Maier
efa39ffcd9
+ Created function for generating a reproducable seed out of user code but it fails inside the web-worker
2014-05-13 04:18:56 +02:00
Dominik Maier
2807e83672
+ "Real" predictable random. Seed depends on usercode map.
2014-05-13 03:34:11 +02:00
Nick Winter
4a151d3b72
Improving #671 .
2014-05-12 16:45:12 -07:00
Nick Winter
2eefdef191
Working on matching Surface paused state to the pause screen.
2014-05-12 15:54:07 -07:00
Nick Winter
78a0efac78
Fixed long words in Labels and empty GoldView.
2014-05-12 15:03:53 -07:00
Nick Winter
802889d115
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-12 13:28:51 -07:00
Nick Winter
1a5e30d5b5
Dynamic Canvas sizing.
2014-05-12 13:28:46 -07:00
Michael Schmatz
687872a97b
Moved debug cache onto main thread
...
UI responsiveness greatly improved
2014-05-12 11:16:02 -07:00
Nick Winter
1aa72541ff
Merged master into feature/thangload.
2014-05-12 09:57:31 -07:00
Nick Winter
e1b35251a3
Fixed bug with playback ending early.
2014-05-12 08:35:46 -07:00
Nick Winter
714d17fd7f
Adding Clojure and Lua worker modes.
2014-05-11 22:52:43 -07:00
Nick Winter
0b5854765a
Adding Clojure and Lua as choosable languages.
2014-05-11 22:51:44 -07:00
Nick Winter
74ef9bc987
Experimental support for preloading worlds when we would have autocast if manual cast is on.
2014-05-11 17:42:32 -07:00
Nick Winter
8df3b01f9e
Merged world/lodash/aether breakup for world workers.
2014-05-10 18:52:55 -07:00
Nick Winter
1e18f0b42f
Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds.
2014-05-10 18:24:50 -07:00
Scott Erickson
f1de2ca8d9
Brought the canvas size down again because it halves the FPS in Firefox at least.
2014-05-09 16:35:10 -07:00
Scott Erickson
504a904841
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-09 15:22:39 -07:00
Scott Erickson
7815951073
Split out aether from vendor.js. Should help #826 .
2014-05-09 15:22:23 -07:00
Nick Winter
df88be1ab1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-09 15:07:55 -07:00
Nick Winter
6040d3b225
Shouldn't use much CPU when totally paused on Surface.
2014-05-09 15:07:30 -07:00
Michael Schmatz
1bbd4e6c68
Fixed frame-related bug
2014-05-09 15:05:50 -07:00
Michael Schmatz
f05af0fbe7
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/assets/javascripts/workers/worker_world.js
2014-05-09 14:50:08 -07:00
Michael Schmatz
66cc427417
Forward simulation optimization
2014-05-09 14:48:43 -07:00
Nick Winter
a74d015d18
Fixed a couple minor bugs.
2014-05-09 14:30:33 -07:00
Nick Winter
589410ed8e
Merged master into feature/thangload.
2014-05-09 12:56:58 -07:00
Nick Winter
c4819c647c
Removed includeeFlow, since we're going to do it lazily with the debug worker.
2014-05-09 09:29:50 -07:00
Scott Erickson
0292be054e
I think this fixes #976 . I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more.
2014-05-08 14:56:02 -07:00
Scott Erickson
3d51969757
Fixed the patch view loading.
2014-05-08 14:54:47 -07:00
Scott Erickson
9c3cefa457
Removed a couple logs I forgot about.
2014-05-08 14:28:18 -07:00
Scott Erickson
8072629534
Merged the bug fix which I did too.
2014-05-08 13:43:15 -07:00
Scott Erickson
57f11ff3ea
Fixed some bugs with the components tab.
2014-05-08 13:40:42 -07:00
Michael Schmatz
cb5ae5f2f6
Fix #983
...
We need a generic scrolling solution
2014-05-08 11:58:45 -07:00
Nick Winter
3819778bee
Updating everything to Aether 0.2.0.
2014-05-08 11:43:00 -07:00
Nick Winter
775a2a87e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-08 11:36:26 -07:00
Michael Schmatz
f0a873cf02
Fix #985
...
I can’t wait until Chrome has majority market share
2014-05-08 11:17:27 -07:00
Scott Erickson
1e938910ed
Couple bug fixes.
2014-05-08 11:10:22 -07:00
Scott Erickson
9a5c4b6ced
Merge remote-tracking branch 'origin/master'
2014-05-08 10:54:43 -07:00
Scott Erickson
e9fc3df7c1
Set up the versions modal to display changes between versions when you select two of them.
2014-05-08 10:54:39 -07:00
Michael Schmatz
9c58aef32b
Merged worker_debug and worker_world
2014-05-08 09:47:02 -07:00
Scott Erickson
ed222338e7
Fixed #892 by having the components tab reload whenever it's opened.
2014-05-07 16:24:13 -07:00
Nick Winter
f3c6745b29
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 15:37:49 -07:00
Michael Schmatz
4221fd55cb
Fixed #979
2014-05-07 13:56:10 -07:00
Michael Schmatz
ae213cc330
Fixed #982
2014-05-07 13:33:17 -07:00
Scott Erickson
c037ce14f2
Fixed #958 . LevelLoader wasn't handling cached session objects passed in with the supermodel.
2014-05-07 13:28:42 -07:00
Michael Schmatz
7432112cba
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-07 11:37:04 -07:00
Michael Schmatz
7110f023f2
Merge branch 'feature/hover-debugger-performance'
...
Conflicts:
app/lib/God.coffee
app/views/play/level/tome/spell_debug_view.coffee
2014-05-07 11:37:03 -07:00
Scott Erickson
09a47cc5d8
Fixed #951 . The parser was removing the shadow shape but not the tween of the shadow.
2014-05-07 11:11:22 -07:00
Michael Schmatz
806b159aab
Fixed another off-by-one error
2014-05-07 10:20:22 -07:00
Michael Schmatz
6fd89f10b9
Fixed various debugger UI bugs
2014-05-07 10:03:49 -07:00
Michael Schmatz
4ef6548dad
Fixed array prototype alteration conflict
2014-05-07 09:34:37 -07:00
Nick Winter
0c30ec0c12
Some weird bugs I noticed with {me}.
2014-05-06 16:58:08 -07:00
Michael Schmatz
da575f8945
Refactored hover debugger is functional
...
Still needs optimizations and a few bug fixes, but it’s better than the
existing code existing to Nick
2014-05-06 15:07:06 -07:00
Scott Erickson
d62f04cf88
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-06 14:52:28 -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
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
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
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
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
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
Dominik Maier
c9bb488794
Created headless-client and an alternative implementation of god
2014-05-06 02:37:14 +02: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
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
Nick Winter
82529c781b
Fixed some ladder home links.
2014-05-05 15:33:08 -07:00
Scott Erickson
8f9aea1b9b
Fixed the patches view.
2014-05-05 15:19:35 -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
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
b84a73cb8e
Don't need huge raster images full-size in the Treema.
2014-05-04 21:29: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
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
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
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
