codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4765 commits 27 branches 0 tags 134 MiB
Commit graph

3628 commits

Author SHA1 Message Date
Imperadeiro98
5dde2572ff Update pt-PT.coffee 2014-08-26 19:15:50 +01:00
Scott Erickson
ef8ca9874a For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default. 2014-08-26 10:28:01 -07:00
Scott Erickson
fb06e58201 Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties. 2014-08-26 10:14:36 -07:00
Scott Erickson
3b6de071f7 Getting rid of a debug line. 2014-08-26 09:55:59 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f Bunch of fixes to the thang component edit view. 2014-08-26 09:48:33 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
397fc02d6c Realized we still needed nav.editor. Propagated i18n. 2014-08-26 08:20:31 -07:00
Nick Winter
898bb69477 Added missing Countdown Screen file. 2014-08-26 08:18:06 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Nick Winter
6c8051bd48 Merge pull request #1487 from Imperadeiro98/patch-2 
Update pt-PT.coffee
 2014-08-26 08:07:33 -07:00
Imperadeiro98
32de00a87f Update user_home.jade 
Fixed some errors.
 2014-08-26 10:33:00 +01:00
Imperadeiro98
203dc19ee2 Update pt-PT.coffee 2014-08-26 10:31:25 +01:00
Imperadeiro98
732a9b3762 Update pt-PT.coffee 2014-08-26 10:24:14 +01:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
George Saines
ea3ade5bbc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-25 20:27:54 -07:00
George Saines
f5790907a1 removing editor page 2014-08-25 20:27:50 -07:00
Nick Winter
6fb0073eae Fixed harmless Wizard startup animation error. 2014-08-25 16:15:34 -07:00
Nick Winter
e48b218533 Projected models can now update their projections and re-fetch. Hero ThangTypes now do this. 2014-08-25 15:39:47 -07:00
Nick Winter
6eab4ff7a6 Code language nodes that want to skip JavaScript now can. 2014-08-25 14:35:51 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83 Merge branch 'master' into feature/defaults 2014-08-25 13:00:33 -07:00
Nick Winter
e278f3ecb4 Merge branch 'stream' 2014-08-25 09:11:57 -07:00
Nick Winter
ac3f1647e4 Merge pull request #1480 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-25 08:29:50 -07:00
Nick Winter
08f2ee248b No longer constructing SpellViews for non-readable methods. 2014-08-24 22:02:22 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
f8ddc17a9f Merge pull request #1482 from ZephyrSails/master 
Update zh-HANS.coffee
 2014-08-24 20:51:28 -07:00
Nick Winter
1a7e4554f0 Fixed a few minor bugs. 2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Scott Erickson
297b3e3e63 Last schema refactoring. 2014-08-24 11:19:44 -07:00
Imperadeiro98
4da9b470ab Update pt-PT.coffee 2014-08-24 09:03:25 +01:00
Nick Winter
be07f9cfb9 Many improvements to real-time streaming and flags. 2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Scott Erickson
78a4000e34 Refactoring defaults in schemas. 2014-08-23 16:06:41 -07:00
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00
Nick Winter
2e23247521 Fixed #811, a bug where you could pause the world if you clicked on a letterboxed playback scrubber. 2014-08-23 14:55:58 -07:00
Nick Winter
8777a87774 Made a real-time playback button. 2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Nick Winter
f2adb7ec7f Skipping serialization/deserialization of needless Programmable clones. 2014-08-23 11:16:02 -07:00
Scott Erickson
4520c0f2b6 Merge branch 'master' into feature/defaults 2014-08-23 11:08:54 -07:00
Scott Erickson
7d797b9cd9 Removed duplicate goal schemas from the deprecated script goal properties. 2014-08-23 11:08:27 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -07:00
Nick Winter
0431f70954 Improved Surface playback fast-forwarding. 2014-08-23 09:52:05 -07:00
Nick Winter
92b70ae833 Propagated i18n. Fixed #1478. 2014-08-23 08:45:14 -07:00
Nick Winter
4e87dc5e46 Uncommented es units header. 2014-08-23 08:32:22 -07:00
Nick Winter
c1aa147f41 Merge branch 'patch-1' of git://github.com/mugenryuk/codecombat into mugenryuk-patch-1 2014-08-23 08:31:55 -07:00
Nick Winter
d70f86b166 Merged conflicting ru translations. 2014-08-23 08:31:17 -07:00
Nick Winter
9b86ccd6d1 Merge pull request #1461 from bonkboykz/patch-1 
Update ru.coffee
 2014-08-23 08:27:55 -07:00
