Commit graph

2303 commits

Author SHA1 Message Date
Nick Winter
5261a7d4d9 Snap to integer meters in the level editor when holding shift. 2014-10-07 10:41:16 -07:00
Nick Winter
dfdcf66f4b A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance. 2014-10-06 17:46:22 -07:00
Scott Erickson
f00fd66bed Fixed displaying raster image thangs in the thang editor. 2014-10-06 16:22:21 -07:00
Nick Winter
0fefd627fa Fixed COPPA toggle. 2014-10-06 15:04:42 -07:00
Nick Winter
d6b7616f15 Updated keyboard shortcut symbols. 2014-10-06 15:04:42 -07:00
Nick Winter
31056933e9 Added volume control to world map. 2014-10-06 10:17:55 -07:00
Nick Winter
63f518e7c6 Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements. 2014-10-06 10:17:55 -07:00
Scott Erickson
3da0ea9d72 Fixed labels and marks not properly updating in the level editor. 2014-10-03 12:00:08 -07:00
Scott Erickson
e504932e5e Added yet another fine tuning of camera movement in the level editor. 2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at. 2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Nick Winter
0c09a468c7 Fixed skipping through real-time playback to fire when the final goals are actually ready. 2014-10-02 17:49:14 -07:00
Nick Winter
3cdb8ff416 Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map. 2014-10-02 17:21:06 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Scott Erickson
987061cec6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3 moving the level dots to fit the dungeon world map 2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259 Messing with the scaling on the dungeon map. 2014-10-02 14:05:18 -07:00
Nick Winter
285264ceb4 Skip past hero selection if hero has already been selected. 2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e Made sure all dots are invisible by default. 2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 09:28:31 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a Added new slot icons and dungeon map. 2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f Unlocked all levels again until we can figure out the achievement timing problems. 2014-10-01 17:02:04 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00
Scott Erickson
b3ae258bed Fixed some issues with the thang editor. 2014-09-30 13:34:44 -07:00
Scott Erickson
8f29d0ee7f Did some tweaking of UserView to handle slugs for ids. 2014-09-30 10:53:01 -07:00
Scott Erickson
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -07:00
Matt Lott
136af8a0b4 Fixes for world simulation without Web Workers
Primarily for IE9, which is still blocked by box2d issues with these
changes.

Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.

