Imperadeiro98
562a033f46
Update pt-PT.coffee
2014-09-15 20:13:42 +01:00
Nick Winter
d2491dba4f
Disabled autocast even more.
2014-09-15 11:56:29 -07:00
Nick Winter
87cde17650
Propagated i18n.
2014-09-15 10:24:13 -07:00
Nick Winter
1f8f5ce8f3
Merge pull request #1554 from djsmith85/i18n
...
Added i18n-tags in admin.jade and community.jade and updated the locale ...
2014-09-15 10:22:29 -07:00
Daniel James Smith
a0fb51ae94
Updated the German translations
2014-09-15 18:57:09 +02:00
Daniel James Smith
3dd888469e
Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly
2014-09-15 18:36:45 +02:00
Nick Winter
1d75a9ead3
Uncommented some pt-BR section headers.
2014-09-14 17:13:03 -07:00
Nick Winter
612eccd209
Merge pull request #1551 from gutierri/master
...
Translation and corrections to existing translations
2014-09-14 17:12:01 -07:00
AmyLaPazza
b9be6215ea
Added translations
...
Translated Lines 193,196 and 267.
2014-09-14 19:09:22 +02:00
Gutierri Barboza
b00b48450d
translation section account
2014-09-14 00:48:36 -03:00
Gutierri Barboza
4d7c0f24eb
standard translation for the same word
2014-09-14 00:44:48 -03:00
Gutierri Barboza
127fce2100
translation pt-BR section user
2014-09-14 00:42:18 -03:00
Gutierri Barboza
f4d1ed8a60
partial translation archievements
2014-09-13 23:08:43 -03:00
Gutierri Barboza
e012ea5bbc
wrong word
2014-09-13 22:55:50 -03:00
Gutierri Barboza
1e1f384cd3
translate pt-BR
2014-09-13 22:53:25 -03:00
George Saines
4053da3693
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-12 17:46:49 -07:00
George Saines
32ac3c1f95
updating contributor pages
2014-09-12 17:46:44 -07:00
Scott Erickson
c96f5d7bcf
Merge branch 'master' into feature/webgl
2014-09-12 16:33:39 -07:00
Scott Erickson
08bdcb2cb6
Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it.
2014-09-12 16:33:01 -07:00
Nick Winter
7a76e9ac77
Fixed a couple formatting issues in es-ES.
2014-09-12 10:22:32 -07:00
Titounkle
9d731ae80e
Update es-ES.coffee
2014-09-12 19:06:49 +02:00
Gutierri Barboza
7ac09d09f3
translation pt-BR
2014-09-12 13:31:50 -03:00
Nick Winter
d3245948e2
Sorting addable Thangs in a sensible order.
2014-09-11 13:34:15 -07:00
Michael Schmatz
c08c279f8b
Removed net neutrality banner
2014-09-11 16:13:06 -04:00
Nick Winter
e9968b648f
Fixed bugs with click coordinates messing up mouse-down targeting.
2014-09-11 13:05:31 -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
8c37fabe79
Merge pull request #1537 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-09-11 08:45:36 -07:00
Nick Winter
35e1931fc3
Merge pull request #1534 from Titounkle/patch-3
...
Update es-ES.coffee
2014-09-11 08:43:59 -07:00
Nick Winter
ba554f3ff0
Fixed some indentation from #1532 .
2014-09-11 08:43:36 -07:00
Nick Winter
0990a45802
Merge pull request #1532 from lukigno95/patch-1
...
Update it.coffee
2014-09-11 08:41:19 -07:00
Nick Winter
68808d0e07
Some fixes for how audio is triggered.
2014-09-11 08:38:30 -07:00
Imperadeiro98
74afea5efa
Update pt-PT.coffee
2014-09-11 14:38:11 +01:00
Nick Winter
f53f6bf0a3
Misc changes, wishing I could get sounds to work at lower volumes.
2014-09-10 19:55:00 -07:00
Imperadeiro98
10132c6fd1
Update pt-PT.coffee
2014-09-10 11:02:01 +01:00
Nick Winter
0b1f4ebada
Fixed two extra spaces in DE localizations.
2014-09-09 18:58:04 -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
Titounkle
d9ee5c248d
Update es-ES.coffee
...
Number 219 im not quite sure...I'll think about it.
2014-09-09 18:43:28 +02:00
Michael Schmatz
b35a0161e8
Inserted Battle For The Net banner
2014-09-09 12:34:30 -04:00
Nick Winter
2396f9c26d
Updates to go along with latest iPad app spell palette loading.
2014-09-08 21:40:52 -07:00
lukigno95
fa7f827fcb
Update it.coffee
2014-09-09 01:10:24 +02:00
Nick Winter
dd2cdf3ef9
Fixed bugs with forking ThangTypes.
2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74
Workaround for missing document.location inside child window in Windows Chrome.
2014-09-08 14:31:52 -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
eb4293fee5
Temp: ThangTypes don't require kind.
2014-09-08 13:02:39 -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
40c37a8be1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-07 20:48:36 -07:00
Nick Winter
6ac8dc1d2d
Merge pull request #1531 from gutierri/master
...
more translations of phrases
2014-09-07 20:47:57 -07:00
Nick Winter
4908cb4d0a
Merge pull request #1529 from MajkPascal/patch-2
...
Polish translation
2014-09-07 20:47:38 -07:00
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
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
Nick Winter
6c8051bd48
Merge pull request #1487 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-08-26 08:07:33 -07:00
Imperadeiro98
32de00a87f
Update user_home.jade
...
Fixed some errors.
2014-08-26 10:33:00 +01:00
Imperadeiro98
203dc19ee2
Update pt-PT.coffee
2014-08-26 10:31:25 +01:00
Imperadeiro98
732a9b3762
Update pt-PT.coffee
2014-08-26 10:24:14 +01: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
George Saines
ea3ade5bbc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-25 20:27:54 -07:00
George Saines
f5790907a1
removing editor page
2014-08-25 20:27:50 -07:00
Nick Winter
6fb0073eae
Fixed harmless Wizard startup animation error.
2014-08-25 16:15:34 -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
6eab4ff7a6
Code language nodes that want to skip JavaScript now can.
2014-08-25 14:35:51 -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
e278f3ecb4
Merge branch 'stream'
2014-08-25 09:11:57 -07:00
Nick Winter
ac3f1647e4
Merge pull request #1480 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-25 08:29:50 -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
f8ddc17a9f
Merge pull request #1482 from ZephyrSails/master
...
Update zh-HANS.coffee
2014-08-24 20:51:28 -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
Scott Erickson
297b3e3e63
Last schema refactoring.
2014-08-24 11:19:44 -07:00
Imperadeiro98
4da9b470ab
Update pt-PT.coffee
2014-08-24 09:03:25 +01: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
78a4000e34
Refactoring defaults in schemas.
2014-08-23 16:06:41 -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
Nick Winter
f2adb7ec7f
Skipping serialization/deserialization of needless Programmable clones.
2014-08-23 11:16:02 -07:00
Scott Erickson
4520c0f2b6
Merge branch 'master' into feature/defaults
2014-08-23 11:08:54 -07:00
Scott Erickson
7d797b9cd9
Removed duplicate goal schemas from the deprecated script goal properties.
2014-08-23 11:08:27 -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
0431f70954
Improved Surface playback fast-forwarding.
2014-08-23 09:52:05 -07:00
Nick Winter
92b70ae833
Propagated i18n. Fixed #1478 .
2014-08-23 08:45:14 -07:00
Nick Winter
4e87dc5e46
Uncommented es units header.
2014-08-23 08:32:22 -07:00
Nick Winter
c1aa147f41
Merge branch 'patch-1' of git://github.com/mugenryuk/codecombat into mugenryuk-patch-1
2014-08-23 08:31:55 -07:00
Nick Winter
d70f86b166
Merged conflicting ru translations.
2014-08-23 08:31:17 -07:00
Nick Winter
9b86ccd6d1
Merge pull request #1461 from bonkboykz/patch-1
...
Update ru.coffee
2014-08-23 08:27:55 -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
6fee881efd
Fixed a few more issues with playback.
2014-08-22 17:11:40 -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
e7dd88498d
Made more clear when thang types and level thangs are missing dependencies.
2014-08-22 14:52:35 -07:00
Nick Winter
611ecbf470
Fixed many issues with world streaming.
2014-08-22 12:39:29 -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
Imperadeiro98
c0c3879bb1
Fixed typo
2014-08-22 13:15:47 +01:00
Nick Winter
9b31e28536
More improvements to world streaming.
2014-08-21 21:23:45 -07:00
Nick Winter
bd380e4a09
World streaming is starting to work!
2014-08-21 17:30:46 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Scott Erickson
76b08f35bb
Removed duplicate goal schemas from the deprecated script goal properties.
2014-08-21 15:44:51 -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
Xiu Zhiping
3178abab05
Han(s) translation
2014-08-22 00:19:06 +08:00
Nick Winter
7b3fe0a3fb
Merge pull request #1470 from ZephyrSails/patch-1
...
zephyer's change
2014-08-21 08:37:46 -07:00
Imperadeiro98
c0a5e1d646
Update pt-PT.coffee
2014-08-21 09:46:40 +01:00
Xiu Zhiping
71058474b3
zephyer's change
...
does this part of work changed to HANs & HANt?
2014-08-21 10:56:38 +08:00
Nick Winter
4889cc4e62
Moved achievement and contribute images from public to assets.
2014-08-20 19:00:39 -07:00
Nick Winter
3755cb9d66
Fixed some bugs with sprite layer ordering.
2014-08-20 18:57:33 -07:00
mugenryuk
c362024536
Update es.coffee
2014-08-20 16:13:40 -05:00
Nick Winter
28fb435bfe
Merge pull request #1454 from logicomPL/patch-1
...
Update pl.coffee
2014-08-20 14:12:49 -07:00
Nick Winter
28176c7f72
Misc workarounds.
2014-08-20 13:26:48 -07:00
mugenryuk
ae859ebb19
Update es.coffee
2014-08-20 15:08:48 -05:00
Fedorsturov
45629ad7cb
Update ru.coffee
2014-08-20 22:14:20 +04:00
Imperadeiro98
0d4fb9a777
Update pt-PT.coffee
2014-08-20 12:06:54 +01:00
Imperadeiro98
bd84434088
Fixed typo
2014-08-20 11:49:53 +01:00
bonkboykz
528ca31102
Update ru.coffee
2014-08-20 15:42:26 +06:00
Nick Winter
df7f1b2b9b
Now have 'free' rotationType, equivalent to previous default of undefined.
2014-08-19 22:33:33 -07:00
Nick Winter
def4d01c8e
Starting to let us control the size of the achievements popup, although much more Sass math is needed.
2014-08-19 19:21:36 -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
51a831a2e7
Tweaked the goal id field schema to be a bit more stringent. Forces the id to be a slug.
2014-08-18 16:40:18 -07:00
Scott Erickson
9f6bfb854d
Fixed the markdown treema node after changes to the ace editor node on treema broke things.
2014-08-18 16:04:43 -07:00
Nick Winter
34c389ed5d
Put the Markdown mode in there. (We can't figure out why it wasn't there or whether it ever worked or why it stopped working, but whatever.)
2014-08-18 15:42:32 -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
Scott Erickson
9ee3c6f3fe
Added a description to the achievement icon.
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
Nick Winter
2588ec67ff
Fix for buildLoop still trying to loop after LevelLoader destruction for some reason.
2014-08-18 14:09:28 -07:00
Nick Winter
071f006acf
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-18 14:09:02 -07:00
Nick Winter
8ca9374de0
Zoom-aware, ratio-based edge avoidance (polish for #1448 ).
2014-08-18 14:08:54 -07:00
Scott Erickson
3f78b5f979
Merge pull request #1452 from rubenvereecken/new_achievement
...
New achievement modal fills in level.original query bit
2014-08-18 13:56:45 -07:00
Scott Erickson
86ba46b64c
Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand.
2014-08-18 13:43:17 -07:00
Scott Erickson
69ab177702
Trying to get rid of debug logs in karma. Tried to do it with the conf, didn't seem to work, did a hack instead.
2014-08-18 13:43:17 -07:00
Nick Winter
9697af6b05
Merge pull request #1448 from TheSecretSquad/issue#1213CoordinateDisplayEdgeDetection
...
Issue#1213 coordinate display edge detection
2014-08-18 13:42:37 -07:00
Szymon Gabrek
664853f5e9
Update pl.coffee
2014-08-18 19:47:00 +02: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
Pete DiSalvo
a011f118e3
Added CoordinateDisplay edge detection. Doesn't account for camera zoom.
2014-08-16 18:51:47 -04:00
Pete DiSalvo
eed68c0a1c
Working orientation. Doesn't account for camera zoom
2014-08-16 18:30:41 -04:00
Pete DiSalvo
31e609c0c8
Added edge detection to camera, and worked on orientations
2014-08-16 18:30:41 -04:00
Pete DiSalvo
dc7529344c
Working on orientation
2014-08-16 18:30:41 -04:00
Pete DiSalvo
8f6d162542
Beginning work on edge detection
2014-08-16 18:30:41 -04:00
Imperadeiro98
89e8d523c5
Update pt-PT.coffee
2014-08-16 09:35:34 +01: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
Scott Erickson
8233df514e
Added an acceptor field to patches.
2014-08-15 10:36:21 -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
Nick Winter
419e86b50f
Merge pull request #1443 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-15 08:18:23 -07:00
Ruben Vereecken
40818fd7bc
GitHub Login implemented
2014-08-15 16:20:45 +02:00
Imperadeiro98
2cbbb1c0dc
Update pt-PT.coffee
2014-08-15 11:32:30 +01: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
Matt Lott
9752c4b18a
Updating user_code_problem schema types
2014-08-14 15:47:02 -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
Scott Erickson
5a700c14df
Stab at fixing the client tests on travis.
2014-08-14 11:00:42 -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
Nick Winter
2f29e4ef89
Merge pull request #1438 from Imperadeiro98/patch-2
...
Fixed typo
2014-08-14 09:58:11 -07:00
Nick Winter
99d29bd206
Merge pull request #1437 from Imperadeiro98/patch-1
...
Update diplomat.jade
2014-08-14 09:57:23 -07:00
Ruben Vereecken
dbff3e04d5
Job profile view works once again
2014-08-14 17:25:41 +02:00
Imperadeiro98
553b124de8
Update uk.coffee
2014-08-14 09:05:56 +01:00
Imperadeiro98
8e4f9189a0
Update locale.coffee
2014-08-14 09:05:47 +01:00
Imperadeiro98
d7270335ca
Update diplomat.jade
...
Added all the languages and myself.
2014-08-14 09:04:29 +01: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
4f3af4d64f
Fixed #1433 .
2014-08-13 14:57:07 -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
Nick Winter
d3fb168636
Merge pull request #1431 from Imperadeiro98/master
...
Updated files
2014-08-12 15:52:53 -07:00
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
Imperadeiro98
eccf148793
Big update to pt-PT.coffee
2014-08-12 22:11:14 +01:00
Imperadeiro98
2ec8a69de0
Update locale.coffee
...
Updated pt-PT description and added Catalan.
2014-08-12 22:09:46 +01:00
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
Scott Erickson
8fafd46b7f
Reined in an overzealous css rule.
2014-08-12 09:04:36 -07:00
Nick Winter
a4663bf5e4
Merge pull request #1426 from jayant1992/temp
...
Terrain generator
2014-08-12 08:42:15 -07:00
Nick Winter
cfc0ddbd68
Merge pull request #1425 from Imperadeiro98/master
...
Update pt-PT
2014-08-12 08:39:44 -07:00
Jayant Jain
eece235337
Adds preset images
2014-08-12 20:42:42 +05:30
Imperadeiro98
612056eaf6
Started Contribute
...
I started translating Contribute and I will uncomment when it is translated integrally.
2014-08-12 14:05:39 +01:00
Ruben Vereecken
d6f5b7512d
i18n for all new pages
2014-08-12 14:05:01 +02:00
Imperadeiro98
8a3d9d6af2
Update pt-PT.coffee
...
In line 451, does it refer to "Game" or "Games".
2014-08-12 12:40:41 +01:00
Ruben Vereecken
857d3ca02c
Added some simple animations to achievement popups
2014-08-12 12:04:08 +02:00
Imperadeiro98
ab3b6f29f3
Update pt-PT.coffee
2014-08-12 09:49:23 +01:00
Imperadeiro98
73e18a66e7
Update pt-PT.coffee
2014-08-12 09:45:54 +01: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
Scott Erickson
88252806c7
Fixed #1413 .
2014-08-11 18:47:41 -07:00
Nick Winter
4cc79e985e
A few fixes for adding items to inventories in ThangTypes.
2014-08-11 17:09:44 -07:00
Nick Winter
00aa211a7d
Merge pull request #1421 from Imperadeiro98/master
...
New strings translated
2014-08-11 16:18:25 -07:00
Nick Winter
910e064bb0
Merge pull request #1423 from jayant1992/temp-bugfix
...
Fixes bug with enter press on thangs tab
2014-08-11 16:16:22 -07:00
Nick Winter
9a5cd22069
Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels.
2014-08-11 16:15:46 -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
Imperadeiro98
bd0f75a414
Update pt-PT.coffee
2014-08-11 20:35:41 +01: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
Imperadeiro98
6c2a0ef77c
Update pt-PT.coffee
2014-08-11 20:04:23 +01:00
Imperadeiro98
18380f4dd5
Update pt-PT.coffee
...
In line 432, is the string right?
2014-08-11 20:03:29 +01:00
Imperadeiro98
010afc7e95
Update pt-PT.coffee
2014-08-11 19:29:54 +01:00
Nick Winter
31d7e641e6
Fixes for equipping items and adding them to the World.
2014-08-11 11:04:38 -07:00
Nick Winter
cf7e2042c9
Got bitten by another case of #1108 .
2014-08-11 10:02:39 -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
fb95f48f73
Implemented GameMenu OptionsView.
2014-08-10 16:27:33 -07:00
Nick Winter
4dcc5bd8ee
Adding some options to the game menu options tab.
2014-08-10 15:56:45 -07:00
Scott Erickson
65658dec78
Small styling fix.
2014-08-10 13:07:06 -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
da74a5ae77
Merge pull request #1410 from kisik21/patch-1
...
Update ru.coffee
2014-08-08 15:05:38 -07:00
kisik21
dfd5fad258
Update ru.coffee
...
Oh nooooo...
2014-08-09 01:34:41 +04:00
kisik21
450831548e
Update ru.coffee
...
Slag, why I am so stupid? I am making more and more commits, to fix MY errors, when I can do not make them...
2014-08-09 01:28:06 +04:00
kisik21
8bfb8a5049
Update ru.coffee
...
Fixed some errors in formatting, seems like I broke that...
2014-08-09 01:13:28 +04:00
kisik21
e882abcb79
Update ru.coffee
...
Кое что подправил, по совету Alexei Nikitin (Прошу прощения, если неправильно написал ник)
Fixed some strings with Alexei Nikitin (Sorry if I wrote your nickname incorrectly)
2014-08-09 00:54:03 +04: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
Nick Winter
cc0ea25262
Merge pull request #1412 from rubenvereecken/meh
...
Table headers are now unhoverable
2014-08-08 08:38:05 -07: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
3bfd341363
Goal states are now tracked in level sessions (state.goalStates)
2014-08-08 13:10:31 +02:00
Ruben Vereecken
9f0add22a5
Worked in a lot of changes Scott proposed
2014-08-08 11:54:53 +02:00
Scott Erickson
9403d39b61
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-07 18:48:41 -07:00
Scott Erickson
94ca62f4c5
Fixed a bug I added in some minor final changes.
2014-08-07 18:48:30 -07: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
Scott Erickson
cc025942f8
Extended the LevelLoader to load thang types and components dynamically for hero levels.
2014-08-07 18:27:47 -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
Ruben Vereecken
e082d363be
Table headers are now unhoverable
2014-08-07 13:12:30 +02:00
George Saines
0549273d14
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8
community page redesign
2014-08-06 17:42:19 -07:00
Scott Erickson
29770bd220
Added a function for denormalizing levels, extending level thang components and configs with ones from thang types.
2014-08-06 15:18:22 -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
Nick Winter
74283bafed
Made sure items equip themselves within the SpriteBoss, too.
2014-08-05 21:47:51 -07:00
kisik21
46c6051102
Update ru.coffee
2014-08-06 02:42:30 +04:00
Scott Erickson
eceac0bbc9
Hiding the randomize button overlay until #1409 is handled.
2014-08-05 15:06:11 -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
Nick Winter
0bcaf70d56
Merge pull request #1406 from rubenvereecken/forms_fix
...
Fixed missing errors bug
2014-08-04 12:49:22 -07:00
Nick Winter
8a86e86012
Merge pull request #1390 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-04 12:45:13 -07:00
Ruben Vereecken
c165d46e17
Fixed missing errors bug
2014-08-04 20:02:26 +02: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
Imperadeiro98
0663dbc414
Update pt-PT.coffee
2014-08-01 10:39:30 +01:00
Imperadeiro98
4b932593be
Update pt-PT.coffee
2014-07-31 18:39:13 +01:00
Imperadeiro98
96fb84362a
Update pt-PT.coffee
2014-07-31 18:21:23 +01:00
Imperadeiro98
c7212226ae
Update pt-PT.coffee
2014-07-31 18:01:09 +01:00
Imperadeiro98
68e3110e74
Update pt-PT.coffee
2014-07-31 17:38:14 +01: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
Michael Schmatz
2ebc7f5aa6
Merge pull request #1398 from jayant1992/master
...
Updates for script tab in level editor
2014-07-31 08:12:04 -07:00
Michael Schmatz
52b8dd8db3
Merge pull request #1400 from rubenvereecken/moment_update
...
Added Moment i18n support
2014-07-31 08:11:01 -07:00
Michael Schmatz
0b9df5150d
Merge pull request #1393 from Melondonut/patch-3
...
Korean translation - patch3
2014-07-31 08:10:22 -07:00
Ruben Vereecken
0e5accb707
Repaired TestView by only loading js files once
2014-07-31 13:15:57 +02:00
Imperadeiro98
3d71d155b6
Update pt-PT.coffee
2014-07-31 10:50:01 +01:00
Ruben Vereecken
41729f9700
Added Moment i18n support
2014-07-30 23:19:21 +02:00
Ruben Vereecken
871149b2bc
Rechecked and added cool stuff for achievements
2014-07-30 22:23:43 +02:00
Imperadeiro98
1f8ce2eaf2
Update pt-PT.coffee
2014-07-30 20:47:03 +01: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
Ruben Vereecken
15c1939657
Started on achievement setup script
2014-07-28 14:17:25 +02:00
Melondonut
9b830fff26
Update ko.coffee
2014-07-28 18:58:48 +09:00
Melondonut
9d93d871e1
Update ko.coffee
2014-07-28 13:35:05 +09:00
Melondonut
5307515553
Update ko.coffee
2014-07-28 13:07:18 +09:00
Melondonut
53dd446db1
Update ko.coffee
2014-07-28 12:44:20 +09:00
Imperadeiro98
3ffeda8bbc
Update pt-PT.coffee
2014-07-27 19:31:56 +01: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
Jayant Jain
df554360fe
Updates glyphicons for undo-redo, adds placeholder text for add thangs search
2014-07-26 01:55:15 +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
80da704d19
Background image paths automated, adds preset image files
2014-07-25 17:54:10 +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
Jayant Jain
86cf344f28
Adds preset images to preview the generated terrain
2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893
Docs tab v2
2014-07-25 01:26:34 +03:00
Imperadeiro98
19f257f1d0
Update pt-PT.coffee
2014-07-24 22:43:39 +01:00
Michael Schmatz
d773c301fb
Add message if no player code in profile
2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b
Add login link to profile login prompt
2014-07-24 10:16:43 -07:00
Melondonut
26ab77b1ae
Update ko.coffee
2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b
Update ko.coffee
2014-07-24 15:30:54 +09:00
Michael Schmatz
e0d7392c1f
Merge pull request #1386 from codecombat/pr/1376
...
Pr/1376
2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0
Uncommented some commented translated lines
2014-07-23 15:23:53 -07: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
Ruben Vereecken
cde87e4fe5
Covered general patches with tests
2014-07-23 20:00:28 +02:00
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07:00
Dominik Kundel
5279b01483
fixed showing pinned popover
2014-07-23 17:39:16 +02: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
72c1bb28b3
fixed artefact
2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843
last fix for dimming the editor
2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6
disabled editor works again
2014-07-23 14:38:12 +02:00
Melondonut
cb3f547b9e
Update ko.coffee
2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81
Update ko.coffee
2014-07-23 13:56:18 +09:00
Ruben Vereecken
8969311d82
Butons on profile page now nicer
2014-07-22 21:52:52 +02:00
Dominik Kundel
5db634d6a8
fullscreen on keyboard shortcut
2014-07-22 21:47:36 +02:00
George Saines
8982c7ea5b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-22 09:11:30 -07:00
George Saines
574252df32
subbing in Pavel's better tiny programming language icons
2014-07-22 09:11:25 -07:00
greyhusky
a313c3ab27
More translations
...
Translated the "about" page and parts of "legal" page as well as some other stuff
2014-07-22 15:01:47 +02:00
Ruben Vereecken
411bb87985
Added contributor categories to user profile page
2014-07-22 12:50:56 +02:00
Melondonut
8476aa33f9
Update ko.coffee
2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff
Update ko.coffee
2014-07-22 10:13:24 +09: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
Michael Schmatz
e8ffb8980f
Removed filterActive from filter alerts
2014-07-21 14:47:44 -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
Michael Schmatz
735a7082ee
Correction to filter schema
2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2
Added saved employer filter alerts to schema
2014-07-21 09:44:40 -07: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
Nick Winter
ac7e663418
Merge pull request #1359 from Melondonut/patch-2
...
translation Update ko.coffee
2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0
uncommented line 485
2014-07-21 14:11:17 +09: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
99e1a8b30a
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
...
Changed point marker to crosshair, made it bigger, and changed color to white
2014-07-20 16:04:29 -07: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
Melondonut
f5ac5423f8
Update ko.coffee
...
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c
fix for no user logged
2014-07-20 22:14:33 +03:00
Melondonut
9724c4f218
Update ko.coffee
...
Hi there.
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."
thank you,
Melondonut.
안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed
Changed point marker to crosshair, and changed color to white
2014-07-19 20:12:56 -04: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
Scott Erickson
90a4a1b635
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-18 16:12:27 -07:00
George Saines
18631ec5b1
upgrading our level icons
2014-07-18 15:42:53 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Imperadeiro98
3ac1d6c77c
Update pt-PT.coffee
2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc
Update pt-PT.coffee
2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11
Propagated i18n tags for code language blurbs.
2014-07-17 20:13:30 -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
708f67ebd5
Merge branch 'master' into renameViews
2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 17:23:56 -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
Nick Winter
079d336881
Stopped .nano from overriding Bootstrap's column width for component docs page.
2014-07-17 16:36:59 -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