Nick Winter
25334d59a0
Merge pull request #1527 from Titounkle/patch-2
...
Update es-ES.coffee
2014-09-07 20:46:51 -07:00
Nick Winter
68812eef0a
Fixed a couple types in new ar.coffee.
2014-09-07 20:41:47 -07:00
Gutierri Barboza
9f6870130f
more translations of phrases
2014-09-07 23:18:35 -03:00
MajkPascal
f20b963a2b
Polish translation
2014-09-07 21:31:46 +02:00
Titounkle
ff3b718bf2
Update es-ES.coffee
2014-09-07 19:59:58 +02:00
CodeIter
35382ff57c
update ar
...
another trans.
2014-09-07 13:20:15 +01:00
CodeIter
fb7509612f
ترجمة- translate
...
it 's too hard to complete it now.
however google translate is very useful (most translation from google are good but it always need a human verification.that 's because it 's hard to complete it)
2014-09-07 11:54:53 +01:00
Nick Winter
19720c38be
Propagated i18.
2014-09-06 19:57:03 -07:00
Nick Winter
75538a158e
Merge pull request #1523 from Imperadeiro98/patch-3
...
Level editor fixes
2014-09-06 19:56:22 -07:00
Nick Winter
18114af2a3
Merge pull request #1521 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-09-06 19:56:01 -07:00
Nick Winter
067b32dfbf
Merge pull request #1520 from Imperadeiro98/patch-1
...
Fixed a typo
2014-09-06 19:55:26 -07:00
Nick Winter
df131ca90a
Merge pull request #1519 from keenanjohnson/master
...
Added Potion Master names for #53
2014-09-06 19:55:02 -07:00
Nick Winter
78a0568594
Merge pull request #1518 from Titounkle/patch-1
...
Update es-ES.coffee
2014-09-06 19:53:37 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Imperadeiro98
c6f6282ae1
Update edit.jade
...
Fixed some errors
2014-09-06 17:32:01 +01:00
Imperadeiro98
253b0dc35c
Update en.coffee
...
Added "Documentation"
2014-09-06 17:31:24 +01:00
Imperadeiro98
8ada8c3a88
Update pt-PT.coffee
2014-09-06 10:41:01 +01:00
Imperadeiro98
66451b6ef0
Fixed a typo
2014-09-06 10:18:16 +01:00
keenanjohnson
d79fc4c62f
Added Potion Master names for #53
2014-09-05 20:18:05 -05:00
Titounkle
0246bc8070
Update es-ES.coffee
...
He hecho algunos cambios, pero no se muy bien como trabajais esto ya que es la primera vez que me involucro en github, basta con quitar el # de delante de las cosas que vayamos traduciendo o hay que marcarlas de alguna otra manera??
Un saludo
2014-09-05 22:51:39 +02:00
Nick Winter
8de75024fc
Implemented placeholders for a bunch of sound triggers.
2014-09-05 13:04:05 -07:00
kotvaska
0383b2ce2b
Update ru.coffee
2014-09-05 12:49:23 -07:00
Nick Winter
ddddc44651
Fixed en-GB.coffee.
2014-09-05 12:49:23 -07:00
Scott Erickson
64ea670ebd
Reorganized the Surface into groupings. Changed no logic, just shuffled things around.
2014-09-05 09:21:00 -07:00
Nick Winter
ca8df87f8a
Propagated i18n.
2014-09-05 09:13:09 -07:00
Nick Winter
88144024c4
Updated about page i18n.
2014-09-05 09:12:05 -07:00
Nick Winter
14b50f8b57
Merge pull request #1517 from Imperadeiro98/patch-1
...
Updated i18n
2014-09-05 09:02:52 -07:00
Nick Winter
5b3dc75d86
Merge pull request #1515 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-09-05 08:50:05 -07:00
Imperadeiro98
319b9a3400
Update about.jade
...
Updated some i18n (it is also needed to add line 42, 45-47, 56)
2014-09-05 09:25:32 +01:00
Imperadeiro98
2c2811fc25
Update en.coffee
...
Removed redundant code and updated some i18n
2014-09-05 09:24:08 +01:00
Nick Winter
9604ed8508
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-04 20:10:36 -07:00
Nick Winter
d3eb7a7438
Fixed a few issues with real-time multiplayer flags.
2014-09-04 20:10:04 -07:00
George Saines
d1f6b6ef51
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-04 16:59:52 -07:00
George Saines
0beb34e3db
redoing the about page
2014-09-04 16:59:46 -07:00
Nick Winter
b698200cf0
A few minor fixes.
2014-09-04 15:14:27 -07:00
Imperadeiro98
aeafc6b648
Update pt-PT.coffee
2014-09-04 21:26:38 +01:00
Scott Erickson
fca9a92167
Flattened the queries the NewAchievementModal creates.
2014-09-04 11:17:07 -07:00
Scott Erickson
ef8342efdd
Refactored the achievement schema, un-nesting definitions and bringing the query operator into force.
2014-09-04 11:17:06 -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
Scott Erickson
bfae70ef13
Added a close button to the game menu modal.
2014-09-04 10:03:34 -07:00
Nick Winter
b1de5e0045
Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.)
2014-09-03 19:19:04 -07:00
Nick Winter
35f22e0f8c
Fixed a few tome / canvas resizing bugs.
2014-09-03 18:35:14 -07:00
Scott Erickson
1094487072
Fixed #1511
2014-09-03 17:47:29 -07:00
Scott Erickson
65c0d74a79
Added a new searchStrings property to level components to improve their search.
2014-09-03 17:33:10 -07:00
Scott Erickson
7fb89a9e7e
Making the thangs column in the level editor hidden by default again.
2014-09-03 17:27:19 -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
Nick Winter
c1a7b70849
Missed committing part of previous fix.
2014-09-03 10:58:43 -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
2c2316fff5
Non-integer frame offsets, okay, sure.
2014-09-02 18:42:41 -07:00
Nick Winter
681cc4656f
Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging.
2014-09-02 18:28:02 -07:00
Nick Winter
6eb23349d0
Center camera when level loaded in level editor.
2014-09-02 18:08:41 -07:00
Scott Erickson
5b57fa5c71
Tweaked the color selection for thang types.
2014-09-02 18:08:18 -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
Scott Erickson
4a100a501a
Fixed a bug with new levels in the level editor.
2014-09-02 17:53:39 -07:00
Nick Winter
5b0e996f93
Think I may have fixed the color group setting issue again.
2014-09-02 17:46:52 -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
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
