Matt Lott
36921f7644
Fix IE9 script loading
...
Script tags weren’t loading sequentially.
IE9 doesn’t support the defer attribute:
https://github.com/h5bp/lazyweb-requests/issues/42
Conditional comments:
http://msdn.microsoft.com/en-us/library/ms537512%28v=vs.85%29.aspx
Breaking change:
https://github.com/codecombat/codecombat/commit/b698745e0505857ef8a21de9
fa2729ff5ab473ce
2015-01-06 10:53:32 -08:00
Nick Winter
947811c01b
Replayable once-per-day increasing-difficulty level basics.
2015-01-05 10:44:24 -08:00
George Saines
b0056127af
changing the xp icon in the play view
2014-12-31 15:23:33 -08:00
Nick Winter
744d30737e
Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents.
2014-12-28 13:25:20 -08:00
George Saines
9e88caf1e1
redesigned the contribute page
2014-12-18 16:31:30 -08:00
George Saines
9d72c37876
removing gradient
2014-12-16 11:41:07 -08:00
Scott Erickson
e5c5f0ba04
Fixed Karma client test runner.
2014-12-12 13:12:35 -08:00
Nick Winter
87c34e81c6
Using new border image popover backgrounds.
2014-12-10 11:00:52 -08:00
Nick Winter
f8661c4a96
Added the lock image, actually.
2014-12-10 10:40:10 -08:00
Scott Erickson
bf80307142
Put in new, smaller versions of the world map and loading wings for smaller screens.
2014-12-10 09:45:00 -08:00
George Saines
40582e97bd
adding desert map
2014-12-09 16:16:55 -08:00
Scott Erickson
46f7bbaaf5
Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks.
2014-12-09 13:41:44 -08:00
Matt Lott
1aff798c5e
A/B Test alternate subscribe modal copy
2014-12-08 23:43:52 -08:00
Matt Lott
06367d106b
IE8 unsupported message
...
Had to go low-tech. IE8 doesn’t make it far enough for a nicely styled
homepage with unsupported message.
2014-12-07 18:56:59 -08:00
Nick Winter
01c6709c36
Implemented George's WorldMapView user status line design.
2014-12-07 16:55:08 -08:00
Nick Winter
9054f70052
Implemented new victory modal design.
2014-12-07 14:03:11 -08:00
Scott Erickson
690a24cda9
Added static imagery to the world map to show better completed, started and premium levels.
2014-12-07 13:28:32 -08:00
Nick Winter
d53d1d5ace
Merginated.
2014-12-06 17:28:11 -08:00
Nick Winter
9bde375dcc
Implemented new AuthModal design (sans green button for signup/login).
2014-12-06 17:27:02 -08:00
Scott Erickson
b976a11d65
Removed the module loader modal, replaced with a simple progress bar at the top of the screen.
2014-12-06 13:11:47 -08:00
George Saines
04a6ab3734
resizing large img files, adding buttons for victory modal
2014-12-05 16:57:39 -08:00
George Saines
bcaad51b24
more level rearranging
2014-12-03 11:19:48 -08:00
George Saines
103d1035a2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-03 10:53:52 -08:00
George Saines
5dafe4b541
changing the placement of the level dots
2014-12-03 10:53:45 -08:00
Nick Winter
f82ccfc4cb
The sky darkened.
2014-12-03 10:04:50 -08:00
Nick Winter
32d3745b77
A tiny bit more progress on the SubscribeModal.
2014-12-02 21:27:12 -08:00
Nick Winter
15d7ac876a
Starting SubscribeModal.
2014-12-02 20:01:53 -08:00
Nick Winter
8ce192bf7c
Got modularized Aether imports working for PlayLevelView and its workers.
2014-12-01 15:43:22 -08:00
Scott Erickson
57b154810b
Added a placeholder me for iPad which inspects the object once the page loads.
2014-12-01 10:45:19 -08:00
Nick Winter
35f1ed1e82
Implemented George's new level loading view design.
2014-11-30 18:02:45 -08:00
Nick Winter
77a4cea387
Improvements for mobile layouts and mobile and iPad browser detection.
2014-11-30 12:27:34 -08:00
Scott Erickson
31214e854e
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05
Set up the site to load its logic and templates piecemeal rather than in one giant app.js file.
2014-11-28 16:38:56 -08:00
George Saines
294a8497ed
making the editor error more visually distinctive
2014-11-23 13:32:26 -08:00
George Saines
1bdc331f40
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-22 18:00:28 -08:00
George Saines
c98e875c68
making the error message more blood red
2014-11-22 18:00:23 -08:00
Scott Erickson
0e6965d097
Hiding the iPad link for now.
2014-11-22 17:44:26 -08:00
Scott Erickson
cfcd09c112
Set up the new Heald-designed site chrome.
2014-11-22 17:41:13 -08:00
George Saines
2151cd6799
added the additional default inventory icons, added the dungeon map path
2014-11-22 16:14:43 -08:00
George Saines
9a2c52545f
adding carpeting to the dungeon floor
2014-11-22 15:18:19 -08:00
George Saines
6310dcbcac
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-18 13:02:36 -08:00
George Saines
c9d7754623
adding a close button to the main menu modal
2014-11-18 13:02:32 -08:00
Nick Winter
bf71893ddf
Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.
2014-11-17 21:30:44 -08:00
Nick Winter
e5aada2e5b
Incorporated tweaked victory modal background assets.
2014-11-16 21:26:21 -08:00
Nick Winter
29860caeea
Implemented new blue background texture for dialogue messages.
2014-11-12 20:45:15 -08:00
Scott Erickson
ed8285248f
Put in the new InventoryModal background.
2014-11-12 18:01:35 -08:00
Scott Erickson
5b034194ee
Put in the new BuyGemsModal design.
2014-11-12 17:17:24 -08:00
George Saines
8440f38bd4
added a buy gems icon to the map icon spritesheet
2014-11-12 16:48:05 -08:00
George Saines
047e0c2f41
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-12 11:01:18 -08:00
George Saines
f0a490f21e
adding matt's profile pic for reals
2014-11-12 11:01:12 -08:00
Nick Winter
111b9febac
Updated main.html. Removed LinkedIn.
2014-11-09 20:35:46 -08:00
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
