730 commits

Author	SHA1	Message	Date
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
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
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
Corey Prak	8448061f7b	Added more names for #53	2014-06-10 12:52:06 -04:00
Michael Schmatz	f29a41f108	Add linkedIn link, field of study support to LinkedIn import	2014-06-08 18:15:18 -07:00
Michael Schmatz	4072c1b969	Basic functionality done, needs validation error handling ... As well as formatting	2014-06-07 11:45:49 -07:00
Michael Schmatz	0c0084dd4b	Make single game simulate another task if error	2014-06-06 13:26:15 -07:00
Michael Schmatz	31bb9c8807	Fixed error handling for results with no taskID	2014-06-06 12:47:10 -07:00
Michael Schmatz	1486f31c37	Stop headless simulator from exiting if error	2014-06-06 12:26:28 -07:00
Michael Schmatz	24452026d1	Minor fix for simulator logic	2014-06-06 12:18:02 -07:00
Scott Erickson	49c9c6bfc9	Built the client test view (rebased from feature/testclient).	2014-06-05 16:56:29 -07:00
Ruben Vereecken	df60402d00	Added test	2014-06-02 20:29:12 +02:00
Ruben Vereecken	699aa506f2	Added Local Mongo support for nested documents. Totally forgot those	2014-06-02 20:29:11 +02:00
Ruben Vereecken	e177912a5a	Added '$or' and '$and' to Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	b3bddbd785	Finished regular query selectors of Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	20af7b090a	Worked on getting the tests to work	2014-06-02 20:29:11 +02:00
Ruben Vereecken	f2f4fef1e0	Wrote tests for the local mongo querier	2014-06-02 20:29:11 +02:00
Ruben Vereecken	99927d1345	Started on the local mongo querier	2014-06-02 20:29:11 +02:00
Scott Erickson	47f28d26d1	Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called.	2014-05-30 16:20:20 -07:00
Scott Erickson	7a9928b0c5	Fixed #1102	2014-05-30 13:57:21 -07:00
Scott Erickson	254c6ff7ba	Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.	2014-05-30 13:40:38 -07:00
Nick Winter	f3adc216ed	Protecting our replacement of Math.random via Aether.	2014-05-29 12:26:08 -07:00