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 |
|
Vicky Chijwani
|
0a14681e7b
|
Correctly parse multi-line error messages in the editor.
|
2014-05-16 01:41:26 +05:30 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Scott Erickson
|
cab1adf8fc
|
Merge branch 'master' into feature/thangload
|
2014-05-14 09:31:59 -07:00 |
|
Scott Erickson
|
4b404ae124
|
Finished tuning the supermodel loading and progress.
|
2014-05-13 14:39:45 -07:00 |
|
Nick Winter
|
53870a89a5
|
Python allowed, and better support for transpile errors.
|
2014-05-13 11:04:04 -07: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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Dominik Maier
|
6d244e8560
|
+ Merged Simulators
|
2014-05-06 05:07:34 +02: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 |
|
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 |
|
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
|
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 |
|
Scott Erickson
|
2952d7702c
|
Merge branch 'master' into feature/thangload
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
|
2014-05-02 08:20:03 -07:00 |
|
Scott Erickson
|
92687b17de
|
Merge branch 'master' into feature/thangload
Conflicts:
app/lib/LevelLoader.coffee
app/views/play/level_view.coffee
|
2014-05-02 08:19:47 -07:00 |
|
Nick Winter
|
ae31f90a25
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-01 17:41:10 -07:00 |
|
Nick Winter
|
9f18811701
|
Fixed logic for displaying runtime errors from last run based on code being the same as last cast.
|
2014-05-01 17:41:06 -07:00 |
|
Michael Schmatz
|
347292c985
|
Implemented save notes button
|
2014-05-01 17:36:49 -07:00 |
|
Michael Schmatz
|
9fb5826593
|
Scroll to candidate position while going back
|
2014-05-01 16:56:41 -07:00 |
|
Scott Erickson
|
26cafd2f19
|
Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.
|
2014-05-01 16:38:27 -07:00 |
|
Scott Erickson
|
3bc0c1710e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-01 15:45:00 -07:00 |
|
Scott Erickson
|
31c5890288
|
Fixed #934
|
2014-05-01 15:44:50 -07:00 |
|
Nick Winter
|
5376a42f94
|
Fixed serialization of tracked property arrays.
|
2014-05-01 13:23:14 -07:00 |
|
Nick Winter
|
bebe5a0620
|
Improved hover debugger tokenization specificity to not extend past end of line.
|
2014-05-01 11:18:20 -07:00 |
|
Michael Schmatz
|
294570cb1b
|
Made it so that modal doesn't show if you've signed the contract
|
2014-04-29 15:30:28 -07:00 |
|
Nick Winter
|
eca35ce371
|
Several minor bugfixes, and enabled API protection on all levels by default.
|
2014-04-29 15:25:59 -07:00 |
|
Michael Schmatz
|
546bd26328
|
Fixed login flow and user profile issue
|
2014-04-29 15:12:50 -07:00 |
|
gosnat
|
d0900870b2
|
Update play_view.coffee
Fixed ID for harvest-time level (was pointing to find-the-spy)
|
2014-04-29 10:53:55 -05:00 |
|
Nick Winter
|
40fbf336c2
|
Using new level loading sound.
|
2014-04-28 17:59:02 -07:00 |
|
Nick Winter
|
bd3c059c2a
|
Several performance improvements based on profiling.
|
2014-04-28 16:31:51 -07:00 |
|
Scott Erickson
|
b9f4093b08
|
Set up the LevelLoader to load names instead of whole ThangTypes.
|
2014-04-28 14:58:58 -07:00 |
|
Nick Winter
|
7e16fa5bd6
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-28 14:01:43 -07:00 |
|
Nick Winter
|
6d75b5593a
|
Fixed bug with pointer animation.
|
2014-04-28 14:01:33 -07:00 |
|
Scott Erickson
|
3a28f190a1
|
Merge branch 'master' into feature/loading-views
|
2014-04-28 11:55:17 -07:00 |
|
Scott Erickson
|
02a74ae40c
|
Migrated and fixed the rest of the views using the new loading system.
|
2014-04-28 11:52:04 -07:00 |
|
Scott Erickson
|
8164c6881c
|
Fixed a patches resource name.
|
2014-04-28 11:10:27 -07:00 |
|
Scott Erickson
|
01f2a556f9
|
Set up the patches view with the new loading system, fixing a few things in the meanwhile.
|
2014-04-28 11:09:21 -07:00 |
|
Nick Winter
|
4a2f2700bc
|
Don't show tutorial level link if tutorial level doesn't exist for a ladder level.
|
2014-04-28 10:54:03 -07:00 |
|
Scott Erickson
|
17a0bf54c6
|
Merge branch 'master' into feature/loading-views
|
2014-04-28 10:10:57 -07:00 |
|
dpen2000
|
0a8ec096f7
|
Make components read only for anonymous users
|
2014-04-28 02:03:08 -04:00 |
|
dpen2000
|
3165a2b654
|
Change all lines setting readonly from being admin only to being authenticated only
|
2014-04-28 02:03:08 -04:00 |
|
Nick Winter
|
a7179ae3b2
|
Fixed some more gold view stuff.
|
2014-04-27 15:33:16 -07:00 |
|
Nick Winter
|
2ec225b0d0
|
Enabled API protection for Find the Spy.
|
2014-04-27 14:30:32 -07:00 |
|
Nick Winter
|
dac4f05fd9
|
Improved legibility of gold font. Moved Done button to not conflict with gold display.
|
2014-04-27 14:19:39 -07:00 |
|
Nick Winter
|
fa0e7f04f7
|
Fixed a thing.
|
2014-04-26 14:21:26 -07:00 |
|
Scott Erickson
|
fed5d681f2
|
Merge branch 'master' into feature/loading-views
|
2014-04-26 12:54:37 -07:00 |
|
Scott Erickson
|
14cffc5875
|
Did some refactoring to simplify using SuperModel and registering models and collections.
|
2014-04-26 12:54:03 -07:00 |
|
Scott Erickson
|
d5bcec5ad0
|
Fixed the level editor with the new loading system.
|
2014-04-25 19:11:32 -07:00 |
|
Nick Winter
|
834c27bbd7
|
Show spell palette for Thangs with apiProperties that aren't programmable.
|
2014-04-25 16:57:42 -07:00 |
|
Scott Erickson
|
14d62915f4
|
Got projection and backups set back up, partially fixed the level editor.
|
2014-04-25 16:14:05 -07:00 |
|
Scott Erickson
|
6cd7c723d8
|
Fixed up showing errors, made sure they work with the play view.
|
2014-04-25 15:31:38 -07:00 |
|
Nick Winter
|
d8d2a57c38
|
Listed a few new levels.
|
2014-04-25 15:00:46 -07:00 |
|
Scott Erickson
|
7640a6365b
|
Removed some logs.
|
2014-04-25 14:59:17 -07:00 |
|
Scott Erickson
|
3dc3f62473
|
Merge branch 'master' into feature/loading-views
Conflicts:
app/views/editor/components/main.coffee
|
2014-04-25 14:31:58 -07:00 |
|
Scott Erickson
|
278d6752c3
|
Refactored SuperModel, CocoModel and LevelLoader.
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
|
2014-04-25 14:30:06 -07:00 |
|
Nick Winter
|
2ff97c3bcd
|
I guess emails might not be there.
|
2014-04-25 10:55:37 -07:00 |
|
Nick Winter
|
183fe9c496
|
Code review of 97d3b6.
|
2014-04-25 10:46:43 -07:00 |
|
Michael Schmatz
|
abe07e6395
|
Potential popup blocker fix
|
2014-04-25 09:17:04 -07:00 |
|
Michael Schmatz
|
97d3b6107d
|
Merge feature/linkedin into master
|
2014-04-25 08:47:31 -07:00 |
|
Michael Schmatz
|
61458c97d6
|
Fixed jqxhr error display
|
2014-04-25 07:50:29 -07:00 |
|
Michael Schmatz
|
0dbcc861bf
|
Various tweaks to employer signup
|
2014-04-25 07:48:59 -07:00 |
|
Michael Schmatz
|
4f6f845c2d
|
Employer signup works
|
2014-04-24 17:36:07 -07:00 |
|
Michael Schmatz
|
6644c6a9ee
|
Push for george
|
2014-04-24 15:27:37 -07:00 |
|
Nick Winter
|
8a42521cd0
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-24 14:31:54 -07:00 |
|
Nick Winter
|
2a2ddd068e
|
Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.
|
2014-04-24 14:23:15 -07:00 |
|
Scott Erickson
|
b7cb4696f0
|
Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection
|
2014-04-24 13:31:29 -07:00 |
|
Scott Erickson
|
2d43b36022
|
Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText
|
2014-04-24 13:29:24 -07:00 |
|
Scott Erickson
|
e2c2657f34
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-24 13:23:40 -07:00 |
|
Scott Erickson
|
472f8899dd
|
Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master
Conflicts:
app/views/editor/level/edit.coffee
|
2014-04-24 13:17:43 -07:00 |
|
Nick Winter
|
b9173a5ea5
|
Fixed #913, I think. (This was just built into marked.)
|
2014-04-24 12:24:22 -07:00 |
|
Scott Erickson
|
0a313a110c
|
Removed a piece of logging.
|
2014-04-24 12:07:11 -07:00 |
|
Scott Erickson
|
8ab50205aa
|
Fixed more buttons in treema.
|
2014-04-24 11:50:49 -07:00 |
|
Scott Erickson
|
1eb2adbc61
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-24 11:22:50 -07:00 |
|
Scott Erickson
|
76f36294b0
|
Fixed #908, while keeping things like opening revert or contact modals in the level editor from breaking.
|
2014-04-24 11:22:43 -07:00 |
|
Nick Winter
|
73f39095e6
|
Upgraded table sorter.
|
2014-04-24 11:09:01 -07:00 |
|
tmrdja
|
14ebc957de
|
Changed responsive view for LevelEditor
|
2014-04-24 11:51:16 +02:00 |
|
Michael Schmatz
|
c408196814
|
Fix for runtime errors
|
2014-04-23 16:44:31 -07:00 |
|
Nick Winter
|
86aa4cd0fe
|
Updated janky include_flow skip levels.
|
2014-04-23 16:11:47 -07:00 |
|
Darredevil
|
47eef39bc7
|
Added Gold Rush level
|
2014-04-24 02:07:59 +03:00 |
|
Nick Winter
|
68f3eeb770
|
Two tiny profile improvements.
|
2014-04-23 11:26:20 -07:00 |
|
Michael Schmatz
|
628a784ac4
|
Progress towards LinkedIn integration
|
2014-04-23 11:25:36 -07:00 |
|
Scott Erickson
|
c85971e5e6
|
Added i18n population action to the level editor.
|
2014-04-22 17:56:41 -07:00 |
|
Scott Erickson
|
9c8841e838
|
Merge remote-tracking branch 'origin/master'
|
2014-04-22 16:42:50 -07:00 |
|
Scott Erickson
|
5921575a02
|
Hack to fix a bug with the components view in the thang editor.
|
2014-04-22 16:42:41 -07:00 |
|
dpen2000
|
dd00e2abe6
|
Replace generic text Sign Up to Create a New Content
|
2014-04-23 00:37:10 +01:00 |
|
edtrist
|
3962d37681
|
#889 - moved CocoCollection.coffee to app/collections and updated references
|
2014-04-22 20:42:26 +01:00 |
|