Work in progress.
2014-09-28 23:24:18 -07:00
Scott Erickson
f081d9ed4b Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again. 2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Nick Winter
cf9cf6f98b Stopped locking levels for now, since the achievements aren't quite unlocking them correctly. 2014-09-26 03:52:57 -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
Nick Winter
4ca7df0b32 A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet. 2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81 Completed transition to new hero levels. 2014-09-25 15:32:33 -07:00
Nick Winter
61aa2d8b6f Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code. 2014-09-25 13:29:20 -07:00
Nick Winter
2ed6b737c2 Added WorldMapView ambient sounds. 2014-09-25 11:37:29 -07:00
Scott Erickson
8fe2ed4438 Resolved conflicts. 2014-09-25 10:52:36 -07:00
Scott Erickson
06b106f42b Merged from master. 2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef Migrating surface to webgl. It sorta works! 2014-09-25 10:47:53 -07:00
Nick Winter
9ea24f4c74 Added a workaround for Surface resize failure on realtime playback end that Maksym had seen. 2014-09-25 09:48:14 -07:00
Nick Winter
c0c436189f Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks. 2014-09-25 00:02:53 -07:00
Nick Winter
cce36333dd Set letterbox during real-time playback. 2014-09-24 22:59:13 -07:00
Nick Winter
cde2acaea1 Disabled clicking spell palette entries for hero levels. 2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10 Hid flags view during real-time playback for non-flag-using levels. 2014-09-24 22:23:14 -07:00
Nick Winter
5e0b42068a Scrubber auto-pauses when dragging from ended position. 2014-09-24 22:12:00 -07:00
Nick Winter
b2592aad8c Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle. 2014-09-24 21:01:58 -07:00
Nick Winter
b8d59cb179 Fixed a bug with playback never quite getting to the end. 2014-09-24 20:25:30 -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
Nick Winter
e48fa5f0b7 Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits. 2014-09-24 19:14:22 -07:00
Nick Winter
da83fee58f Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values. 2014-09-24 16:58:52 -07:00
Nick Winter
73d6261b5d Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n. 2014-09-24 16:29:28 -07:00
Nick Winter
6b6d1d3e74 Changed 'Available Spells' to 'Your Skills' in hero levels. 2014-09-24 15:48:18 -07:00
Nick Winter
53ddf0159d Preloaded previous/next heroes in ChooseHeroView. 2014-09-24 15:39:51 -07:00
Nick Winter
a786b1e096 Changed world map to click on iPad, hover otherwise. 2014-09-24 15:21:39 -07:00
Nick Winter
ada65cc290 Lowered master volume temporarily until per-sound instance volumes are fixed. 2014-09-24 15:06:22 -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
f4cee11ebe ThangsTabView letting you position spike walls on top of walls. 2014-09-24 12:02:45 -07:00
Driphter
db61249ac7 Added support for 'codeLanguage' when setting the 'favoriteLanguage' 2014-09-24 02:57:54 -04:00
Nick Winter
8d6b23274b Zoom in on hero during real-time playback. 2014-09-23 22:10:18 -07:00
Nick Winter
225fd0ca18 Moved world map level info to click from hover. 2014-09-23 19:12:05 -07:00
Nick Winter
019f634d9f Respecting coordinates setting. 2014-09-23 18:39:52 -07:00
Nick Winter
e493855578 Hiding spell tab hover docs for plan(). 2014-09-23 18:32:07 -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
e109cbbbdc Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels. 2014-09-23 11:39:56 -07:00
Nick Winter
33080e5a65 Fixed #1586. 2014-09-23 10:56:52 -07:00
Nick Winter
00e2fc99a2 Fixed some issues with the sample code. 2014-09-23 08:58:23 -07:00
Nick Winter
6a8d3082f3 Propagated i18n. Added a fallback for cast button for now until the new run button can be translated. 2014-09-23 08:08:29 -07:00
Nick Winter
f3511a5dde Fixed another bug with loading heroes between levels. 2014-09-22 23:01:19 -07:00
Nick Winter
b0ee2224ae Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping. 2014-09-22 22:26:09 -07:00
Nick Winter
8640369b26 Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor. 2014-09-22 21:50:48 -07:00
Nick Winter
149848c971 Fixed temporary item restrictions. 2014-09-22 20:44:45 -07:00
Nick Winter
1b4e75e7e8 Fix for earned achievement default null worths. Misc other fixes. 2014-09-22 20:15:51 -07:00
Nick Winter
786820e056 Fixed drag and drop for hero inventory. 2014-09-22 16:12:55 -07:00
Nick Winter
ec548fa33a AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison. 2014-09-22 16:09:27 -07:00
Nick Winter
a79976e6a2 Bigass 'Stop' button in lower right during real-time playback. 2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
Nick Winter
42b52f5593 No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization. 2014-09-21 22:10:52 -07:00
Nick Winter
6cb8a2a019 Hero always centered in camera in new hero levels when playing and not panning to drag. 2014-09-21 20:49:45 -07:00
Nick Winter
600e985259 Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected. 2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af Showing goals on level loading view. 2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e Press Start to begin playing levels. Fixed #1574. 2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce Fixed a bug with hero placeholder loading. Improved game menu modal close button usability. 2014-09-21 13:26:56 -07:00
Nick Winter
389f6fb9c1 Pre-assigning and limiting owned items based on level for now. 2014-09-21 11:24:37 -07:00
Nick Winter
e1790d5159 Restored item comparison in InventoryView, now o'ertop the hero. 2014-09-21 09:53:58 -07:00
Nick Winter
4cdff02a32 Implemented most of new inventory view. 2014-09-20 23:11:51 -07:00
Nick Winter
9f6e1e081c Using language choice from ChooseHeroView. 2014-09-20 16:04:13 -07:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
e3b75a69ea Working on PlayLevelModal and ChooseHeroView. 2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93 Fixed a few misc bugs I noticed with the job profiles. 2014-09-19 22:16:05 -07:00
Nick Winter
ec21637adf Showing the new hero levels instead of the old campaign levels on the /play-hero map. 2014-09-19 11:03:38 -07:00
Nick Winter
121ff0a4af Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now. 2014-09-18 18:25:33 -07:00
Nick Winter
8042f27ba7 Added the rest of the custom TreemaNodes to the SystemsTabView as well. 2014-09-18 15:26:06 -07:00
Nick Winter
5ddbbe7707 Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting. 2014-09-18 08:12:46 -07:00
Nick Winter
689a4241d4 Final Criss-Cross tournament results. 2014-09-17 22:37:34 -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
Nick Winter
d96d0d65f3 Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits. 2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9 Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs. 2014-09-16 20:19:52 -07:00
Nick Winter
a700b7844f Added a bit of error handling for weird equipment error we were seeing. 2014-09-16 11:13:03 -07:00
Nick Winter
54f56162e9 Place Electrowalls over other walls. 2014-09-16 10:30:27 -07:00
Nick Winter
89aa930803 Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio. 2014-09-15 15:38:07 -07:00
Nick Winter
9acb3670c1 Fixed error when deleting in level editor with nothing selected. 2014-09-15 15:24:11 -07:00
Nick Winter
6176a8f6cb Wall dragging no longer conflicts with wall clicking. 2014-09-15 15:23:09 -07:00
Nick Winter
8acaea3d6a Drag walls to place them continuously. 2014-09-15 14:54:21 -07:00
Nick Winter
6ac56030e8 Fixed bug with systems not being addable. 2014-09-15 12:45:10 -07:00
Nick Winter
d2491dba4f Disabled autocast even more. 2014-09-15 11:56:29 -07:00
George Saines
32ac3c1f95 updating contributor pages 2014-09-12 17:46:44 -07:00
Nick Winter
d3245948e2 Sorting addable Thangs in a sensible order. 2014-09-11 13:34:15 -07:00
Nick Winter
d5542ffbbc Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open. 2014-09-11 11:24:06 -07:00
George Saines
11a734b001 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-11 11:08:29 -07:00
George Saines
040b901e41 removed merge junk 2014-09-11 11:08:25 -07:00
Nick Winter
9eb0dbc625 Fixed bug with creating new levels. 2014-09-11 10:50:23 -07:00
George Saines
b81288cf52 changing volume for some SFX 2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a trying to change SFX volume 2014-09-11 09:59:50 -07:00
Nick Winter
68808d0e07 Some fixes for how audio is triggered. 2014-09-11 08:38:30 -07:00
Nick Winter
f53f6bf0a3 Misc changes, wishing I could get sounds to work at lower volumes. 2014-09-10 19:55:00 -07:00
djsmith85
19d3a6cc9f Updated German translations (de-DE & de-AT)
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
2014-09-10 02:57:47 +02:00
Nick Winter
2396f9c26d Updates to go along with latest iPad app spell palette loading. 2014-09-08 21:40:52 -07:00
Nick Winter
dd2cdf3ef9 Fixed bugs with forking ThangTypes. 2014-09-08 16:03:29 -07:00
Nick Winter
8dad2bf12d Fixed some typo. 2014-09-08 14:26:17 -07:00
Scott Erickson
6c12384fe9 Reenabling on surface mouse moved. 2014-09-08 14:13:19 -07:00
Nick Winter
6ed89a2d79 Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView. 2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb Fixed typo in spell palette event. 2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Nick Winter
8de75024fc Implemented placeholders for a bunch of sound triggers. 2014-09-05 13:04:05 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Scott Erickson
fca9a92167 Flattened the queries the NewAchievementModal creates. 2014-09-04 11:17:07 -07:00
Nick Winter
8c45e22741 Protection and logging for #1463. Fixed an issue with spectate camera script bounds. 2014-09-04 11:04:23 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
f519df6189 Wrapping up work on the folderized thangs treema in the level editor. 2014-09-03 16:51:09 -07:00
Nick Winter
8f38d57aaa Merge branch 'feature/realtime-multiplayer' 2014-09-03 16:14:58 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Scott Erickson
9439f0d47d Some tweaks and fixes to the folderized thangs in the level editor. 2014-09-03 15:38:57 -07:00
Scott Erickson
0cc593e3ac Thangs tab now maintains the order of thangs independently of how thangs are reorganized into folders. 2014-09-03 15:38:57 -07:00
Nick Winter
24a2373d54 Fixed editor config change event schema. 2014-09-03 13:08:09 -07:00
Scott Erickson
e1abf115f7 Folderizing thang types in the level editor. 2014-09-03 12:30:08 -07:00
Scott Erickson
975c6ad2a6 Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid. 2014-09-03 09:33:21 -07:00
Scott Erickson
1888e9ea92 Removed a log. 2014-09-03 08:44:46 -07:00
Scott Erickson
a494d1f2c4 Fixed the walls not updating when they are randomly generated. 2014-09-02 19:47:43 -07:00
Scott Erickson
9af460cf42 Fixed #330 2014-09-02 18:43:24 -07:00
Nick Winter
6eb23349d0 Center camera when level loaded in level editor. 2014-09-02 18:08:41 -07:00
Scott Erickson
621c684c74 Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly). 2014-09-02 17:53:39 -07:00
Nick Winter
23516175d4 Adding default IDs to new goals. 2014-09-02 17:28:45 -07:00
Scott Erickson
3fd9cb89ef Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly. 2014-09-02 17:26:02 -07:00
Scott Erickson
6394482c34 Unjanking getCurrentView. 2014-09-02 17:07:28 -07:00
Scott Erickson
daca7b54f3 Refactored SystemTabView names, hid the add button in the systems tab. 2014-09-02 16:50:54 -07:00
Nick Winter
fa0f904fbb Fixed a couple bugs with Achievements not getting schema defaults. 2014-09-02 16:48:16 -07:00
Nick Winter
b20b819a1f Tweaked a few styles on the ThangsTabView. 2014-09-02 16:43:17 -07:00
Nick Winter
7f9ac5e573 Fixed a few bugs where default hero level type wasn't getting pulled. 2014-09-02 16:02:30 -07:00
Scott Erickson
55bac798ee Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width. 2014-09-02 15:33:23 -07:00
Nick Winter
e02431b26b Fixed color group saving in Thang editor. 2014-09-02 15:25:00 -07:00
Nick Winter
d8ef2f8596 Made new related achievements open in a new tab in the level editor. 2014-09-02 15:00:14 -07:00
Nick Winter
ba53cb06fe Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System. 2014-09-02 14:16:41 -07:00
Scott Erickson
1edf3de651 Fixed double clicking sometimes firing when you're just dragging units around in the level editor. 2014-09-02 14:06:37 -07:00
Scott Erickson
7e627277e1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322 Optimized level serialization a little so that level editing is a bit less painful. 2014-09-02 12:33:34 -07:00
Scott Erickson
13b066f6aa Fixed not being able to drag thangs around every other attempt. 2014-09-02 11:53:03 -07:00
Nick Winter
4b9bf22e22 Thang editor now sets some default Components when you change the kind of a ThangType. 2014-09-02 11:29:33 -07:00
Scott Erickson
9c841991fd Added links to the versions modal. 2014-09-02 11:07:58 -07:00
Nick Winter
af42bafb15 Added default goals. Don't show System versions in the Systems list if they're 0. 2014-09-01 21:58:22 -07:00
Nick Winter
e615dde6e2 Show inventory view now, for hero levels. 2014-09-01 21:10:45 -07:00
Nick Winter
9094c0ce19 Add hero placeholder to terrain generator on hero levels. 2014-09-01 20:22:46 -07:00
Nick Winter
b7d9e7a095 Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs. 2014-09-01 20:07:50 -07:00
Nick Winter
6085b70dfc Fixed a bounds offset issue in the Thang Editor colors tab. 2014-09-01 16:22:04 -07:00
Nick Winter
72eb59b7c3 Fixed a few bugs. 2014-09-01 16:14:50 -07:00
Nick Winter
195e027b53 Fix for null/undefined objects in the diffs. 2014-09-01 14:27:47 -07:00
Nick Winter
6df5ca00b2 Fixed #69. 2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70 Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting. 2014-09-01 09:11:10 -07:00
Nick Winter
1329d31a63 Hot-swapping inventory works now. 2014-08-31 16:05:20 -07:00
George Saines
495247661b bringing contribute avatars up to speed 2014-08-31 15:21:30 -07:00
Nick Winter
ef9a983e30 Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs. 2014-08-31 12:21:25 -07:00
Nick Winter
5f132e55ba Fixed #1414. Also started lazily loading certain level editor tabs. 2014-08-30 23:04:45 -07:00
Nick Winter
a284c8eb37 Fixed #1428. 2014-08-30 21:16:01 -07:00
Nick Winter
aa54cc32d1 Fixed #1458. 2014-08-30 20:27:58 -07:00
Nick Winter
77e7efebeb Fixed #1385: no more redundant fallback localization files. 2014-08-30 19:30:33 -07:00
George Saines
6549b4ccc0 updating the diplomat list 2014-08-30 18:51:02 -07:00
Nick Winter
24d3d189df Made espionage mode simpler, and added an admin user lookup. 2014-08-30 17:09:57 -07:00
Nick Winter
a8644d030e Fixed #1355. 2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef Fixed #1329. 2014-08-30 13:43:56 -07:00
Scott Erickson
5f11a5ecca Selected component in the thang components edit view shows up with a blue header. 2014-08-30 09:47:23 -07:00
Scott Erickson
6f2de166c0 Removed destroying scripts, since they don't have ace editors, and it was causing a bug. 2014-08-30 09:42:13 -07:00
Nick Winter
051f1a77ae Fixed #1152. 2014-08-30 09:19:41 -07:00
Nick Winter
e5cf6c340b Fixed #1140. I just put it on the home page for now, but later we can put it somewhere where it makes sense. 2014-08-29 23:09:38 -07:00
Matt Lott
437ab0feb2 PVP waiting screen in real-time view 2014-08-29 21:46:26 -07:00
Nick Winter
40aa95ba16 Fixed #1297. 2014-08-29 18:07:32 -07:00
Scott Erickson
7a9c53e424 All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though. 2014-08-29 18:04:50 -07:00
Scott Erickson
21e0889a86 All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though. 2014-08-29 18:02:29 -07:00
Nick Winter
cb14149816 Fixed #1286. Sort of. 2014-08-29 17:52:47 -07:00
Nick Winter
63f2c5db4f Fixed #1268. 2014-08-29 17:33:25 -07:00
Nick Winter
5503b3a2bc Fixed #1147. 2014-08-29 17:03:02 -07:00
Matt Lott
8143d9c5ba Real-time multiplayers to 'coding' after playback 2014-08-29 15:26:39 -07:00
Matt Lott
92cad5f46f Real-time multiplayer subscription schemas 2014-08-29 15:10:04 -07:00
Nick Winter
68dcdaf223 A couple achievment/item editor error fixes. 2014-08-29 13:00:11 -07:00
Scott Erickson
434a0c071b Few more bugs fixed for defaults. 2014-08-29 12:29:42 -07:00
Scott Erickson
f93ef2005e Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'. 2014-08-29 11:34:32 -07:00
Scott Erickson
570380c2a4 Merge branch 'master' into feature/defaults 2014-08-29 08:14:43 -07:00
Matt Lott
68cca74b43 Real-time multiplayer initial commit
Simple matchmaking, synchronous multiplayer PVP, flags!

