Nick Winter
00b8a62bfb
Don't need this big ol' worker-xquery.js.
2014-11-09 18:48:56 -08:00
Nick Winter
a8700f5113
Reload now shows confirmation modal again. Added some stuff missing from the last commit.
2014-11-08 08:38:25 -08:00
Nick Winter
f3dfcdc81d
Implemented new HUD design. Removed more unneeded stuff. Changed reload button to restart level. Still need restart confirmation and to redo the sprite dialogue area.
2014-11-07 19:15:55 -08:00
Nick Winter
cfff09b01e
Merged big .executing arrow.
2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc
Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things.
2014-11-07 16:04:35 -08:00
Scott Erickson
a087663458
Implemented Heald's design of the GameMenuModal.
2014-11-07 13:02:28 -08:00
Nick Winter
fbc2799211
Startd to implement new code editor design. Fixed #1732 .
2014-11-07 09:09:13 -08:00
Scott Erickson
e23e6f4ad2
Refactored the names of the play modal files.
2014-11-07 07:04:10 -08:00
Scott Erickson
c660053dea
Set up the PlayHeroesModal, and hooked it into the world map.
2014-11-05 19:04:14 -08:00
George Saines
b751f5ab22
making the selection in the item store lighter
2014-11-05 16:35:59 -08:00
Nick Winter
f461aeca95
Implemented new playback scrubber textures.
2014-11-04 19:03:35 -08:00
Nick Winter
b776350e6a
Made item shop fit on iPad and small screens.
2014-11-04 08:39:36 -08:00
Scott Erickson
33d14918b0
Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed.
2014-11-03 20:48:59 -08:00
Nick Winter
ad2fdb9dde
Working on new Fully Illustrated designs for level play view and iPad interface.
2014-11-02 14:51:01 -08:00
George Saines
40a2c6bbe8
slightly improving forest map icon
2014-10-30 19:11:12 -07:00
Scott Erickson
642fda9520
Forgot to add world map campaign icons.
2014-10-29 10:07:51 -07:00
Michael Schmatz
cd0bed2df2
Added FastClick
...
iOS artificially introduces 300ms of delay on clicks, which FastClick
eliminates.
2014-10-26 18:34:04 -04:00
George Saines
4b62ba95d3
making the arrow bigger/more visible
2014-10-25 15:59:02 -07:00
Nick Winter
a33bb215d4
Fixed checking compile-time problems for clean code goals.
2014-10-20 17:49:52 -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
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
Scott Erickson
6ff7cd12cc
Mostly done with the victory modal.
2014-10-13 11:53:08 -04:00
Nick Winter
d50a90171a
Added new slot icons and dungeon map.
2014-10-01 18:17:21 -07:00
Matt Lott
1e864d49e2
Box2D in own script, rename Vector
...
Renaming Vector to Box2DVector to avoid naming collisions when
including Box2D on the main thread. There may be a way to change how
scripts are built and included to avoid this rename, but it wasn’t
obvious.
Box2D declares a Vector in the global namespace, which conflicts with
the CodeCombat Vector.
2014-09-29 12:48:58 -07:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
George Saines
8183d671b8
simplifying the homepage
2014-09-25 14:38:02 -07:00
Nick Winter
6441a753d5
Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better.
2014-09-24 20:15:17 -07:00
Matt Lott
db525a8073
Fix IE restricted property check
2014-09-24 15:46:53 -07:00
Matt Lott
73e49f9972
IE11 compatibility fixes
...
Removing social share buttons from base if IE, except Facebook.
Unrolling restricted property setting loop (weird).
Updating isIE check to support IE11.
2014-09-24 12:17:13 -07:00
Nick Winter
c1023b137f
Better pointing out of submit button when victory is ready.
2014-09-23 18:21:27 -07:00
Nick Winter
4cdff02a32
Implemented most of new inventory view.
2014-09-20 23:11:51 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Matt Lott
3209e4f838
Add loop statement to JavaScript and Python
2014-09-18 09:47:29 -07:00
Nick Winter
95e37fa3b2
Starting new front view (at /front for now) and play view (at /play-hero for now).
2014-09-17 18:56:08 -07:00
Michael Schmatz
c08c279f8b
Removed net neutrality banner
2014-09-11 16:13:06 -04:00
Michael Schmatz
b35a0161e8
Inserted Battle For The Net banner
2014-09-09 12:34:30 -04:00
George Saines
0beb34e3db
redoing the about page
2014-09-04 16:59:46 -07:00
George Saines
d1eac35a4f
fixed transparency issue with thang image
2014-09-01 14:09:39 -07:00
George Saines
495247661b
bringing contribute avatars up to speed
2014-08-31 15:21:30 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Nick Winter
e666ee1dac
Added stop playback button and real-time countdown screen.
2014-08-25 22:05:30 -07:00
Nick Winter
be07f9cfb9
Many improvements to real-time streaming and flags.
2014-08-23 22:24:00 -07:00
Nick Winter
f59084e651
Sending flag history to the World for to make flag Thangs during simulation.
2014-08-23 17:26:56 -07:00
Nick Winter
9c0869e566
Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!
2014-08-22 21:35:08 -07:00
Nick Winter
92f0a68dd1
World streaming is getting there!
2014-08-22 14:59:32 -07:00
Nick Winter
9b31e28536
More improvements to world streaming.
2014-08-21 21:23:45 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Nick Winter
4889cc4e62
Moved achievement and contribute images from public to assets.
2014-08-20 19:00:39 -07:00
Nick Winter
34c389ed5d
Put the Markdown mode in there. (We can't figure out why it wasn't there or whether it ever worked or why it stopped working, but whatever.)
2014-08-18 15:42:32 -07:00
Scott Erickson
69ab177702
Trying to get rid of debug logs in karma. Tried to do it with the conf, didn't seem to work, did a hack instead.
2014-08-18 13:43:17 -07:00
Scott Erickson
5a700c14df
Stab at fixing the client tests on travis.
2014-08-14 11:00:42 -07:00
Nick Winter
18b0208aac
Updated i18n.
2014-08-14 10:57:57 -07:00
Jayant Jain
eece235337
Adds preset images
2014-08-12 20:42:42 +05:30
Scott Erickson
b3572dfad9
Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.
2014-08-11 15:41:08 -07:00
Nick Winter
6b2c079ff5
More work on game menu skeleton.
2014-08-08 15:57:20 -07:00
Scott Erickson
cc025942f8
Extended the LevelLoader to load thang types and components dynamically for hero levels.
2014-08-07 18:27:47 -07:00
George Saines
0549273d14
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8
community page redesign
2014-08-06 17:42:19 -07:00
Jayant Jain
86cf344f28
Adds preset images to preview the generated terrain
2014-07-25 17:50:02 +05:30
George Saines
574252df32
subbing in Pavel's better tiny programming language icons
2014-07-22 09:11:25 -07:00
Nick Winter
d45c2d31de
New language icons.
2014-07-18 20:14:41 -07:00
George Saines
18631ec5b1
upgrading our level icons
2014-07-18 15:42:53 -07:00
Nick Winter
2d7b6eb145
Updated code language logos. Added code language blurb i18n tags.
2014-07-17 20:12:59 -07:00
Nick Winter
42af807e5c
Merged in geometry work from #51 .
2014-07-16 16:01:37 -07:00
Nick Winter
bd47b3bc83
Fixed #1210 based on #1313 .
2014-07-13 18:53:01 -07:00
Nick Winter
45545796a0
Fixes, tweaks, and i18n for the employers page.
2014-07-10 19:17:51 -07:00
Scott Erickson
850712442d
Added underscore.string to the worker.
2014-07-06 15:01:20 -07:00
George Saines
88b0a0a97b
making changes to the employer page icon dimensions
2014-07-03 15:17:38 -07:00
Michael Schmatz
ebc79668ef
Added image assets for recruitment page
2014-07-02 11:42:02 -07:00
George Saines
a94053fd1d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-26 10:38:18 -07:00
George Saines
e294133bcf
adding the files I forgot
2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94
Merged in the language-war branch.
2014-06-25 23:00:03 -07:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Nick Winter
1e9b403ce5
More zazz for home page code language selection.
2014-06-19 14:55:16 -07:00
Nick Winter
a58f3e0fb6
More styling work on code language selector.
2014-06-19 12:31:56 -07:00
Michael Schmatz
2559a73244
Merge pull request #1186 from dkundel/master
...
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730
Emergency linkedin hot fix
2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78
Working on home language selection.
2014-06-19 08:06:34 -07:00
Dominik Kundel
7e8845332e
updated Ace minified
2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05
updated Ace
2014-06-18 23:18:58 +02:00
Dominik Kundel
33d68fab6e
Merge remote-tracking branch 'upstream/master'
2014-06-18 21:50:55 +02:00
Scott Erickson
50fea7e937
Added a method for returning all requests in mock-ajax.
2014-06-18 12:04:39 -04:00
Dominik Kundel
d3e0299465
merge conflict solved
2014-06-18 17:59:26 +02:00
Scott Erickson
3e24b2f86e
Fixed tests running in karma.
2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81
Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.
2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25
Refactored vendor loading
2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674
Extracting third party scripts out of main
2014-06-16 11:40:08 -07:00
Dominik Kundel
e756c83d9e
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:12:55 +01:00
George Saines
fb7b3f8580
adding a top info arena on top of the employers page
2014-06-12 16:01:34 -07:00
Scott Erickson
01c20f4065
Fixed karma tests.
2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7
Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842
2014-06-07 16:41:19 -07:00
Nick Winter
67b10474e8
Suggested improvements to profile pages.
2014-06-07 00:33:18 -06:00
Scott Erickson
49c9c6bfc9
Built the client test view (rebased from feature/testclient).
2014-06-05 16:56:29 -07:00
Nick Winter
0b2d5c251d
A bit more Worker hardening.
2014-06-04 15:47:09 -06:00
Nick Winter
f3adc216ed
Protecting our replacement of Math.random via Aether.
2014-05-29 12:26:08 -07:00
Nick Winter
c01bd69625
Better recoverability for non-UserCodeProblem errors during world generation.
2014-05-26 18:45:00 -07:00
Nick Winter
26d2816071
Fixed some more memory leaks.
2014-05-22 19:05:11 -07:00
George Saines
a2fbe5865a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-22 09:55:34 -07:00
George Saines
4ffbdf004c
modifying oreilly logo size
2014-05-22 09:55:30 -07:00
Nick Winter
d058b16283
Fixed some memory leaks.
2014-05-20 08:00:49 -07:00
George Saines
5d603f625e
removing China
2014-05-19 22:14:05 -07:00
George Saines
5b6b26415b
making the Firebase logo look good
2014-05-19 21:39:41 -07:00
George Saines
07177e1a89
putting together the prizes page
2014-05-19 15:19:56 -07:00
Michael Schmatz
5c72ccdce1
Add support for Aether globals in hover debugger
2014-05-18 11:41:42 -07:00
Nick Winter
f64e50f85b
Recording flow only for frame of interest.
2014-05-16 16:52:55 -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
cab1adf8fc
Merge branch 'master' into feature/thangload
2014-05-14 09:31:59 -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
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
714d17fd7f
Adding Clojure and Lua worker modes.
2014-05-11 22:52:43 -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
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
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
3819778bee
Updating everything to Aether 0.2.0.
2014-05-08 11:43:00 -07:00
Michael Schmatz
9c58aef32b
Merged worker_debug and worker_world
2014-05-08 09:47:02 -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
Michael Schmatz
4ef6548dad
Fixed array prototype alteration conflict
2014-05-07 09:34:37 -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
Michael Schmatz
e8d26af985
Implemented caching and fixed off by one error
2014-05-06 11:36:46 -07:00
Michael Schmatz
dddd617a08
userCodeMap issues fixed
...
Now beginning hooking up the UI
2014-05-06 10:06:32 -07:00
Michael Schmatz
97f3694dbf
Basic backend functionality is there
2014-05-05 13:26:37 -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
Michael Schmatz
717651d6ff
Progress on thang property serialization
...
There is a bug where thang properties aren’t updated when simulating
forward
2014-05-01 16:08:46 -07:00
Michael Schmatz
c9ea301b29
Fixed various bugs with debug worker
2014-05-01 11:12:44 -07:00
Michael Schmatz
544cc62cdb
First steps towards hover debugger improvements
2014-04-28 15:05:54 -07:00
Michael Schmatz
628a784ac4
Progress towards LinkedIn integration
2014-04-23 11:25:36 -07:00
Michael Schmatz
3110e6e56a
Renamed test_worker to aether_worker
2014-04-22 11:58:27 -07:00
Michael Schmatz
3bbedbc100
Added background transpile
2014-04-22 11:46:17 -07:00
Michael Schmatz
e0f8d1343e
Fixed race condition
2014-04-22 11:04:56 -07:00
Michael Schmatz
0f435b41ae
Merge pull request #885 from codecombat/master
...
Merge master into worker-lint
2014-04-21 14:13:43 -07:00
Michael Schmatz
a7867e5e2d
Added background linting
...
Background hasChangedSignificantly is soon!
2014-04-18 14:59:08 -07:00
Nick Winter
844c1391ca
Reworked top nav. Many improvements to job profile form.
2014-04-18 09:53:28 -07:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
177dd2c8cd
Set up Bootstrap 3 glyphicons.
2014-04-11 15:37:04 -07:00
George Saines
722165b0ad
adding ladder buttons and new load screen
2014-04-11 14:51:21 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Nick Winter
f17775cc10
Implemented George's jobs page design.
2014-04-09 13:14:52 -07:00
Aditya Raisinghani
89670526ba
Removed nanoscroller code from main.html
2014-04-08 03:08:16 +05:30
Aditya Raisinghani
7cc9d22254
Moved nanoscroller to bower components and related fixes.
2014-04-08 03:04:36 +05:30
Nick Winter
d8999fb4f3
Got rid of the css of antiscroll in favor of nanoscroller.
2014-04-06 15:08:13 -07:00
Nick Winter
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07:00
Aditya Raisinghani
44979c074d
Integrated nanoscroller.
2014-04-03 03:10:06 +05:30
Scott Erickson
0a78368217
Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it.
2014-04-02 13:12:24 -07:00
Scott Erickson
132b22f14a
Got the gplus friends loading now.
2014-03-26 13:50:01 -07:00
Jayant Jain
71294f14b2
Updates fb and g+ functions to be called on api load, fixes #695
2014-03-26 22:03:20 +05:30
Nick Winter
4bc1e6805b
Improved page title. Fixed Twitter card image.
2014-03-21 17:06:51 -07:00
Nick Winter
424390ae84
Moved antiscroll init; disabled it for now because of bugginess.
2014-03-20 22:00:34 -07:00
Karthig
f52dced0ce
- initial implementation of antiscroll, squashed
2014-03-20 21:39:03 -07:00
Scott Erickson
431d3054b6
Set up Facebook to work when working on localhost.
2014-03-20 17:02:25 -07:00
Fusspawn
b10b9fcb4e
Added Function.Prototype.bind shim to world worker to enable running on headless browsers
2014-03-19 23:12:35 +00:00
Scott Erickson
1fa18fe2e0
Added a border to the home view video.
2014-03-16 22:46:57 -07:00
Scott Erickson
150077ab22
Removed the new button from the home view.
2014-03-16 17:48:16 -07:00
Scott Erickson
eee8fbba2c
New level page with new artwork.
2014-03-16 16:59:48 -07:00
George Saines
417ff1e48d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 15:12:09 -07:00
Nick Winter
efd0d82dea
Working on new loading view design.
2014-03-14 17:06:08 -07:00
George Saines
c00c7ed56b
adding the new website background images
2014-03-14 15:24:36 -07:00
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07:00
Nick Winter
4556536df4
Hooked up new HUD icons.
2014-03-04 11:15:31 -08:00
George Saines
33e2571934
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-03 18:04:01 -08:00
George Saines
113c71e141
adding new hud icons
2014-03-03 18:03:54 -08:00
Scott Erickson
e231952fcf
Added the jquery minicolors image.
2014-03-03 14:17:36 -08:00
Scott Erickson
fb75ad36e7
Added team icons to the ladder play view.
2014-03-03 12:04:31 -08:00
George Saines
58f2aa6123
adding victory and 404 images
2014-02-28 18:58:40 -08:00
Nick Winter
aef1bc63ba
Smarter infinite loop detection vs. web-worker-is-still-loading detection.
2014-02-27 20:01:27 -08:00
Nick Winter
dcf7a0d1fd
Re-enabled Olark.
2014-02-19 12:43:25 -08:00
Nick Winter
6f0ed9040a
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
2014-02-17 17:38:49 -08:00
Scott Erickson
8176e2258f
Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.
2014-02-12 16:20:25 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Nick Winter
2e7a1fd0ef
Working on the contribute pages -- #314 .
2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e
Starting to add contributor avatars.
2014-02-07 18:38:17 -08:00
Nick Winter
ea99a7b139
Turned off Olark for now.
2014-02-06 10:17:54 -08:00
Michael Schmatz
ce48411ddb
Added worker_world.coffee
2014-01-31 10:40:01 -08:00
Nick Winter
6e40fa09a6
Updated some Bootstrap event names.
2014-01-30 16:36:36 -08:00
Nick Winter
6fa38bd889
Several improvements to hover debugging.
2014-01-24 13:03:04 -08:00
Scott Erickson
3c3e38b585
Set up thang avatar views with the new db portraits.
2014-01-09 14:04:46 -08:00
Nick Winter
70cd16cee4
Fixing bug with application require for now. Shoutout for Firebase.
2014-01-06 23:45:33 -08:00
Scott Erickson
a988c91a63
Fixed blog links.
2014-01-06 20:17:27 -08:00
Nick Winter
6009df26de
Ready for action, sir!
2014-01-03 10:32:13 -08:00