749 commits

Author	SHA1	Message	Date
Nick Winter	f17e24013b	Fixed #1217 (scaleFactor, debug shapes).	2014-07-10 14:22:15 -07:00
Scott Erickson	a3c524424c	Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users	2014-07-10 11:13:28 -07:00
Nick Winter	9ee373428f	Fixed some schema issues related to snippets and code languages.	2014-07-10 08:31:40 -07:00
Ruben Vereecken	ac95d775e6	Users can now be gotten by slug	2014-07-09 20:23:05 +02:00
Nick Winter	c19a31a58c	Fixed some wizard positioning issues in multiplayer.	2014-07-08 18:51:10 -07:00
Nick Winter	31be904b03	Working on flippable tile highlight bounds marks.	2014-07-08 16:43:36 -07:00
Scott Erickson	c1f77e3f07	Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch	2014-07-07 18:48:26 -07:00
Scott Erickson	49c8360d5b	Fixed me emitting 'me:synced' and anything listening for that.	2014-07-07 16:53:34 -07:00
Scott Erickson	aea1d0e8f2	Changed the angel logigng to use info instead of log, to more easily differentiate.	2014-07-06 15:01:39 -07:00
Ruben Vereecken	1f02b99942	Refactored showNotFound into notFoundView	2014-07-06 20:01:47 +02:00
Scott Erickson	41a8d21bfe	Merged conflicts.	2014-07-04 18:11:50 -07:00
Scott Erickson	c76032b0af	Merged conflicts.	2014-07-04 18:11:26 -07:00
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	4e284d81b7	Handled conflicts, throwing out changes to ladder_tab.coffee.	2014-07-04 17:36:10 -07:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Tery Lim	329f0e7e22	Clean up for coffeescript convention	2014-07-04 22:23:47 +08:00
Scott Erickson	2855d2a402	Made the deltas lib conflict identifying library able to handle many-to-many conflicts. ... Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.	2014-07-03 17:41:58 -07:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Nick Winter	58bf85d234	Simulator handles when there are no Greed matches to randomly simulate.	2014-06-27 08:50:04 -07:00
Nick Winter	802d43651e	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -07:00
Nick Winter	dd9b8a0018	Migrating from tileGroupNumber to tileGroupLetter.	2014-06-24 16:32:44 -07:00
Nick Winter	580d002a98	Messing with marks.	2014-06-24 15:45:33 -07:00
Scott Erickson	9b873cfab4	Patch modal handles invalid patches.	2014-06-24 17:25:01 -04:00
Scott Erickson	ee0b14eb61	Changed the versions history modal to show name and date.	2014-06-24 16:41:55 -04:00
Michael Schmatz	988ad6ffda	Attempting to fix G+	2014-06-24 11:29:43 -07:00
Nick Winter	815ef88e78	Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.	2014-06-23 10:36:42 -07:00
Nick Winter	81f8334f37	Some fixes for CocoSprite alphas.	2014-06-21 22:31:10 -07:00
Nick Winter	6813279871	Fixed an infinite loop timeout issue.	2014-06-21 10:56:55 -07:00
Nick Winter	564c463431	Stop tracking Simulator events to Mixpanel.	2014-06-21 09:17:56 -07:00
Nick Winter	c9dcc290cb	Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.	2014-06-20 17:19:18 -07:00
Fergus Leen	88aa8d234c	Facebook friends patch	2014-06-20 02:18:40 +01:00
Nick Winter	bb8b9b2e93	bid -> makeBid.	2014-06-19 17:27:41 -07:00
Michael Schmatz	34f5377754	Increased infinite loop timeout	2014-06-19 17:16:08 -07:00
Michael Schmatz	40fd1674ad	Temporary fix for bid function in hover debugger	2014-06-19 17:09:45 -07:00
Nick Winter	7b59c42f5d	Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.	2014-06-19 15:41:35 -07:00
Michael Schmatz	a1b7025730	Emergency linkedin hot fix	2014-06-19 08:36:22 -07:00
Michael Schmatz	548eaefae1	Add debug variable inspection progress bar	2014-06-18 13:43:04 -07:00
Scott Erickson	ee791da34c	Moved services into their own folder, and made no services run for both testing and demo pages.	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
Scott Erickson	4932317982	Finally got the demo view working (mostly). Need to turn off third party ajax requests.	2014-06-16 11:40:08 -07:00
Scott Erickson	1786eab09d	Initial work on a demo view. But brunch won't build demo-app.js for some reason.	2014-06-16 11:40:08 -07:00
Nick Winter	1502cdc64b	Merge branch 'jayant1992-master'	2014-06-13 08:17:12 -07:00
Ruben Vereecken	dcdcca751f	Fiddled with creating xp functions	2014-06-12 19:44:56 +02:00
Ruben Vereecken	509be067c3	Added support for the operator in LocalMongo	2014-06-12 19:41:00 +02:00
Ruben Vereecken	a61d0e5569	Added support for diminished exp for repeatables. Needs tweaking though.	2014-06-12 19:40:59 +02:00
Nick Winter	77920b5416	Improvements to profile views. Added links to players' code.	2014-06-11 19:38:47 -07:00
Scott Erickson	e6dc896bab	Reworking some code to use the new CocoModel.patch method.	2014-06-11 11:34:52 -07:00
Jayant Jain	d5d20377a2	Removes panning upon right click in editor	2014-06-11 15:05:59 +05:30