Rough matchmaking is under the game menu multiplayer tab, for ladder
games only.  After creating a 2-person game there, you can exit that
modal and real-time cast to play against each other.

If you’re the first person to cast, you’ll sit at the real-time level
playback view waiting until the other player casts.  When they do, you
both should start the real-time playback (and start placing flags like
crazy people).

If in a multiplayer session, the real-time simulation runs the players’
code against each other.  Your multiplayer opponent’s name should be up
near the level name.

Multiplayer sessions are stored completely in Firebase for now, and
removed if both players leave the game.  There’s plenty of bugs,
synchronization issues, and minimal polish to add before we push it to
master.
2014-08-28 23:34:07 -07:00
Nick Winter
a4b2333fd3 Added Systems documentation. Fixed #1115. 2014-08-28 22:32:55 -07:00
Nick Winter
124f999bc8 Fixed #1105. Also send HipChat notifications whenever anyone changes anything; let's see if it's too much. 2014-08-28 19:39:46 -07:00
Scott Erickson
9406a8c920 Merge branch 'master' into feature/defaults 2014-08-28 17:58:58 -07:00
Nick Winter
e67b4ae064 Fixed #1090. 2014-08-28 17:08:05 -07:00
Scott Erickson
74ca7fe0cc Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema. 2014-08-28 17:05:46 -07:00
Scott Erickson
8f95ad2787 Fixed a few bugs. 2014-08-28 15:42:46 -07:00
Scott Erickson
2dde77f8b0 Merge branch 'master' into feature/defaults 2014-08-28 15:26:04 -07:00
Nick Winter
107a727d02 Fixed a bug in the WizardSettingsModal being destroyed and still trying to do things. 2014-08-28 14:06:53 -07:00
Nick Winter
f79a2848fd Fixed #1038. Focus should now remain on code editor when after clicking on Surface. 2014-08-28 14:00:54 -07:00
Scott Erickson
e3bc9045d1 Couple tweaks. 2014-08-28 13:53:00 -07:00
Scott Erickson
8b056cfb8f Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself. 2014-08-28 11:24:45 -07:00
Nick Winter
54207f0f7d Fixed #1000. 2014-08-28 10:50:20 -07:00
Scott Erickson
94065a0c4c Merged conflicts. 2014-08-28 09:59:07 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239 Fixed a bug with old, un-migrated level-set-playing events in button handlers. 2014-08-28 09:52:51 -07:00
Nick Winter
a50f6b9224 Fixed a bug with reloading non-writable code. 2014-08-28 09:41:47 -07:00
Nick Winter
ec6b3d7e5f Fixed #1481. More Mediator schema fixes. 2014-08-28 09:27:42 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
02255044e3 Fixed #847. Fixed some subscription schemas. 2014-08-27 18:43:17 -07:00
Nick Winter
2ef7bff2c5 Fixed #886. 2014-08-27 17:54:16 -07:00
Scott Erickson
7bdfcb4313 Fixed pasting component configs into the thang component config treema. 2014-08-27 17:29:28 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Nick Winter
1864cb09bc Fixed #712. Fixed a bug with listing files/musics in admin files view due to removed trailing slashes. 2014-08-26 15:42:33 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Scott Erickson
162aa7633e Fixed the component and system settings treema, clearing out defaults for properties not being edited. 2014-08-26 15:40:51 -07:00
Nick Winter
50ad453345 Fixed #169. 2014-08-26 14:34:23 -07:00
Scott Erickson
ab669739a6 Fixed a bug with the thang component edit view: labels of new components not showing up. 2014-08-26 14:15:21 -07:00
Nick Winter
35b107cf58 Refactored grid. Fixed #158. 2014-08-26 13:56:57 -07:00
Scott Erickson
2f72aa4f47 Fixed adding new components in the thang components edit view. 2014-08-26 13:48:57 -07:00
Scott Erickson
39d0df5153 Fixed name ordering in the thang components editor. 2014-08-26 13:27:17 -07:00
Scott Erickson
5b5bceda3a Components tab now incorporates components inherited from thang types. 2014-08-26 13:08:56 -07:00
Nick Winter
3e9adf6b1a Fixed issue with IndieSprites no longer coloring properly. 2014-08-26 12:39:30 -07:00
Nick Winter
38dcb7fcef Fixed #5. 2014-08-26 11:29:16 -07:00
Scott Erickson
fb06e58201 Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties. 2014-08-26 10:14:36 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f Bunch of fixes to the thang component edit view. 2014-08-26 09:48:33 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
Nick Winter
e48b218533 Projected models can now update their projections and re-fetch. Hero ThangTypes now do this. 2014-08-25 15:39:47 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83 Merge branch 'master' into feature/defaults 2014-08-25 13:00:33 -07:00
Nick Winter
08f2ee248b No longer constructing SpellViews for non-readable methods. 2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
1a7e4554f0 Fixed a few minor bugs. 2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Nick Winter
be07f9cfb9 Many improvements to real-time streaming and flags. 2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -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
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00
Nick Winter
2e23247521 Fixed #811, a bug where you could pause the world if you clicked on a letterboxed playback scrubber. 2014-08-23 14:55:58 -07:00
Nick Winter
8777a87774 Made a real-time playback button. 2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -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
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1 World streaming is getting there! 2014-08-22 14:59:32 -07:00
Scott Erickson
f15135efe1 Fixed a terrible bug. 2014-08-22 11:40:31 -07:00
Scott Erickson
e200889f0b Initial refactoring to use the new version of Treema. 2014-08-22 11:11:05 -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
Scott Erickson
9a116d81be Fixed a few forms around the site to properly handle pressing enter. 2014-08-21 12:49:06 -07:00
Nick Winter
28176c7f72 Misc workarounds. 2014-08-20 13:26:48 -07:00
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
Scott Erickson
f8d4e42c67 Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork. 2014-08-18 15:25:45 -07:00
Nick Winter
4b88c930a4 Merge pull request #1453 from Darredevil/patch-15
Added new 'Minimax Tic-Tac-Toe' level
2014-08-18 14:11:15 -07:00
Darredevil
1f51eabe48 Added new 'Minimax Tic-Tac-Toe' level 2014-08-18 18:39:16 +03:00
Ruben Vereecken
48a79ad48c New achievement modal fills in level.original query bit 2014-08-18 14:35:57 +02:00
Nick Winter
3b083e15f5 Don't require any Component default properties in hero levels, for maximum defaultability. 2014-08-15 12:27:56 -07:00
Nick Winter
5f20e6f05e Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet. 2014-08-15 12:09:56 -07:00
Nick Winter
ba1e7005ca Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108. Actually, same one, but the fix eralier got undone. 2014-08-15 10:50:05 -07:00
Nick Winter
f1a9848366 Fixed a couple errors. 2014-08-15 10:27:36 -07:00
Nick Winter
4a133f6998 Added popovers to community social link logos. 2014-08-15 09:43:55 -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
Ruben Vereecken
40818fd7bc GitHub Login implemented 2014-08-15 16:20:45 +02: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
98bed57751 Merge pull request #1441 from differentmatt/master
Instrument user code problems
2014-08-14 16:17:47 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Scott Erickson
827f6ee8b8 Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way. 2014-08-14 14:04: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
719e64e85f Added a quick visualization of language localization completion to the Diplomat page. 2014-08-14 11:43:40 -07:00
Nick Winter
18b0208aac Updated i18n. 2014-08-14 10:57:57 -07:00
Scott Erickson
c31a509472 Working on the inventory view. Added a way to get the current equipment config from the inventory view. 2014-08-14 10:44:04 -07:00
Nick Winter
7286d069a0 Working to get undo/redo working again when manipulating ThangsTabView not using the Treema. 2014-08-14 10:28:50 -07:00
Nick Winter
652d47fb81 Merge pull request #1432 from jayant1992/undo-redo
Undo redo descriptions
2014-08-14 09:58:28 -07:00
Ruben Vereecken
dbff3e04d5 Job profile view works once again 2014-08-14 17:25:41 +02:00
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -07:00
Nick Winter
7844a2b987 Some fixes for new user views breaking on bad data or certain configurations. 2014-08-13 19:17:26 -07:00
Nick Winter
bdb3e14189 Added missing ForkModal. 2014-08-13 14:26:56 -07:00
Scott Erickson
31e3e7f98e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-13 14:06:03 -07:00
Scott Erickson
f9e8bfad9f Made some minor changes. 2014-08-13 13:45:24 -07:00
Nick Winter
b7d5428d5f Made Forking more abstract to apply to ThangTypes, too. 2014-08-13 11:36:00 -07:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
2014-08-13 10:43:42 +02:00
Jayant Jain
f4b8b76f46 Adds subclass for component config nodes 2014-08-13 12:39:21 +05:30
Jayant Jain
76c784b1de Adds default scripts whenever a new level is created 2014-08-13 12:11:37 +05:30
Jayant Jain
1e52f237b7 Reworks undo-redo and undo-redo descriptions 2014-08-13 06:56:03 +05:30
Jayant Jain
094f26fc63 Removes undo-redo description methods from treema subclasses 2014-08-13 05:28:23 +05:30
Jayant Jain
67ed28e034 Undo redo descriptions for settings tab view 2014-08-13 02:55:36 +05:30
Jayant Jain
d713c35db7 Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView 2014-08-13 02:55:36 +05:30
Jayant Jain
9c235fa797 Minor refactoring and bug fixes for undo and undo descriptions 2014-08-13 02:55:36 +05:30
Jayant Jain
c6caef6219 Undo redo descriptions for ThangsTabView 2014-08-13 02:55:36 +05:30
Darredevil
1b1174d460 Added 'Classic Algorithms' level section 2014-08-12 23:23:43 +03: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
6d04b583f9 Added volume slider to game options. 2014-08-12 10:10:54 -07:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Nick Winter
9fd31c70e7 Hid parts of game menu that aren't ready yet. 2014-08-12 09:13:23 -07:00
Jayant Jain
eece235337 Adds preset images 2014-08-12 20:42:42 +05:30
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Jayant Jain
b6e53d87c7 More decorations! (for dungeon preset) 2014-08-12 10:35:09 +05:30
Jayant Jain
5d8264e887 Takes care of overlapping walls for rooms 2014-08-12 10:35:09 +05:30
Jayant Jain
9d001524c6 Adds initial indoor preset for terrain generator 2014-08-12 10:35:09 +05:30
Nick Winter
4cc79e985e A few fixes for adding items to inventories in ThangTypes. 2014-08-11 17:09:44 -07:00
Jayant Jain
4beb85a3e7 Fixes bug with enter press on thangs tab 2014-08-12 04:16:17 +05:30
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
023fd40767 Renamed inventory to collectedThangIDs for Collects. #59 2014-08-11 12:52:40 -07:00
Nick Winter
2bc92f1a6e Merge pull request #1422 from dkundel/master
Fixed issue #1420 and pasting snippets on click
2014-08-11 12:47:36 -07:00
Dominik Kundel
c2e53be58f Merge remote-tracking branch 'upstream/master' 2014-08-11 21:34:24 +02:00
Dominik Kundel
d2c63f4b98 fixed undo manager to not remove all code 2014-08-11 21:34:02 +02:00
Nick Winter
31d7e641e6 Fixes for equipping items and adding them to the World. 2014-08-11 11:04:38 -07:00
Dominik Kundel
14f96a7eac Merge remote-tracking branch 'upstream/master' 2014-08-11 15:30:05 +02:00
Ruben Vereecken
672b0f54f6 Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
Nick Winter
706ab7a251 Trying to get item ThangType nodes and inventory loading working. 2014-08-10 22:09:13 -07: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
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Ruben Vereecken
e6569539dc User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Jayant Jain
593c31f33c Shows dragged component over other layers 2014-08-08 18:16:12 +05:30
Jayant Jain
93fd301300 Increases add treema line height, components are selected after being added 2014-08-08 18:02:20 +05:30
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Nick Winter
9363665610 Merge pull request #1416 from Darredevil/patch-13
Added new level 'QuickSort the Spiral'
2014-08-07 18:31:53 -07:00
Darredevil
bea6e12a3a Minor name fix 2014-08-08 03:26:13 +03:00
Darredevil
3dfe7987ea Added new level 'QuickSort the Spiral' 2014-08-08 02:04:02 +03:00
Scott Erickson
0c5364eebb Removed editorMode. 2014-08-07 14:22:43 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Nick Winter
852dabc17a Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance. 2014-08-06 07:43:56 -07:00
Scott Erickson
d5a8d8dc72 Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108. 2014-08-05 14:56:11 -07:00
Scott Erickson
c5d496c063 Removed a bit for debugging. 2014-08-05 13:40:36 -07:00
Scott Erickson
30998ecbec Fixed components w/out changes sometimes showing up in the save level modal. 2014-08-05 13:21:45 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
2014-08-05 11:55:46 +02: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
Nick Winter
a0b75ddb8e Put Sky Span up for testing. 2014-08-04 19:46:00 -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
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Nick Winter
85011d1ed4 No need to explicitly track subviews for determining what the current view is. 2014-08-04 13:21:42 -07:00
Darredevil
a11649b12b Typo fix 2014-08-04 23:15:01 +03:00
Ruben Vereecken
fb3848359e Merge branch 'master' into achievements 2014-08-04 17:55:44 +02:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Jayant Jain
549f2657ea Styles add button for addComponentsTreema 2014-08-04 07:53:24 +05:30
Jayant Jain
06875ce2b8 Resolves bug with mouseenter and mouseleave callbacks for add components treema 2014-08-04 07:21:02 +05:30
Jayant Jain
9e1513eb56 Add button on hover for addComponentsTreema 2014-08-04 07:05:22 +05:30
Jayant Jain
98f43b679f Adds component upon double click, newly added components are automatically selected 2014-08-04 06:04:35 +05:30
Jayant Jain
03d696c3df Components can now be added to thangs by dragging and dropping 2014-08-04 05:51:12 +05:30
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Michael Schmatz
ca7b8ca10a Merge pull request #1401 from rubenvereecken/test_fix
Repaired TestView by only loading js files once
2014-07-31 08:14:59 -07:00
Michael Schmatz
e7de8e3282 Merge pull request #1396 from rubenvereecken/refactoring
[Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)
2014-07-31 08:12:18 -07:00
Ruben Vereecken
0e5accb707 Repaired TestView by only loading js files once 2014-07-31 13:15:57 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Jayant Jain
2690ef9a59 Reorders script ids upon deletion 2014-07-30 01:05:04 +05:30
Jayant Jain
f0940308ea Newly inserted scripts are automatically assigned id 2014-07-30 00:52:59 +05:30
Jayant Jain
632d9a666e Shows all autocomplete values on click instead of having to type initially 2014-07-30 00:52:59 +05:30
Jayant Jain
0555c2ec14 Initial autocomplete for event checks in scripts tab 2014-07-30 00:52:59 +05:30
Ruben Vereecken
d4043ac3db Implemented singleplayer and multiplayer games played on profile 2014-07-29 20:11:45 +02:00
Ruben Vereecken
39c01c0bcb Finished refactoring of LevelGuideModal (renamed from docs_modal) 2014-07-29 19:50:50 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
026e6e6378 Added some support to fetch level sessions for the user profile page 2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b Did a bunch related to achievements and user profile page 2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Michael Schmatz
d7cb76d10c Merge branch 'pr/1387'
Conflicts:
	app/views/editor/level/LevelEditView.coffee