Nick Winter
9c0869e566 Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun! 2014-08-22 21:35:08 -07:00
Nick Winter
6fee881efd Fixed a few more issues with playback. 2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1 World streaming is getting there! 2014-08-22 14:59:32 -07:00
Scott Erickson
e7dd88498d Made more clear when thang types and level thangs are missing dependencies. 2014-08-22 14:52:35 -07:00
Nick Winter
611ecbf470 Fixed many issues with world streaming. 2014-08-22 12:39:29 -07:00
Scott Erickson
f15135efe1 Fixed a terrible bug. 2014-08-22 11:40:31 -07:00
Scott Erickson
e200889f0b Initial refactoring to use the new version of Treema. 2014-08-22 11:11:05 -07:00
Imperadeiro98
c0c3879bb1 Fixed typo 2014-08-22 13:15:47 +01:00
Nick Winter
9b31e28536 More improvements to world streaming. 2014-08-21 21:23:45 -07:00
Nick Winter
bd380e4a09 World streaming is starting to work! 2014-08-21 17:30:46 -07:00
Nick Winter
d55afa77b7 Began streaming a mighty stream. 2014-08-21 16:27:52 -07:00
Scott Erickson
76b08f35bb Removed duplicate goal schemas from the deprecated script goal properties. 2014-08-21 15:44:51 -07:00
Scott Erickson
9a116d81be Fixed a few forms around the site to properly handle pressing enter. 2014-08-21 12:49:06 -07:00
Xiu Zhiping
3178abab05 Han(s) translation 2014-08-22 00:19:06 +08:00
Nick Winter
7b3fe0a3fb Merge pull request #1470 from ZephyrSails/patch-1 
zephyer's change
 2014-08-21 08:37:46 -07:00
Imperadeiro98
c0a5e1d646 Update pt-PT.coffee 2014-08-21 09:46:40 +01:00
Xiu Zhiping
71058474b3 zephyer's change 
does this part of work changed to HANs & HANt?
 2014-08-21 10:56:38 +08:00
Nick Winter
4889cc4e62 Moved achievement and contribute images from public to assets. 2014-08-20 19:00:39 -07:00
Nick Winter
3755cb9d66 Fixed some bugs with sprite layer ordering. 2014-08-20 18:57:33 -07:00
mugenryuk
c362024536 Update es.coffee 2014-08-20 16:13:40 -05:00
Nick Winter
28fb435bfe Merge pull request #1454 from logicomPL/patch-1 
Update pl.coffee
 2014-08-20 14:12:49 -07:00
Nick Winter
28176c7f72 Misc workarounds. 2014-08-20 13:26:48 -07:00
mugenryuk
ae859ebb19 Update es.coffee 2014-08-20 15:08:48 -05:00
Fedorsturov
45629ad7cb Update ru.coffee 2014-08-20 22:14:20 +04:00
Imperadeiro98
0d4fb9a777 Update pt-PT.coffee 2014-08-20 12:06:54 +01:00
Imperadeiro98
bd84434088 Fixed typo 2014-08-20 11:49:53 +01:00
bonkboykz
528ca31102 Update ru.coffee 2014-08-20 15:42:26 +06:00
Nick Winter
df7f1b2b9b Now have 'free' rotationType, equivalent to previous default of undefined. 2014-08-19 22:33:33 -07:00
Nick Winter
def4d01c8e Starting to let us control the size of the achievements popup, although much more Sass math is needed. 2014-08-19 19:21:36 -07:00
Nick Winter
91db8397a0 Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators. 2014-08-19 08:09:15 -07:00
Nick Winter
2c6fc67db2 Some simulation and ladder fixes. Preparing Criss-Cross tournament. 2014-08-18 21:49:58 -07:00
Scott Erickson
51a831a2e7 Tweaked the goal id field schema to be a bit more stringent. Forces the id to be a slug. 2014-08-18 16:40:18 -07:00
Scott Erickson
9f6bfb854d Fixed the markdown treema node after changes to the ace editor node on treema broke things. 2014-08-18 16:04:43 -07:00
Nick Winter
34c389ed5d Put the Markdown mode in there. (We can't figure out why it wasn't there or whether it ever worked or why it stopped working, but whatever.) 2014-08-18 15:42:32 -07:00
Scott Erickson
f8d4e42c67 Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork. 2014-08-18 15:25:45 -07:00
Scott Erickson
9ee3c6f3fe Added a description to the achievement icon. 2014-08-18 15:25:45 -07:00
Nick Winter
4b88c930a4 Merge pull request #1453 from Darredevil/patch-15 
Added new 'Minimax Tic-Tac-Toe' level
 2014-08-18 14:11:15 -07:00
