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 |
|
Dominik Kundel
|
702656ad02
|
Merge remote-tracking branch 'upstream/master'
|
2014-08-14 22:30:19 +02:00 |
|
Dominik Kundel
|
b1252a4426
|
moving the popover for palette entries into the body to fix layering with popover of autocomplete
|
2014-08-14 22:29:57 +02:00 |
|
Nick Winter
|
719e64e85f
|
Added a quick visualization of language localization completion to the Diplomat page.
|
2014-08-14 11:43:40 -07:00 |
|
Nick Winter
|
18b0208aac
|
Updated i18n.
|
2014-08-14 10:57:57 -07:00 |
|
Scott Erickson
|
c31a509472
|
Working on the inventory view. Added a way to get the current equipment config from the inventory view.
|
2014-08-14 10:44:04 -07:00 |
|
Nick Winter
|
7286d069a0
|
Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.
|
2014-08-14 10:28:50 -07:00 |
|
Nick Winter
|
652d47fb81
|
Merge pull request #1432 from jayant1992/undo-redo
Undo redo descriptions
|
2014-08-14 09:58:28 -07:00 |
|
Ruben Vereecken
|
dbff3e04d5
|
Job profile view works once again
|
2014-08-14 17:25:41 +02:00 |
|
Nick Winter
|
0084b64d67
|
Made some updates to the community page.
|
2014-08-13 20:45:33 -07:00 |
|
Nick Winter
|
7844a2b987
|
Some fixes for new user views breaking on bad data or certain configurations.
|
2014-08-13 19:17:26 -07:00 |
|
Nick Winter
|
bdb3e14189
|
Added missing ForkModal.
|
2014-08-13 14:26:56 -07:00 |
|
Scott Erickson
|
31e3e7f98e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-13 14:06:03 -07:00 |
|
Scott Erickson
|
f9e8bfad9f
|
Made some minor changes.
|
2014-08-13 13:45:24 -07:00 |
|
Nick Winter
|
b7d5428d5f
|
Made Forking more abstract to apply to ThangTypes, too.
|
2014-08-13 11:36:00 -07:00 |
|
Scott Erickson
|
e3088ad813
|
Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements
|
2014-08-13 10:49:10 -07:00 |
|
Ruben Vereecken
|
3fd396974d
|
Merge branch 'master' into achievements
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
|
2014-08-13 10:43:42 +02:00 |
|
Jayant Jain
|
f4b8b76f46
|
Adds subclass for component config nodes
|
2014-08-13 12:39:21 +05:30 |
|
Jayant Jain
|
76c784b1de
|
Adds default scripts whenever a new level is created
|
2014-08-13 12:11:37 +05:30 |
|
Jayant Jain
|
1e52f237b7
|
Reworks undo-redo and undo-redo descriptions
|
2014-08-13 06:56:03 +05:30 |
|
Jayant Jain
|
094f26fc63
|
Removes undo-redo description methods from treema subclasses
|
2014-08-13 05:28:23 +05:30 |
|
Jayant Jain
|
67ed28e034
|
Undo redo descriptions for settings tab view
|
2014-08-13 02:55:36 +05:30 |
|
Jayant Jain
|
d713c35db7
|
Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView
|
2014-08-13 02:55:36 +05:30 |
|
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 |
|
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 |
|
Jayant Jain
|
eece235337
|
Adds preset images
|
2014-08-12 20:42:42 +05:30 |
|
Ruben Vereecken
|
d6f5b7512d
|
i18n for all new pages
|
2014-08-12 14:05:01 +02:00 |
|
Ruben Vereecken
|
857d3ca02c
|
Added some simple animations to achievement popups
|
2014-08-12 12:04:08 +02: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 |
|
Nick Winter
|
4cc79e985e
|
A few fixes for adding items to inventories in ThangTypes.
|
2014-08-11 17:09:44 -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 |
|
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 |
|
Nick Winter
|
31d7e641e6
|
Fixes for equipping items and adding them to the World.
|
2014-08-11 11:04:38 -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 |
|