codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-11 00:02:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5431 commits 27 branches 0 tags 134 MiB
Commit graph

1889 commits

Author SHA1 Message Date
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