448 commits

Author	SHA1	Message	Date
Nick Winter	91db8397a0	Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators.	2014-08-19 08:09:15 -07:00
Nick Winter	2c6fc67db2	Some simulation and ladder fixes. Preparing Criss-Cross tournament.	2014-08-18 21:49:58 -07:00
Nick Winter	32c74db282	Merge pull request #1442 from dkundel/master ... Fixing most of the issues described in #18	2014-08-15 09:02:15 -07:00
Dominik Kundel	68828b67bb	removed console.log	2014-08-15 02:04:46 +02:00
Dominik Kundel	755a86e3d3	moving some styling	2014-08-15 01:56:01 +02:00
Nick Winter	69c22db434	Moved Hero Placeholder replacement logic to Level's denormalizeThang.	2014-08-14 16:35:03 -07:00
Matt Lott	9b79e2ca27	Instrument user code problems	2014-08-14 13:32:00 -07:00
Dominik Kundel	702656ad02	Merge remote-tracking branch 'upstream/master'	2014-08-14 22:30:19 +02:00
Dominik Kundel	b1252a4426	moving the popover for palette entries into the body to fix layering with popover of autocomplete	2014-08-14 22:29:57 +02:00
Nick Winter	291b44f0a6	Fix typo introduced in last commit. Like a boss.	2014-08-12 12:56:55 -07:00
Nick Winter	2ab83328f3	Added item editor level preview window.	2014-08-12 12:50:41 -07:00
Nick Winter	023fd40767	Renamed inventory to collectedThangIDs for Collects. #59	2014-08-11 12:52:40 -07:00
Dominik Kundel	d2c63f4b98	fixed undo manager to not remove all code	2014-08-11 21:34:02 +02:00
Dominik Kundel	14f96a7eac	Merge remote-tracking branch 'upstream/master'	2014-08-11 15:30:05 +02:00
Nick Winter	d1e26b40c2	I retook the Nick name.	2014-08-10 17:47:18 -07:00
Nick Winter	0074a04cfe	Moved Restart into Game Menu.	2014-08-10 17:41:18 -07:00
Nick Winter	45c762fddc	Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n.	2014-08-10 17:26:30 -07:00
Nick Winter	dc59aff9d0	Starting skeleton for GameMenuModal and its subviews.	2014-08-08 11:36:41 -07:00
Dominik Kundel	84c0fbd01f	use shortName as fallback for some entries if no snippet	2014-08-05 11:19:15 +02:00
Nick Winter	3bbdee583d	Better problem alert layout for alerts that include hints.	2014-08-04 20:16:12 -07:00
Dominik Kundel	f09b3c4792	Merge remote-tracking branch 'upstream/master'	2014-08-04 23:03:28 +02:00
Dominik Kundel	50517431db	added support for inserting snippets by shift+click	2014-08-04 23:02:54 +02:00
Dominik Kundel	86eea93e2f	merged changes	2014-08-04 22:37:15 +02:00
Ruben Vereecken	39c01c0bcb	Finished refactoring of LevelGuideModal (renamed from docs_modal)	2014-07-29 19:50:50 +02:00
Michael Schmatz	c4e3044a81	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 14:44:17 -07:00
Michael Schmatz	07cc01332d	Merge branch 'pr/1383' ... Conflicts: app/views/play/level/tome/SpellListTabEntryView.coffee	2014-07-23 14:44:15 -07:00
Nick Winter	26ac94367e	Fixed #1372. Minor fixes.	2014-07-23 08:59:42 -07:00
Scott Erickson	beef508e76	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 07:09:12 -07:00
Scott Erickson	65375aa5fc	Renamed problem and spell to their new, capitalized names.	2014-07-23 07:09:05 -07:00
Scott Erickson	1c3404d03e	Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.	2014-07-23 07:02:45 -07:00
Dominik Kundel	4f6ca5335f	fixed spell palette sliding behind HUD	2014-07-23 15:50:47 +02:00
Dominik Kundel	be50927fb6	disabled editor works again	2014-07-23 14:38:12 +02:00
Dominik Kundel	5db634d6a8	fullscreen on keyboard shortcut	2014-07-22 21:47:36 +02:00
Nick Winter	a7905db316	Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.	2014-07-20 15:51:48 -07:00
Nick Winter	1537754a16	A few bugfixes, plus gigantic child window convenience for me editing levels.	2014-07-19 20:26:13 -07:00
Scott Erickson	59b723b890	Refactoring View to ModalView.	2014-07-17 17:22:26 -07:00
Scott Erickson	e18b4de583	Refactoring View to CocoView.	2014-07-17 17:20:11 -07:00
Nick Winter	42af807e5c	Merged in geometry work from #51.	2014-07-16 16:01:37 -07:00
Nick Winter	6e9091fdf0	More fixes to documentation popovers.	2014-07-15 19:25:53 -07:00
Nick Winter	906ab3ac2b	Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette.	2014-07-15 18:54:55 -07:00
Nick Winter	3318d4a171	Fixed #1010.	2014-07-15 09:35:14 -07:00
Nick Winter	d7586025d9	Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.	2014-07-14 11:05:59 -07:00
Nick Winter	c62f5f3fa0	Skipping docs for language-inappropriate entries in spell palette.	2014-07-11 18:42:55 -07:00
Nick Winter	17ba4bc8a7	Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.	2014-07-11 18:07:00 -07:00
Michael Schmatz	fede037e89	Fixed time NaN	2014-07-11 13:55:31 -07:00
Nick Winter	9ee373428f	Fixed some schema issues related to snippets and code languages.	2014-07-10 08:31:40 -07:00
Nick Winter	0ed8d2b371	Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.	2014-07-09 13:41:42 -07:00
Scott Erickson	1263d4724a	Fixed the title in the gold view to handle when goldEarned isn't available.	2014-07-07 16:56:47 -07:00
Scott Erickson	61e6c8dfc3	Fixed the gold view not showing numbers until the first change.	2014-07-07 16:05:23 -07:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00