Commit graph

4368 commits

Author SHA1 Message Date
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
Nick Winter
cc0ea25262 Merge pull request #1412 from rubenvereecken/meh
Table headers are now unhoverable
2014-08-08 08:38:05 -07:00
Nick Winter
523fd3e4ca Merge pull request #1417 from jayant1992/master
Level editor fixes
2014-08-08 08:30:53 -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