2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Darredevil
3b704330d6 Documentation tab for Level Editor 2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef Merge branch 'codecombat-master'
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
2014-07-25 22:48:13 +03:00
Darredevil
e3a0ea400c Docs tab v2 2014-07-25 22:33:55 +03:00
Jayant Jain
3e9dbe0d0b Fixes bug in undo/redo on SystemsTabView 2014-07-25 18:07:09 +05:30
Jayant Jain
d3962c19bd Ensures randomised thang clusters do not overlap each other 2014-07-25 18:07:01 +05:30
Jayant Jain
f700ddea0c Adds temporary hack for infinite loops in randomise 2014-07-25 18:06:54 +05:30
Jayant Jain
1790215fea Adds rooms and doors to dungeon preset 2014-07-25 18:06:44 +05:30
Jayant Jain
dc66218c00 Adds undo and redo buttons in editor topbar 2014-07-25 18:06:34 +05:30
Jayant Jain
9a24341fa5 Prevents overlapping of randomly generated thangs 2014-07-25 18:06:25 +05:30
Jayant Jain
3df2de8bec Number of decorations scales appropriately with preset size 2014-07-25 18:06:13 +05:30
Jayant Jain
dce6254d4a Fix for flickering thangs due to exact same coordinates 2014-07-25 18:06:03 +05:30
Jayant Jain
598e727500 Adds an initial dungeon preset, refactors border code to properly create dungeon walls 2014-07-25 18:05:49 +05:30
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799 Refactors some code for presets in terrain generator 2014-07-25 17:50:21 +05:30
Darredevil
f78c48c893 Docs tab v2 2014-07-25 01:26:34 +03:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07: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
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Ruben Vereecken
ebdbc0f891 Basis for user view is finished 2014-07-21 22:02:08 +02:00
Ruben Vereecken
972d231ff5 Refactored router and views to anticipate the renameViews feature 2014-07-21 19:49:16 +02:00
Ruben Vereecken
0d87209fa8 Recently played is now shown on account page 2014-07-21 19:06:22 +02:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81 Half the account page is there 2014-07-21 13:40:11 +02:00
Darredevil
61ebc4d15b Docs tab 2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe Merge pull request #1360 from Darredevil/master
Docs page enhancement
2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9 Docs page enhancement 2014-07-21 02:23:01 +03: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
Nick Winter
d45c2d31de New language icons. 2014-07-18 20:14:41 -07:00
Scott Erickson
e7a70bbd0b Merge conflict handling. 2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804 Removed the deprecated ErrorView. 2014-07-18 16:56:08 -07:00
Scott Erickson
00c11fd70e Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data. 2014-07-18 16:46:28 -07:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-18 16:12:27 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -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
Scott Erickson
0e042ee61c Refactoring View to RootView. Refactoring some RootViews to be routed manually. 2014-07-17 17:16:32 -07:00
Scott Erickson
2b4b91733c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e Work on the job profile view, initial work on the code modal. 2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d Merge pull request #1344 from Darredevil/master
fix for no user logged
2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3 Fixed some DemoView issues, mainly clicking links from one demo to another. 2014-07-17 16:29:26 -07:00
Nick Winter
769c26229e Merge pull request #1340 from sunzenshen/master
Fixed typo: Chose -> Choose
2014-07-17 15:59:08 -07:00
Nick Winter
8813a7f545 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup. 2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Scott Erickson
6f09e95d68 Removed background from job profile view. 2014-07-17 09:22:52 -07:00
Darredevil
b6469ff45b fix for no user logged 2014-07-17 19:12:26 +03:00
Alan Shen
c56be02222 Fixed typo: Chose -> Choose
It may be late to describe incoming targets with past tense.
2014-07-17 01:16:08 -06:00
Darredevil
83177c5f00 language sensitive docs added 2014-07-17 03:19:09 +03:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Michael Schmatz
bb3c583300 Add approved date to job profile 2014-07-16 10:51:45 -07:00
Nick Winter
1fd28c0181 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-16 07:54:23 -07:00
Nick Winter
085951fa4a Removed more counselor stuff. 2014-07-16 07:47:41 -07:00
Ruben Vereecken
bfc4ef58b0 Did UX changes, added an error and fixed a job profile editing bug 2014-07-16 14:47:55 +02: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
03cc2d1af0 Fixed Grass01-Grass05 scaling issues. 2014-07-15 18:08:00 -07:00
Jayant Jain
fa595fcb32 Better positioned level border trees 2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251 Borders and floors are placed inside positive axes 2014-07-16 05:03:18 +05:30
Scott Erickson
3325332626 Fixes #1328. 2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87 Added watchers to list of properties to skip in deltas/patches. 2014-07-15 11:23:35 -07:00
Nick Winter
da73975f20 Fixed #1095. 2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171 Fixed #1010. 2014-07-15 09:35:14 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Ruben Vereecken
40ba28f49b Basics for account and user home pages 2014-07-15 16:15:21 +02:00
Scott Erickson
d8d40ab0f6 Fixes #1116 2014-07-14 17:46:12 -07:00
Scott Erickson
888ee6c0bb Fixed deltas in the version history modal. 2014-07-14 16:37:10 -07:00
Scott Erickson
9d22a35194 Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat 2014-07-14 15:13:52 -07:00
Nick Winter
f2f3817e10 Fixed Thang Editor scaling. 2014-07-14 14:10:46 -07:00
Nick Winter
cfeb6c34a4 Merge pull request #1324 from Darredevil/master
docs page minor update
2014-07-14 13:23:52 -07:00
Darredevil
c579742955 docs page update 2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007 GET /auth/name/<name> now serves possible free names
anonymous users are now warned if their new name is already chosen

