Nick Winter
|
652d47fb81
|
Merge pull request #1432 from jayant1992/undo-redo
Undo redo descriptions
|
2014-08-14 09:58:28 -07:00 |
|
Scott Erickson
|
31e3e7f98e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-13 14:06:03 -07:00 |
|
Nick Winter
|
b7d5428d5f
|
Made Forking more abstract to apply to ThangTypes, too.
|
2014-08-13 11:36:00 -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
|
1e52f237b7
|
Reworks undo-redo and undo-redo descriptions
|
2014-08-13 06:56:03 +05:30 |
|
Jayant Jain
|
c6caef6219
|
Undo redo descriptions for ThangsTabView
|
2014-08-13 02:55:36 +05:30 |
|
Nick Winter
|
d1e26b40c2
|
I retook the Nick name.
|
2014-08-10 17:47:18 -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 |
|
Ruben Vereecken
|
47f00f9b5e
|
Added achievement deleting and automatic achievement filling
|
2014-08-08 17:20:07 +02:00 |
|
Scott Erickson
|
0c5364eebb
|
Removed editorMode.
|
2014-08-07 14:22:43 -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 |
|
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 |
|
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 |
|
Michael Schmatz
|
d7cb76d10c
|
Merge branch 'pr/1387'
Conflicts:
app/views/editor/level/LevelEditView.coffee
|
2014-07-25 19:17:16 -07:00 |
|
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 |
|
Jayant Jain
|
dc66218c00
|
Adds undo and redo buttons in editor topbar
|
2014-07-25 18:06:34 +05:30 |
|
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 |
|