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

3380 commits

Author SHA1 Message Date
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