User Settings is now without auto-save

Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.

Refactored conflicted name checking so it can be used in more places

Signup form now has an optional name field

Covered extra case where the debounced check happened too late. Support for submitting on enter.

Worked in scott's comments and got tests working again
2014-07-14 20:07:58 +02: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
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Nick Winter
f1c8983de2 Don't ask for team again if we already have a child window. 2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00 Merge branch 'jayant1992-master' 2014-07-14 07:33:59 -07:00
Ruben Vereecken
d261f888d7 Refactored profile view to be a userView. Would still like to test remarks though 2014-07-14 12:18:28 +02:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed Less geometric random borders for the terrain generator 2014-07-14 08:11:33 +05:30
Nick Winter
1d9afbabd2 Fixes for duplicate Thang IDs and reverting randomized Thangs. 2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4 Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-07-13 18:21:27 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
6dc2a48b75 Tracking time spent reading initial guides. 2014-07-13 16:07:15 -07:00
Jayant Jain
deecd7d2ff Deletes previously randomised thangs when generating again 2014-07-14 01:34:32 +05:30
Jayant Jain
b934d22cbd Batches insertion of thangs to treema to speed up terrain generation 2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd Moves randomise modal template and view to editor/level/modal 2014-07-14 01:34:32 +05:30
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02: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
f17e24013b Fixed #1217 (scaleFactor, debug shapes). 2014-07-10 14:22:15 -07:00
Jayant Jain
d6928eb1c4 Removes okay button, hides modal upon generation 2014-07-11 01:43:51 +05:30
Jayant Jain
a76a79bb9d Fixes bug with placing addThang after randomise 2014-07-11 01:07:24 +05:30
Jayant Jain
5fb4f161d0 Removes console logs 2014-07-11 00:01:19 +05:30
Jayant Jain
da0b0d9830 Big terrain generator commit -
1.Adds method for randomising decorations/doodads
2.Creates presets
3.Adds thang clusters which can be used to create presets easily
2014-07-11 00:01:19 +05:30
Jayant Jain
dbe464df16 Removes console logs 2014-07-11 00:01:19 +05:30
Jayant Jain
b401b04893 Adds randomiseFloor and randomiseBorder functions 2014-07-11 00:01:19 +05:30
Jayant Jain
38bed0ee93 Random thangs are now created and positioned in the thangs view 2014-07-11 00:01:19 +05:30
Jayant Jain
74205b31d2 Adds code for passing randomised thangs to thang view 2014-07-11 00:01:18 +05:30
Jayant Jain
c40da260f0 Adds initial modal and view for terrain generator 2014-07-11 00:01:18 +05:30
Jayant Jain
efa2bee08c Adds shortcuts for undo/redo for thangs tab view 2014-07-11 00:01:18 +05:30
Nick Winter
9ee373428f Fixed some schema issues related to snippets and code languages. 2014-07-10 08:31:40 -07:00
nemoyatpeace
8700da6570 Update play_view.coffee
Added my level to the page.
2014-07-10 09:19:59 +08:00
Nick Winter
4b16e2fc57 Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master 2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1 Merge branch 'dkundel-feature/fullscreen-editor' 2014-07-09 13:41:57 -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
Darredevil
4309bfbe67 new Documentation page 2014-07-09 23:01:53 +03:00
Scott Erickson
d74a778f67 Made creating components open to everyone! 2014-07-09 12:21:32 -07:00
Scott Erickson
3fbce8334d Fixed #1276 2014-07-09 10:47:02 -07:00
Ruben Vereecken
5dc54c784d Added case and demo for user not found. Should be made prettier as soon as users can be queried by name 2014-07-09 18:13:22 +02:00
Ruben Vereecken
b065a524c1 Got down the basic layout for achievement overview
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
gosnat
4d50a6d76a Update play_view.coffee
Added "Guide Everyone Home" level
2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba Made some style tweaks to the employers page to move the filters into a sidebar when authorized. 2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c Fixed some wizard positioning issues in multiplayer. 2014-07-08 18:51:10 -07:00
Michael Schmatz
21d056ff01 Instant application of filters 2014-07-08 11:19:14 -07:00
Michael Schmatz
bbc793b003 Fixed modal popping up when logging out sometimes 2014-07-08 10:42:36 -07:00
Michael Schmatz
aa40257034 Table styling/ copy edit 2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02 Implement candidate filter counts next to filters 2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4 Move featured candidates to top of sort 2014-07-07 21:29:48 -07:00
Michael Schmatz
08b9a8fdaa Various changes to education filter 2014-07-07 21:04:12 -07:00
Michael Schmatz
9313541f9f Fixed targeting on employers CSS 2014-07-07 20:02:01 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34: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
5d00aedac7 Widened the click area on the wizard settings view for color config. 2014-07-07 18:13:19 -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
908772d8fe Fixed an instance where a level loading callback was erroring if called before the surface was built. 2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3 Fixed the gold view not showing numbers until the first change. 2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c Enabled submitting patches for thangs and articles. 2014-07-07 15:19:22 -07:00
Scott Erickson
12543cf4dd Added the foundation of a component docs view. 2014-07-07 10:11:02 -07:00
Ruben Vereecken
ea3d1fee74 Starting on achievement overview style 2014-07-07 15:03:28 +02:00
Ruben Vereecken
9055612b24 Fixtures set up, demo start 2014-07-07 12:47:32 +02:00
Ruben Vereecken
b5702bc314 Added simple demo page 2014-07-07 12:11:43 +02:00
Ruben Vereecken
75b738f126 User loading now have async callbacks 2014-07-07 12:03:48 +02:00
Ruben Vereecken
ec78f95da1 Prepared things for Scott 2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066 Got users and achievements to load in a neat way 2014-07-06 22:48:33 +02:00
Ruben Vereecken
128008daa1 Hid the progress bar on load failed 2014-07-06 21:48:31 +02:00
Ruben Vereecken
10735867a4 Got some basic hierarchy set up for user view and template inheritance 2014-07-06 21:10:28 +02:00
Ruben Vereecken
e33bb44ffc Start of new user routing and views are there 2014-07-06 20:45:27 +02:00
Scott Erickson
94a6e3961b Added a button in the level editor to choose which team to play when editing a ladder level. 2014-07-05 13:54:41 -07:00
Ruben Vereecken
601c4e2731 Merged with master 2014-07-05 16:47:16 +02:00
Scott Erickson
b635c4cf16 Fixes #1220. Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data. 2014-07-04 20:45:42 -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
1ce55e356c Making the ladder tab reload when social network friends load. See #1196. 2014-07-04 17:32:16 -07:00
Scott Erickson
ca8394621d Fixes #1223 2014-07-04 11:46:33 -07:00
Scott Erickson
f553a1c493 Merge pull request #1256 from rubenvereecken/patch_fix
Patch fix: applyDelta now always called
2014-07-04 11:45:22 -07:00
Ruben Vereecken
08030dc785 Cleaned up patch rendering logic 2014-07-04 20:18:26 +02:00
Ruben Vereecken
44c84b3689 proofed the SearchView's runSearch 2014-07-04 19:36:55 +02:00
Ruben Vereecken
a367082cc4 Corrected statistic logic, wrote test case 2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d added isTranslationPatch method to patches 2014-07-04 19:27:41 +02:00
Ruben Vereecken
7a4c6daec8 stats.gamesCompleted is now tracked in users 2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4 Added achievement preview, exp test, stuff 2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d Creating achievement demo
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
fe5b675d18 Achievement polling now successfully tested
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
6e4170012f Made sure applyDelta is called in all cases 2014-07-04 18:38:15 +02:00
Tery Lim
9090ce7714 Merge master into branch 2014-07-04 22:37:16 +08:00
Ruben Vereecken
63401025f6 proofed the SearchView's runSearch 2014-07-04 15:13:06 +02: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
Michael Schmatz
6a33ca0892 Removed autoscrolling 2014-07-03 16:40:00 -07:00
Michael Schmatz
615303395c Various fixes for recruiting page 2014-07-03 16:30:27 -07:00
George Saines
4d12aff35e removing the counselor from the contribute page and all other links 2014-07-03 15:42:24 -07:00
Michael Schmatz
52ddb8db62 Add login link and rounded corners for pics 2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c Added login button and fixed bg color 2014-07-03 14:40:39 -07:00
Michael Schmatz
538344094b Fixed filter behavior 2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3 Filter functional 2014-07-03 11:39:44 -07:00
Michael Schmatz
49e4dd71ae Merge branch 'master' into employer-redesign
Conflicts:
	app/schemas/models/user.coffee
2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a Filter button 2014-07-03 10:14:32 -07:00
Michael Schmatz
397140d9b0 Basic filtering
Only visas work
2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b Basic filtering functionality
Still has a few bugs
2014-07-02 15:48:26 -07:00
Dominik Kundel
004a14ae3c fixed autocomplete issue related to switching the programming language 2014-07-02 20:52:16 +02:00
Michael Schmatz
c6cc28b976 Various fixes to enable employers page to function correctly 2014-07-02 11:45:00 -07:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08: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
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Nick Winter
04976a7b14 Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225. 2014-06-24 21:08:01 -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
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -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
Scott Erickson
0363166736 Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well. 2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17:38 -07:00
Nick Winter
3862bd2376 Clearing backups of old models when saving new versions of versioned models. 2014-06-24 09:43:20 -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
Michael Schmatz
27774cdf0f Fix #1207 2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb Added new level "K-means++ Cluster Wars"
Added new level "K-means++ Cluster Wars"
2014-06-23 03:43:54 +03:00
Nick Winter
8698589625 Applying Scott's fix for #1198. 2014-06-22 07:55:29 -07:00
Nick Winter
81f8334f37 Some fixes for CocoSprite alphas. 2014-06-21 22:31:10 -07:00