Commit graph

4639 commits

Author SHA1 Message Date
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
9a1dd412c9 Added Delighted feedback emails. 2014-08-09 23:11:26 -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
Nick Winter
b432936ca4 Merge pull request #1419 from differentmatt/master
Add cocodb/ to .gitignore for Windows setup
2014-08-08 14:39:49 -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
Matt Lott
16ed1ffee9 Add cocodb/ to .gitignore for Windows setup
Created by the Windows development environment setup script
2014-08-08 13:26:48 -07: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