Commit graph

3618 commits

Author SHA1 Message Date
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
Scott Erickson
c70ffbeef5 Fixed onBackground for surface:stage-mouse-down events. 2014-09-02 16:42:03 -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
George Saines
e0b49ba2aa Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-02 15:33:28 -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
523cbfd38e Fixed a typo in the achievements:new event schema. 2014-09-02 14:27:13 -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
2c22fdf84e Merge pull request #1498 from 99133799/patch-1
Update ro.coffee
2014-09-01 22:21:11 -07:00
Nick Winter
7af2690c47 Propagated i18h. 2014-09-01 22:20:48 -07:00
Nick Winter
2446227387 Merge pull request #1505 from Imperadeiro98/patch-1
Update en.coffee
2014-09-01 22:20:02 -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
632559f7db Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'. 2014-09-01 20:53:53 -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
George Saines
5f9cc2561a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-01 16:28:03 -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
George Saines
b278525785 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-01 16:14:42 -07:00
Imperadeiro98
a28269c531 Update en.coffee
I don't know if is necessary to change something in codecombat / app / templates / play.jade
2014-09-01 23:10:14 +01:00
Nick Winter
195e027b53 Fix for null/undefined objects in the diffs. 2014-09-01 14:27:47 -07:00
George Saines
0aea061275 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-01 14:26:56 -07:00
George Saines
2a3cecb118 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-01 14:09:43 -07:00
George Saines
d1eac35a4f fixed transparency issue with thang image 2014-09-01 14:09:39 -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
040ac4ff4e Fixed bug with black flashes during script playback. 2014-08-31 16:05:21 -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
MajkPascal
dc81e0d84b Update pl.coffee 2014-08-31 22:31:28 +02:00
Nick Winter
9b2ee45a4d Added DPS to item view. 2014-08-31 12:27:52 -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
1b0346a1b7 Propagated volume label i18n. 2014-08-30 08:24:14 -07:00
Nick Winter
da9bda3e8a Merge pull request #1501 from Imperadeiro98/patch-2
Update pt-PT.coffee
2014-08-30 08:16:52 -07:00
Nick Winter
384d702c4b Merge pull request #1500 from Imperadeiro98/patch-1
Fixed errors
2014-08-30 08:15:41 -07:00
Imperadeiro98
1f86430076 Update pt-PT.coffee 2014-08-30 14:04:31 +01:00
Imperadeiro98
93b1f782aa Added "Volume" and fixed error 2014-08-30 13:48:36 +01:00
Imperadeiro98
caa372628b Fixed errors 2014-08-30 13:48:19 +01:00
Tore Haugland
635f0224e4 Updated locale\no with a more common norwegian than a direct translation from English to make it easier to read for all ages 2014-08-30 11:06:10 +02:00
Tore Haugland
41e9778b3c Updated locale\no with correct letter case on several translations 2014-08-30 10:54:30 +02:00
99133799
ece96bce2a Update ro.coffee 2014-08-30 10:31:24 +03: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
b918f5adfb Fixed #1262. 2014-08-29 17:18:38 -07:00
Scott Erickson
3f6c9c4f02 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-29 17:12:44 -07:00
Nick Winter
5503b3a2bc Fixed #1147. 2014-08-29 17:03:02 -07:00
Scott Erickson
b4d9a787f0 Fixed the rest of the server tests. 2014-08-29 16:28:07 -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
2dfe39aafd Migrated Achievement model's getExpFunction to use the new defaults system. 2014-08-29 12:28:45 -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
Nick Winter
f74a152942 Fixed #1104. 2014-08-28 18:55:33 -07:00
Scott Erickson
9406a8c920 Merge branch 'master' into feature/defaults 2014-08-28 17:58:58 -07:00
Scott Erickson
5fd154ca8b Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed. 2014-08-28 17:57:39 -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
608d114c5c Fixed metaschemas not being found. 2014-08-28 15:54:05 -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
Scott Erickson
154b91c753 Changed LevelLoader to always deeply load components and thang types, not just for hero levels. 2014-08-28 15:19:04 -07:00
Nick Winter
0fa5d264f4 Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle. 2014-08-28 14:25:37 -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
1094d09aa5 Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode. 2014-08-28 11:23:52 -07:00
Nick Winter
d7ae07c012 Fixed Facebook login bug. 2014-08-28 11:16:55 -07:00
Nick Winter
a471462279 Merge pull request #1497 from Imperadeiro98/master
Update pt-PT.coffee
2014-08-28 10:51:30 -07:00
Nick Winter
54207f0f7d Fixed #1000. 2014-08-28 10:50:20 -07:00
Imperadeiro98
92055aaa21 Update pt-PT.coffee 2014-08-28 18:20:52 +01: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
a39097b366 Fixed #1494. 2014-08-28 09:29:38 -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
Scott Erickson
bcffc5811f Migrated the Level populating of component and system config defaults to the new Treema utility method. 2014-08-27 18:17:47 -07:00
Nick Winter
cd3bf4d0db Fixed a few bugs. 2014-08-27 18:05:18 -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
3f16aaab61 Fixed a few more Backbone Mediator event validation issues. 2014-08-27 16:31:44 -07:00
Rikard Gehlin
7aa1a4112a Update sv.coffee 2014-08-28 00:08:43 +02:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Scott Erickson
ac2c39a266 Fixed an infinite loop bug in CoordinateGrid. 2014-08-27 09:49:37 -07:00
djsmith85
8b80ac5c44 Added a few German translations
Added translations to de.coffee and synced them with de-DE.coffee and
de-AT.coffee.
2014-08-27 11:28:23 +01:00
Nick Winter
6ff01f7deb Fixed #814. 2014-08-26 18:11:35 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Scott Erickson
607a2a133f Made the SuperModel a little bit more clever about handling duplicate loaded models, hopefully fixed #1108. 2014-08-26 16:46:23 -07:00
Scott Erickson
98752159ca Made the SuperModel a little bit more clever about handling duplicate loaded models. 2014-08-26 16:31:53 -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
f1bf160755 Fixed merge conflict. 2014-08-26 15:42:03 -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
a5c18a4140 Fixed #453. 2014-08-26 15:22:13 -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
7300c4b3b8 Finished removing grid from playback options menu. 2014-08-26 14:00:03 -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
a5912c8e40 Merge pull request #1490 from Imperadeiro98/master
Update pt-PT.coffee
2014-08-26 11:34:58 -07:00
Nick Winter
741139db59 Apparently GitHub ids are integers, not strings. 2014-08-26 11:34:33 -07:00
Nick Winter
38dcb7fcef Fixed #5. 2014-08-26 11:29:16 -07:00
Imperadeiro98
5dde2572ff Update pt-PT.coffee 2014-08-26 19:15:50 +01:00
Scott Erickson
ef8ca9874a For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default. 2014-08-26 10:28:01 -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
3b6de071f7 Getting rid of a debug line. 2014-08-26 09:55:59 -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
397fc02d6c Realized we still needed nav.editor. Propagated i18n. 2014-08-26 08:20:31 -07:00
Nick Winter
898bb69477 Added missing Countdown Screen file. 2014-08-26 08:18:06 -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