Scott Erickson
|
e3088ad813
|
Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements
|
2014-08-13 10:49:10 -07:00 |
|
Scott Erickson
|
19b9a99167
|
Fixed some tests.
|
2014-08-13 10:48:22 -07:00 |
|
Scott Erickson
|
04e8680263
|
Added an endpoint for loading all items.
|
2014-08-13 10:35:14 -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 |
|
Nick Winter
|
d5b1f4aaf3
|
Merge pull request #1429 from Darredevil/patch-14
Added 'Classic Algorithms' level section
|
2014-08-12 15:50:17 -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 |
|