Nick Winter
2588ec67ff Fix for buildLoop still trying to loop after LevelLoader destruction for some reason. 2014-08-18 14:09:28 -07:00
Nick Winter
071f006acf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-18 14:09:02 -07:00
Nick Winter
8ca9374de0 Zoom-aware, ratio-based edge avoidance (polish for #1448). 2014-08-18 14:08:54 -07:00
Scott Erickson
3f78b5f979 Merge pull request #1452 from rubenvereecken/new_achievement 
New achievement modal fills in level.original query bit
 2014-08-18 13:56:45 -07:00
Scott Erickson
86ba46b64c Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand. 2014-08-18 13:43:17 -07:00
Scott Erickson
69ab177702 Trying to get rid of debug logs in karma. Tried to do it with the conf, didn't seem to work, did a hack instead. 2014-08-18 13:43:17 -07:00
Nick Winter
9697af6b05 Merge pull request #1448 from TheSecretSquad/issue#1213CoordinateDisplayEdgeDetection 
Issue#1213 coordinate display edge detection
 2014-08-18 13:42:37 -07:00
Szymon Gabrek
664853f5e9 Update pl.coffee 2014-08-18 19:47:00 +02:00
Darredevil
1f51eabe48 Added new 'Minimax Tic-Tac-Toe' level 2014-08-18 18:39:16 +03:00
Ruben Vereecken
48a79ad48c New achievement modal fills in level.original query bit 2014-08-18 14:35:57 +02:00
Pete DiSalvo
a011f118e3 Added CoordinateDisplay edge detection. Doesn't account for camera zoom. 2014-08-16 18:51:47 -04:00
Pete DiSalvo
eed68c0a1c Working orientation. Doesn't account for camera zoom 2014-08-16 18:30:41 -04:00
Pete DiSalvo
31e609c0c8 Added edge detection to camera, and worked on orientations 2014-08-16 18:30:41 -04:00
Pete DiSalvo
dc7529344c Working on orientation 2014-08-16 18:30:41 -04:00
Pete DiSalvo
8f6d162542 Beginning work on edge detection 2014-08-16 18:30:41 -04:00
Imperadeiro98
89e8d523c5 Update pt-PT.coffee 2014-08-16 09:35:34 +01:00
Nick Winter
3b083e15f5 Don't require any Component default properties in hero levels, for maximum defaultability. 2014-08-15 12:27:56 -07:00
Nick Winter
5f20e6f05e Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet. 2014-08-15 12:09:56 -07:00
Nick Winter
ba1e7005ca Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108. Actually, same one, but the fix eralier got undone. 2014-08-15 10:50:05 -07:00
Scott Erickson
8233df514e Added an acceptor field to patches. 2014-08-15 10:36:21 -07:00
Nick Winter
f1a9848366 Fixed a couple errors. 2014-08-15 10:27:36 -07:00
Nick Winter
4a133f6998 Added popovers to community social link logos. 2014-08-15 09:43:55 -07:00
Nick Winter
32c74db282 Merge pull request #1442 from dkundel/master 
Fixing most of the issues described in #18
 2014-08-15 09:02:15 -07:00
Nick Winter
419e86b50f Merge pull request #1443 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-15 08:18:23 -07:00
Ruben Vereecken
40818fd7bc GitHub Login implemented 2014-08-15 16:20:45 +02:00
Imperadeiro98
2cbbb1c0dc Update pt-PT.coffee 2014-08-15 11:32:30 +01:00
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
Nick Winter
69c22db434 Moved Hero Placeholder replacement logic to Level's denormalizeThang. 2014-08-14 16:35:03 -07:00
Matt Lott
98bed57751 Merge pull request #1441 from differentmatt/master 
Instrument user code problems
 2014-08-14 16:17:47 -07:00
Matt Lott
9752c4b18a Updating user_code_problem schema types 2014-08-14 15:47:02 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Scott Erickson
827f6ee8b8 Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way. 2014-08-14 14:04:03 -07:00
Matt Lott
9b79e2ca27 Instrument user code problems 2014-08-14 13:32:00 -07: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
Scott Erickson
5a700c14df Stab at fixing the client tests on travis. 2014-08-14 11:00:42 -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
Nick Winter
2f29e4ef89 Merge pull request #1438 from Imperadeiro98/patch-2 
Fixed typo
 2014-08-14 09:58:11 -07:00
Nick Winter
99d29bd206 Merge pull request #1437 from Imperadeiro98/patch-1 
Update diplomat.jade
 2014-08-14 09:57:23 -07:00
Ruben Vereecken
dbff3e04d5 Job profile view works once again 2014-08-14 17:25:41 +02:00
Imperadeiro98
553b124de8 Update uk.coffee 2014-08-14 09:05:56 +01:00
Imperadeiro98
8e4f9189a0 Update locale.coffee 2014-08-14 09:05:47 +01:00
Imperadeiro98
d7270335ca Update diplomat.jade 
Added all the languages and myself.
 2014-08-14 09:04:29 +01: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
4f3af4d64f Fixed #1433. 2014-08-13 14:57:07 -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
Nick Winter
d3fb168636 Merge pull request #1431 from Imperadeiro98/master 
Updated files
 2014-08-12 15:52:53 -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
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
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
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
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
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
Nick Winter
74283bafed Made sure items equip themselves within the SpriteBoss, too. 2014-08-05 21:47:51 -07:00
kisik21
46c6051102 Update ru.coffee 2014-08-06 02:42:30 +04:00
Scott Erickson
eceac0bbc9 Hiding the randomize button overlay until #1409 is handled. 2014-08-05 15:06:11 -07:00
Scott Erickson
d5a8d8dc72 Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108. 2014-08-05 14:56:11 -07:00
Scott Erickson
c5d496c063 Removed a bit for debugging. 2014-08-05 13:40:36 -07:00
Scott Erickson
30998ecbec Fixed components w/out changes sometimes showing up in the save level modal. 2014-08-05 13:21:45 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Dominik Kundel
84c0fbd01f use shortName as fallback for some entries if no snippet 2014-08-05 11:19:15 +02:00
Nick Winter
3bbdee583d Better problem alert layout for alerts that include hints. 2014-08-04 20:16:12 -07:00
Nick Winter
a0b75ddb8e Put Sky Span up for testing. 2014-08-04 19:46:00 -07:00
Dominik Kundel
f09b3c4792 Merge remote-tracking branch 'upstream/master' 2014-08-04 23:03:28 +02:00
Dominik Kundel
50517431db added support for inserting snippets by shift+click 2014-08-04 23:02:54 +02:00
Dominik Kundel
86eea93e2f merged changes 2014-08-04 22:37:15 +02:00
Ruben Vereecken
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Nick Winter
85011d1ed4 No need to explicitly track subviews for determining what the current view is. 2014-08-04 13:21:42 -07:00
Darredevil
a11649b12b Typo fix 2014-08-04 23:15:01 +03:00
Nick Winter
0bcaf70d56 Merge pull request #1406 from rubenvereecken/forms_fix 
Fixed missing errors bug
 2014-08-04 12:49:22 -07:00
Nick Winter
8a86e86012 Merge pull request #1390 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-04 12:45:13 -07:00
Ruben Vereecken
c165d46e17 Fixed missing errors bug 2014-08-04 20:02:26 +02:00
Ruben Vereecken
fb3848359e Merge branch 'master' into achievements 2014-08-04 17:55:44 +02:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Jayant Jain
549f2657ea Styles add button for addComponentsTreema 2014-08-04 07:53:24 +05:30
Jayant Jain
06875ce2b8 Resolves bug with mouseenter and mouseleave callbacks for add components treema 2014-08-04 07:21:02 +05:30
Jayant Jain
9e1513eb56 Add button on hover for addComponentsTreema 2014-08-04 07:05:22 +05:30
Jayant Jain
98f43b679f Adds component upon double click, newly added components are automatically selected 2014-08-04 06:04:35 +05:30
Jayant Jain
03d696c3df Components can now be added to thangs by dragging and dropping 2014-08-04 05:51:12 +05:30
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Imperadeiro98
0663dbc414 Update pt-PT.coffee 2014-08-01 10:39:30 +01:00
Imperadeiro98
4b932593be Update pt-PT.coffee 2014-07-31 18:39:13 +01:00
Imperadeiro98
96fb84362a Update pt-PT.coffee 2014-07-31 18:21:23 +01:00
Imperadeiro98
c7212226ae Update pt-PT.coffee 2014-07-31 18:01:09 +01:00
Imperadeiro98
68e3110e74 Update pt-PT.coffee 2014-07-31 17:38:14 +01:00
Michael Schmatz
ca7b8ca10a Merge pull request #1401 from rubenvereecken/test_fix 
Repaired TestView by only loading js files once
 2014-07-31 08:14:59 -07:00
Michael Schmatz
e7de8e3282 Merge pull request #1396 from rubenvereecken/refactoring 
[Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)
 2014-07-31 08:12:18 -07:00
Michael Schmatz
2ebc7f5aa6 Merge pull request #1398 from jayant1992/master 
Updates for script tab in level editor
 2014-07-31 08:12:04 -07:00
Michael Schmatz
52b8dd8db3 Merge pull request #1400 from rubenvereecken/moment_update 
Added Moment i18n support
 2014-07-31 08:11:01 -07:00
Michael Schmatz
0b9df5150d Merge pull request #1393 from Melondonut/patch-3 
Korean translation - patch3
 2014-07-31 08:10:22 -07:00
Ruben Vereecken
0e5accb707 Repaired TestView by only loading js files once 2014-07-31 13:15:57 +02:00
Imperadeiro98
3d71d155b6 Update pt-PT.coffee 2014-07-31 10:50:01 +01:00
Ruben Vereecken
41729f9700 Added Moment i18n support 2014-07-30 23:19:21 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Imperadeiro98
1f8ce2eaf2 Update pt-PT.coffee 2014-07-30 20:47:03 +01:00
Jayant Jain
2690ef9a59 Reorders script ids upon deletion 2014-07-30 01:05:04 +05:30
Jayant Jain
f0940308ea Newly inserted scripts are automatically assigned id 2014-07-30 00:52:59 +05:30
Jayant Jain
632d9a666e Shows all autocomplete values on click instead of having to type initially 2014-07-30 00:52:59 +05:30
Jayant Jain
0555c2ec14 Initial autocomplete for event checks in scripts tab 2014-07-30 00:52:59 +05:30
Ruben Vereecken
d4043ac3db Implemented singleplayer and multiplayer games played on profile 2014-07-29 20:11:45 +02:00
Ruben Vereecken
39c01c0bcb Finished refactoring of LevelGuideModal (renamed from docs_modal) 2014-07-29 19:50:50 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
026e6e6378 Added some support to fetch level sessions for the user profile page 2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b Did a bunch related to achievements and user profile page 2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Ruben Vereecken
15c1939657 Started on achievement setup script 2014-07-28 14:17:25 +02:00
Melondonut
9b830fff26 Update ko.coffee 2014-07-28 18:58:48 +09:00
Melondonut
9d93d871e1 Update ko.coffee 2014-07-28 13:35:05 +09:00
Melondonut
5307515553 Update ko.coffee 2014-07-28 13:07:18 +09:00
Melondonut
53dd446db1 Update ko.coffee 2014-07-28 12:44:20 +09:00
Imperadeiro98
3ffeda8bbc Update pt-PT.coffee 2014-07-27 19:31:56 +01:00
Michael Schmatz
d7cb76d10c Merge branch 'pr/1387' 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Jayant Jain
df554360fe Updates glyphicons for undo-redo, adds placeholder text for add thangs search 2014-07-26 01:55:15 +05:30
Darredevil
3b704330d6 Documentation tab for Level Editor 2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef Merge branch 'codecombat-master' 
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 22:48:13 +03:00
Darredevil
e3a0ea400c Docs tab v2 2014-07-25 22:33:55 +03:00
Jayant Jain
3e9dbe0d0b Fixes bug in undo/redo on SystemsTabView 2014-07-25 18:07:09 +05:30
Jayant Jain
d3962c19bd Ensures randomised thang clusters do not overlap each other 2014-07-25 18:07:01 +05:30