Commit graph

4832 commits

Author SHA1 Message Date
Nick Winter
b0af3c5af1 Fixed en-GB.coffee. 2014-09-05 09:37:45 -07:00
Scott Erickson
64ea670ebd Reorganized the Surface into groupings. Changed no logic, just shuffled things around. 2014-09-05 09:21:00 -07:00
Nick Winter
ca8df87f8a Propagated i18n. 2014-09-05 09:13:09 -07:00
Nick Winter
88144024c4 Updated about page i18n. 2014-09-05 09:12:05 -07:00
Nick Winter
14b50f8b57 Merge pull request #1517 from Imperadeiro98/patch-1
Updated i18n
2014-09-05 09:02:52 -07:00
Nick Winter
5b3dc75d86 Merge pull request #1515 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-09-05 08:50:05 -07:00
Imperadeiro98
319b9a3400 Update about.jade
Updated some i18n (it is also needed to add line 42, 45-47, 56)
2014-09-05 09:25:32 +01:00
Imperadeiro98
2c2811fc25 Update en.coffee
Removed redundant code and updated some i18n
2014-09-05 09:24:08 +01:00
Nick Winter
9604ed8508 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 20:10:36 -07:00
Nick Winter
d3eb7a7438 Fixed a few issues with real-time multiplayer flags. 2014-09-04 20:10:04 -07:00
George Saines
d1f6b6ef51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 16:59:52 -07:00
George Saines
0beb34e3db redoing the about page 2014-09-04 16:59:46 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Imperadeiro98
aeafc6b648 Update pt-PT.coffee 2014-09-04 21:26:38 +01:00
kotvaska
e87992632e Update ru.coffee 2014-09-05 01:21:51 +06:00
Scott Erickson
fca9a92167 Flattened the queries the NewAchievementModal creates. 2014-09-04 11:17:07 -07:00
Scott Erickson
ef8342efdd Refactored the achievement schema, un-nesting definitions and bringing the query operator into force. 2014-09-04 11:17:06 -07:00
Nick Winter
8c45e22741 Protection and logging for #1463. Fixed an issue with spectate camera script bounds. 2014-09-04 11:04:23 -07:00
Scott Erickson
bfae70ef13 Added a close button to the game menu modal. 2014-09-04 10:03:34 -07:00
Nick Winter
b1de5e0045 Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.) 2014-09-03 19:19:04 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
1094487072 Fixed #1511 2014-09-03 17:47:29 -07:00
Scott Erickson
65c0d74a79 Added a new searchStrings property to level components to improve their search. 2014-09-03 17:33:10 -07:00
Scott Erickson
7fb89a9e7e Making the thangs column in the level editor hidden by default again. 2014-09-03 17:27:19 -07:00
Scott Erickson
5fc7caec64 Disabling an error that occurs on the dev server with the partial db. 2014-09-03 17:26:43 -07:00
Scott Erickson
f519df6189 Wrapping up work on the folderized thangs treema in the level editor. 2014-09-03 16:51:09 -07:00
Nick Winter
8f38d57aaa Merge branch 'feature/realtime-multiplayer' 2014-09-03 16:14:58 -07:00
Nick Winter
6b6c8dd683 Merged master into feature/realtime-multiplayer; looks good. 2014-09-03 16:14:33 -07:00
Scott Erickson
9439f0d47d Some tweaks and fixes to the folderized thangs in the level editor. 2014-09-03 15:38:57 -07:00
Scott Erickson
0cc593e3ac Thangs tab now maintains the order of thangs independently of how thangs are reorganized into folders. 2014-09-03 15:38:57 -07:00
Nick Winter
24a2373d54 Fixed editor config change event schema. 2014-09-03 13:08:09 -07:00
Scott Erickson
e1abf115f7 Folderizing thang types in the level editor. 2014-09-03 12:30:08 -07:00
Nick Winter
c1a7b70849 Missed committing part of previous fix. 2014-09-03 10:58:43 -07:00
Scott Erickson
975c6ad2a6 Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid. 2014-09-03 09:33:21 -07:00
Scott Erickson
1888e9ea92 Removed a log. 2014-09-03 08:44:46 -07:00
Scott Erickson
a494d1f2c4 Fixed the walls not updating when they are randomly generated. 2014-09-02 19:47:43 -07:00
Scott Erickson
9af460cf42 Fixed #330 2014-09-02 18:43:24 -07:00
Nick Winter
2c2316fff5 Non-integer frame offsets, okay, sure. 2014-09-02 18:42:41 -07:00
Nick Winter
681cc4656f Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging. 2014-09-02 18:28:02 -07:00
Nick Winter
6eb23349d0 Center camera when level loaded in level editor. 2014-09-02 18:08:41 -07:00
Scott Erickson
5b57fa5c71 Tweaked the color selection for thang types. 2014-09-02 18:08:18 -07:00
Scott Erickson
621c684c74 Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly). 2014-09-02 17:53:39 -07:00
Scott Erickson
4a100a501a Fixed a bug with new levels in the level editor. 2014-09-02 17:53:39 -07:00
Nick Winter
5b0e996f93 Think I may have fixed the color group setting issue again. 2014-09-02 17:46:52 -07:00
Nick Winter
23516175d4 Adding default IDs to new goals. 2014-09-02 17:28:45 -07:00
Scott Erickson
3fd9cb89ef Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly. 2014-09-02 17:26:02 -07:00
Scott Erickson
6394482c34 Unjanking getCurrentView. 2014-09-02 17:07:28 -07:00
Scott Erickson
daca7b54f3 Refactored SystemTabView names, hid the add button in the systems tab. 2014-09-02 16:50:54 -07:00
Nick Winter
fa0f904fbb Fixed a couple bugs with Achievements not getting schema defaults. 2014-09-02 16:48:16 -07:00
Nick Winter
b20b819a1f Tweaked a few styles on the ThangsTabView. 2014-09-02 16:43:17 -07:00