George Litos
d83e06ee46
updated greek translation
2014-09-26 01:05:28 +03:00
Nick Winter
b7d2bcd222
Decreased severity of camera jerkiness during real-time playback.
2014-09-25 15:01:06 -07:00
Scott Erickson
8aeb6555ec
Added MovieClip pooling, improving WebGL performance.
2014-09-25 14:48:17 -07:00
George Saines
8183d671b8
simplifying the homepage
2014-09-25 14:38:02 -07:00
Scott Erickson
14f3fb6486
Fixed one last instance of cocoSprite using its resolutionFactor value.
2014-09-25 14:03:44 -07:00
Nick Winter
61aa2d8b6f
Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.
2014-09-25 13:29:20 -07:00
Scott Erickson
4b87607599
Fixed animations where the frame stays the same for periods of time.
2014-09-25 13:26:05 -07:00
Scott Erickson
d77b87ed22
Fixed raster thang types, and level destruction.
2014-09-25 13:12:47 -07:00
Scott Erickson
10314b8bfa
Fixed sprites often disappearing when idle.
2014-09-25 12:43:51 -07:00
Scott Erickson
d4b1849eaf
Fixed one other little thing.
2014-09-25 12:22:33 -07:00
Nick Winter
2ed6b737c2
Added WorldMapView ambient sounds.
2014-09-25 11:37:29 -07:00
Nick Winter
68bb1dc135
Sped up "real-time" playback for the maze levels.
2014-09-25 11:17:04 -07:00
Scott Erickson
8fe2ed4438
Resolved conflicts.
2014-09-25 10:52:36 -07:00
Scott Erickson
06b106f42b
Merged from master.
2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef
Migrating surface to webgl. It sorta works!
2014-09-25 10:47:53 -07:00
Nick Winter
9fc7fca528
Hooked up real-time playback music.
2014-09-25 10:30:43 -07:00
Nick Winter
9ea24f4c74
Added a workaround for Surface resize failure on realtime playback end that Maksym had seen.
2014-09-25 09:48:14 -07:00
David Beckley
7596b887fd
Fix #1602
2014-09-25 09:10:32 -07:00
Nick Winter
867279b6b8
Merge pull request #1600 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-09-25 08:47:44 -07:00
Nick Winter
8bf619359c
Uncommented some section headers from #1598 .
2014-09-25 08:43:23 -07:00
enricpc
38b84af208
Update ca.coffee
2014-09-25 16:16:32 +02:00
enricpc
56aecbab88
Update ca.coffee
2014-09-25 16:15:28 +02:00
Imperadeiro98
d23e752755
Update pt-PT.coffee
2014-09-25 12:46:06 +01:00
enricpc
5dab9f8226
Update ca.coffee
2014-09-25 09:59:55 +02:00
Nick Winter
c0c436189f
Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks.
2014-09-25 00:02:53 -07:00
Nick Winter
cce36333dd
Set letterbox during real-time playback.
2014-09-24 22:59:13 -07:00
Nick Winter
cde2acaea1
Disabled clicking spell palette entries for hero levels.
2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10
Hid flags view during real-time playback for non-flag-using levels.
2014-09-24 22:23:14 -07:00
Nick Winter
5e0b42068a
Scrubber auto-pauses when dragging from ended position.
2014-09-24 22:12:00 -07:00
Nick Winter
2aa274cb2d
Fixed bugs with Surface fast-forwarding too fast on short levels and rewinding non-instantaneously when rerunning.
2014-09-24 22:07:55 -07:00
Nick Winter
b2592aad8c
Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle.
2014-09-24 21:01:58 -07:00
Nick Winter
b8d59cb179
Fixed a bug with playback never quite getting to the end.
2014-09-24 20:25:30 -07:00
Nick Winter
6441a753d5
Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better.
2014-09-24 20:15:17 -07:00
Nick Winter
e48fa5f0b7
Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits.
2014-09-24 19:14:22 -07:00
Scott Erickson
358b36c1bf
Set up custom graphics to be copied from old spritesheets when possible as well.
2014-09-24 18:47:10 -07:00
Scott Erickson
fb30f07f2e
Re-enabled effect marks.
2014-09-24 18:42:04 -07:00
Scott Erickson
91f33e49dc
Re-enabled shadows.
2014-09-24 17:52:44 -07:00
Nick Winter
da83fee58f
Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values.
2014-09-24 16:58:52 -07:00
Scott Erickson
7f90ed18cc
Bunch more work on scaling for everything and hit testing for segmented sprites. Also got health bars working again.
2014-09-24 16:53:38 -07:00
Nick Winter
73d6261b5d
Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n.
2014-09-24 16:29:28 -07:00
Nick Winter
83fc88e3b6
Propagated i18n.
2014-09-24 15:49:07 -07:00
Nick Winter
6b6d1d3e74
Changed 'Available Spells' to 'Your Skills' in hero levels.
2014-09-24 15:48:18 -07:00
Matt Lott
db525a8073
Fix IE restricted property check
2014-09-24 15:46:53 -07:00
Nick Winter
53ddf0159d
Preloaded previous/next heroes in ChooseHeroView.
2014-09-24 15:39:51 -07:00
Nick Winter
a786b1e096
Changed world map to click on iPad, hover otherwise.
2014-09-24 15:21:39 -07:00
Nick Winter
ada65cc290
Lowered master volume temporarily until per-sound instance volumes are fixed.
2014-09-24 15:06:22 -07:00
Nick Winter
dbb3efb6e6
Merged es-419 commits from TitoGa and infoholico.
2014-09-24 14:22:27 -07:00
Nick Winter
a1ed2d4323
Fixed a few typos in es-419.coffee.
2014-09-24 14:17:25 -07:00
infoholico
005d83929f
Update es-419.coffee
...
Hello, that's my first contribution, but I have to clear something:
Javascript_blurb: "El lenguaje de la web. Usado en sitios y aplicaciones web, juegos en HTML5, y servidores."
python_blurb: "Simple pero poderoso, Python es un grandioso lenguaje de programación para uso general."
coffeescript_blurb: "Mejor JavaScript."
clojure_blurb: "Un Lisp moderno."
lua_blurb: "Para Juegos."
io_blurb: "Simple pero oscuro."
No son exactamente literales pero traté de que entraran en el espacio asignado.
These are not literal translations but I tried to made them fit into the given space.
What language should I use to communicate with you?
Thanks.
2014-09-24 16:35:27 -04:30
Matt Lott
b3a841e814
IE10 compatibility: adding console.debug
...
Support for console.debug was added in IE11
http://msdn.microsoft.com/en-us/library/ie/dn265066(v=vs.85).aspx
2014-09-24 13:11:55 -07:00
Juan Santiago Lucaras Cammisuli
e8d36547c9
Update es-419.coffee
2014-09-24 16:24:33 -03:00
Matt Lott
73e49f9972
IE11 compatibility fixes
...
Removing social share buttons from base if IE, except Facebook.
Unrolling restricted property setting loop (weird).
Updating isIE check to support IE11.
2014-09-24 12:17:13 -07:00
Scott Erickson
6669a01c14
Got rid of some cache functions. Set up area of effect animations in the new spriteSheet system.
2014-09-24 12:08:55 -07:00
Nick Winter
f4cee11ebe
ThangsTabView letting you position spike walls on top of walls.
2014-09-24 12:02:45 -07:00
Nick Winter
2d7341224e
Uncommented some section headers for ca.coffee.
2014-09-24 11:31:09 -07:00
Nick Winter
c420119212
Merge pull request #1593 from enricpc/patch-1
...
Update ca.coffee
2014-09-24 11:29:37 -07:00
Imperadeiro98
aa6db88718
Update pt-PT.coffee
2014-09-24 19:15:52 +01:00
Imperadeiro98
ed30b7b569
Update pt-PT.coffee
2014-09-24 19:14:09 +01:00
Scott Erickson
c49f894ef2
Refactored SPRITE_PLACEHOLDER_RADIUS to SPRITE_PLACEHOLDER_WIDTH.
2014-09-24 10:55:33 -07:00
james616616
85ad253b80
Update zh-HANT.coffee
2014-09-25 01:35:17 +08:00
Nick Winter
94838af17f
Fixed scroll bars messing up inventory view.
2014-09-24 09:38:45 -07:00
Scott Erickson
2cbe498f9a
Fixed scaling for singular sprites for all cases.
2014-09-24 09:37:49 -07:00
enricpc
3d07dfb14c
Update ca.coffee
2014-09-24 17:39:38 +02:00
Driphter
db61249ac7
Added support for 'codeLanguage' when setting the 'favoriteLanguage'
2014-09-24 02:57:54 -04:00
Nick Winter
8d6b23274b
Zoom in on hero during real-time playback.
2014-09-23 22:10:18 -07:00
Nick Winter
225fd0ca18
Moved world map level info to click from hover.
2014-09-23 19:12:05 -07:00
Nick Winter
5397c51819
Fixed world-threatening typo.
2014-09-23 18:59:08 -07:00
Nick Winter
019f634d9f
Respecting coordinates setting.
2014-09-23 18:39:52 -07:00
Nick Winter
e493855578
Hiding spell tab hover docs for plan().
2014-09-23 18:32:07 -07:00
Nick Winter
7b15ecfab2
Improved comment visibility.
2014-09-23 18:29:04 -07:00
Nick Winter
af6e770c30
Changed name of Stop button to Skip in real-time playback.
2014-09-23 18:23:28 -07:00
Nick Winter
71810569dd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-23 18:21:32 -07:00
Nick Winter
c1023b137f
Better pointing out of submit button when victory is ready.
2014-09-23 18:21:27 -07:00
Nick Winter
a6473c2cf3
Merge pull request #1588 from ThatOtherPerson/add-quotes
...
Add some more quotes for #710
2014-09-23 17:54:56 -07:00
David Beckley
f27c13e6eb
Propagate i18n
2014-09-23 17:48:02 -07:00
David Beckley
8d7ed040af
Add more quotes for #710
2014-09-23 17:46:02 -07:00
Nick Winter
a57cc0126e
A few more tweaks for #1584 . Hero victory now always goes to world map.
2014-09-23 17:13:41 -07:00
Nick Winter
1a46d4345d
Merge pull request #1584 from ThatOtherPerson/log-user-ips
...
Log last-used IP in User object
2014-09-23 17:10:00 -07:00
Imperadeiro98
ba4d53e92b
Update pt-PT.coffee
2014-09-23 21:37:08 +01:00
Scott Erickson
16cb596a12
Set up scaling and mouse events for segmented sprites with container actions.
2014-09-23 12:08:50 -07:00
Nick Winter
e109cbbbdc
Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels.
2014-09-23 11:39:56 -07:00
Scott Erickson
5de5d5658e
Working on SegmentedSprite mouse events, hit tests and scaling.
2014-09-23 11:37:05 -07:00
Nick Winter
33080e5a65
Fixed #1586 .
2014-09-23 10:56:52 -07:00
Nick Winter
00e2fc99a2
Fixed some issues with the sample code.
2014-09-23 08:58:23 -07:00
Nick Winter
6a8d3082f3
Propagated i18n. Added a fallback for cast button for now until the new run button can be translated.
2014-09-23 08:08:29 -07:00
Daniel James Smith
2bdcdbe2a8
Updated German translations
2014-09-23 15:37:39 +02:00
Nick Winter
f3511a5dde
Fixed another bug with loading heroes between levels.
2014-09-22 23:01:19 -07:00
Nick Winter
b0ee2224ae
Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping.
2014-09-22 22:26:09 -07:00
Nick Winter
8640369b26
Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor.
2014-09-22 21:50:48 -07:00
Nick Winter
149848c971
Fixed temporary item restrictions.
2014-09-22 20:44:45 -07:00
Nick Winter
1b4e75e7e8
Fix for earned achievement default null worths. Misc other fixes.
2014-09-22 20:15:51 -07:00
Nick Winter
786820e056
Fixed drag and drop for hero inventory.
2014-09-22 16:12:55 -07:00
Nick Winter
ec548fa33a
AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison.
2014-09-22 16:09:27 -07:00
Nick Winter
a79976e6a2
Bigass 'Stop' button in lower right during real-time playback.
2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170
Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion.
2014-09-22 14:05:13 -07:00
David Beckley
2acebb54c6
Fix #1005
2014-09-21 23:02:06 -07:00
Nick Winter
42b52f5593
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
2014-09-21 22:10:52 -07:00
Nick Winter
6cb8a2a019
Hero always centered in camera in new hero levels when playing and not panning to drag.
2014-09-21 20:49:45 -07:00
Nick Winter
600e985259
Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected.
2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af
Showing goals on level loading view.
2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e
Press Start to begin playing levels. Fixed #1574 .
2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce
Fixed a bug with hero placeholder loading. Improved game menu modal close button usability.
2014-09-21 13:26:56 -07:00
Nick Winter
389f6fb9c1
Pre-assigning and limiting owned items based on level for now.
2014-09-21 11:24:37 -07:00
Nick Winter
e1790d5159
Restored item comparison in InventoryView, now o'ertop the hero.
2014-09-21 09:53:58 -07:00
Nick Winter
4cdff02a32
Implemented most of new inventory view.
2014-09-20 23:11:51 -07:00
David Beckley
bee779c3c8
Propagate locale
2014-09-20 16:17:36 -07:00
Nick Winter
9f6e1e081c
Using language choice from ChooseHeroView.
2014-09-20 16:04:13 -07:00
Nick Winter
ae14bd1ced
Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564 .
2014-09-20 15:18:21 -07:00
Nick Winter
ae7a2dfe6a
Testing out the new comment preservation in locale files.
2014-09-20 09:17:10 -07:00
Imperadeiro98
7a4b1c01ed
Update pt-PT.coffee
2014-09-20 08:53:18 +01:00
Nick Winter
0a5e1a4b03
Propagated i18n.
2014-09-19 22:17:06 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93
Fixed a few misc bugs I noticed with the job profiles.
2014-09-19 22:16:05 -07:00
Scott Erickson
39b6b9ef84
Couple remaining refactoring tidbits for the new LayerAdapter.
2014-09-19 15:46:37 -07:00
Scott Erickson
3b7ce76d7d
Refactored WebGLLayer and SpriteContainerLayer/ContainerLayer into a single LayerAdapter class that has a Container or SpriteContainer.
2014-09-19 15:46:02 -07:00
Scott Erickson
cc7c65115c
Renamed WebGLLayer to LayerAdapter.
2014-09-19 14:59:29 -07:00
Scott Erickson
fbbfb6c0cc
Refactored WebGLSprite to SegmentedSprite and SingularSprite, and refactored renderStrategy (container/spriteSheet) to spriteType (segmented/singular).
2014-09-19 14:56:40 -07:00
Scott Erickson
3c9b40e8f4
Set up placeholders for when WebGLSprites don't have their raw data built yet. Not finished yet because of scaling, but will come back to it... Got some refactoring to do first.
2014-09-19 13:50:14 -07:00
George Litos
43d027df45
Update el.coffee
...
typographic and grammatical errors fix
2014-09-19 23:37:16 +03:00
keenanjohnson
bb8f5c41ba
#53 Adding more names
2014-09-19 13:25:48 -05:00
Nick Winter
ec21637adf
Showing the new hero levels instead of the old campaign levels on the /play-hero map.
2014-09-19 11:03:38 -07:00
Nick Winter
6a5f8b810b
Fixed an issue with infinite loops polling workers who weren't working.
2014-09-19 08:11:08 -07:00
Nick Winter
121ff0a4af
Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now.
2014-09-18 18:25:33 -07:00
Nick Winter
791c23c7e7
Fixed #1573 .
2014-09-18 16:39:50 -07:00
Nick Winter
8042f27ba7
Added the rest of the custom TreemaNodes to the SystemsTabView as well.
2014-09-18 15:26:06 -07:00
Nick Winter
8e17a54dc3
Fixed not being able to add properties in the Systems tab Treemas.
2014-09-18 15:13:17 -07:00
Scott Erickson
a99cdfb957
WebGLLayer now recycles previous sprite sheets, speeding up rendering additional thang types or animations.
2014-09-18 14:36:05 -07:00
Scott Erickson
cc76458942
Normalized the container renderStrategy resolution so that both renderStrategies are the same.
2014-09-18 13:18:44 -07:00
Scott Erickson
c7279e68a8
The whole WebGL system now dynamically renders needed frames when actions it doesn't support get activated.
2014-09-18 12:19:52 -07:00
Scott Erickson
0404b94e5e
WebGLSprites of all types no longer display anything at all if their required data hasn't been rendered.
2014-09-18 11:56:49 -07:00
Scott Erickson
b1784a1207
Had apparently switched the SpriteBoss tests to use a regular Stage instead of a SpriteStage. Switched it back, and fixed a subsequent bug with the Layer responding to Camera events (apparently SpriteStage does not take regX/Y or scaleX/Y into account).
2014-09-18 11:12:18 -07:00
Scott Erickson
0b948d4a1e
Got the SpriteBoss to handle removing sprites again.
2014-09-18 10:03:13 -07:00
Matt Lott
3209e4f838
Add loop statement to JavaScript and Python
2014-09-18 09:47:29 -07:00
Scott Erickson
63758acd2e
Fixed some tests when run on karma.
2014-09-18 09:46:02 -07:00
Scott Erickson
f77f229b09
Fixed rotation not being updated after a new SpriteSheet is built.
2014-09-18 09:03:33 -07:00
Nick Winter
5ddbbe7707
Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting.
2014-09-18 08:12:46 -07:00
Nick Winter
689a4241d4
Final Criss-Cross tournament results.
2014-09-17 22:37:34 -07:00
Nick Winter
95e37fa3b2
Starting new front view (at /front for now) and play view (at /play-hero for now).
2014-09-17 18:56:08 -07:00
Scott Erickson
5fe9a02c06
WebGLLayer now re-renders itself at a lower resolution if it's too big.
2014-09-17 17:08:24 -07:00
Scott Erickson
61a25c5693
Merged conflicts.
2014-09-17 16:53:12 -07:00
Scott Erickson
5af1741333
Merged conflicts.
2014-09-17 16:53:08 -07:00
Scott Erickson
dd81d1d5bc
Container renderings are now dependent on resolution.
2014-09-17 16:49:31 -07:00
Scott Erickson
dbfbddeb5d
Added a test to make sure the WebGLLayer ended up with the right number of children after multiple renderings. Fixed something that was breaking WebGLLayer and WebGLSprite tests.
2014-09-17 16:06:23 -07:00
Scott Erickson
7387248ffd
Initial integration of SpriteBoss with the WebGLLayer and all else.
2014-09-17 15:47:25 -07:00
Nick Winter
d96d0d65f3
Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits.
2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9
Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs.
2014-09-16 20:19:52 -07:00
Nick Winter
687da38667
Made some performance optimizations that all relate to messing with walls in the level editor.
2014-09-16 17:31:00 -07:00
Scott Erickson
1ef3d150a8
Integrated WebGLLayer and WebGLSprite with CocoSprite.
...
Disabled some features in CocoSprite that'll have to be added back later.
Moved more logic from CocoSprite, like determining registration points for a given animation, to WebGLSprite.
WebGLSprite can now display either rendering containers or SpriteSheets.
2014-09-16 15:36:59 -07:00
Nick Winter
c3573b2fbd
Adding more error handling for George's inventory saving problems.
2014-09-16 15:22:49 -07:00
TitoGa
aeea0a54af
Update es-419.coffee
...
Happy to help. The only liberty that i took was to change the provided example name on 266 from Nick Winters to Max Powers, as a reference to The Simpsons, episode S10E13. (=^B)
2014-09-16 16:27:44 -03:00
Nick Winter
a700b7844f
Added a bit of error handling for weird equipment error we were seeing.
2014-09-16 11:13:03 -07:00
Nick Winter
54f56162e9
Place Electrowalls over other walls.
2014-09-16 10:30:27 -07:00
Nick Winter
0a29a374e1
Changed the way numbering works on collect goals.
2014-09-15 17:01:34 -07:00
Nick Winter
925588dfc2
Extended team-based goal completion to collection and leaving sides goal types.
2014-09-15 16:49:08 -07:00
Nick Winter
89aa930803
Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio.
2014-09-15 15:38:07 -07:00
Nick Winter
9acb3670c1
Fixed error when deleting in level editor with nothing selected.
2014-09-15 15:24:11 -07:00
Nick Winter
6176a8f6cb
Wall dragging no longer conflicts with wall clicking.
2014-09-15 15:23:09 -07:00
Scott Erickson
9ba11e2354
Got the WebGLSprite to work with nested MovieClips.
2014-09-15 15:08:02 -07:00
Nick Winter
8acaea3d6a
Drag walls to place them continuously.
2014-09-15 14:54:21 -07:00
Nick Winter
5f1e9e7e4b
Made Plans attach second-to-last always.
2014-09-15 14:06:26 -07:00
Scott Erickson
8e401d6853
Merge branch 'master' into feature/webgl
2014-09-15 13:53:58 -07:00
Scott Erickson
a633f6f82f
Built most of the WebGLSprite.
2014-09-15 13:53:20 -07:00
Nick Winter
589268dc4f
Fixes for initializing Hero Placeholder Components.
2014-09-15 13:15:18 -07:00
Nick Winter
6ac56030e8
Fixed bug with systems not being addable.
2014-09-15 12:45:10 -07:00
Nick Winter
ee3e1fa58c
Merge pull request #1561 from Titounkle/patch-5
...
Update es-ES.coffee
2014-09-15 12:40:55 -07:00
Titounkle
c6384eaf10
Update es-ES.coffee
...
Ive got a few questions on the word Thang, and employer... I dont know quite well how to translate them to fix good...
Hope we finish it soon :)
2014-09-15 21:32:26 +02:00
Imperadeiro98
562a033f46
Update pt-PT.coffee
2014-09-15 20:13:42 +01:00
Nick Winter
d2491dba4f
Disabled autocast even more.
2014-09-15 11:56:29 -07:00
Nick Winter
87cde17650
Propagated i18n.
2014-09-15 10:24:13 -07:00
Nick Winter
1f8f5ce8f3
Merge pull request #1554 from djsmith85/i18n
...
Added i18n-tags in admin.jade and community.jade and updated the locale ...
2014-09-15 10:22:29 -07:00
Daniel James Smith
a0fb51ae94
Updated the German translations
2014-09-15 18:57:09 +02:00
Daniel James Smith
3dd888469e
Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly
2014-09-15 18:36:45 +02:00
Nick Winter
1d75a9ead3
Uncommented some pt-BR section headers.
2014-09-14 17:13:03 -07:00
Nick Winter
612eccd209
Merge pull request #1551 from gutierri/master
...
Translation and corrections to existing translations
2014-09-14 17:12:01 -07:00
AmyLaPazza
b9be6215ea
Added translations
...
Translated Lines 193,196 and 267.
2014-09-14 19:09:22 +02:00
Gutierri Barboza
b00b48450d
translation section account
2014-09-14 00:48:36 -03:00
Gutierri Barboza
4d7c0f24eb
standard translation for the same word
2014-09-14 00:44:48 -03:00
Gutierri Barboza
127fce2100
translation pt-BR section user
2014-09-14 00:42:18 -03:00
Gutierri Barboza
f4d1ed8a60
partial translation archievements
2014-09-13 23:08:43 -03:00
Gutierri Barboza
e012ea5bbc
wrong word
2014-09-13 22:55:50 -03:00
Gutierri Barboza
1e1f384cd3
translate pt-BR
2014-09-13 22:53:25 -03:00
George Saines
4053da3693
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-12 17:46:49 -07:00
George Saines
32ac3c1f95
updating contributor pages
2014-09-12 17:46:44 -07:00
Scott Erickson
c96f5d7bcf
Merge branch 'master' into feature/webgl
2014-09-12 16:33:39 -07:00
Scott Erickson
08bdcb2cb6
Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it.
2014-09-12 16:33:01 -07:00
Nick Winter
7a76e9ac77
Fixed a couple formatting issues in es-ES.
2014-09-12 10:22:32 -07:00
Titounkle
9d731ae80e
Update es-ES.coffee
2014-09-12 19:06:49 +02:00
Gutierri Barboza
7ac09d09f3
translation pt-BR
2014-09-12 13:31:50 -03:00
Nick Winter
d3245948e2
Sorting addable Thangs in a sensible order.
2014-09-11 13:34:15 -07:00
Michael Schmatz
c08c279f8b
Removed net neutrality banner
2014-09-11 16:13:06 -04:00
Nick Winter
e9968b648f
Fixed bugs with click coordinates messing up mouse-down targeting.
2014-09-11 13:05:31 -07:00
Nick Winter
d5542ffbbc
Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open.
2014-09-11 11:24:06 -07:00
George Saines
11a734b001
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-11 11:08:29 -07:00
George Saines
040b901e41
removed merge junk
2014-09-11 11:08:25 -07:00
Nick Winter
9eb0dbc625
Fixed bug with creating new levels.
2014-09-11 10:50:23 -07:00
George Saines
b81288cf52
changing volume for some SFX
2014-09-11 10:16:56 -07:00
George Saines
f5a4442e8a
trying to change SFX volume
2014-09-11 09:59:50 -07:00
Nick Winter
8c37fabe79
Merge pull request #1537 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-09-11 08:45:36 -07:00
Nick Winter
35e1931fc3
Merge pull request #1534 from Titounkle/patch-3
...
Update es-ES.coffee
2014-09-11 08:43:59 -07:00
Nick Winter
ba554f3ff0
Fixed some indentation from #1532 .
2014-09-11 08:43:36 -07:00
Nick Winter
0990a45802
Merge pull request #1532 from lukigno95/patch-1
...
Update it.coffee
2014-09-11 08:41:19 -07:00
Nick Winter
68808d0e07
Some fixes for how audio is triggered.
2014-09-11 08:38:30 -07:00
Imperadeiro98
74afea5efa
Update pt-PT.coffee
2014-09-11 14:38:11 +01:00
Nick Winter
f53f6bf0a3
Misc changes, wishing I could get sounds to work at lower volumes.
2014-09-10 19:55:00 -07:00
Imperadeiro98
10132c6fd1
Update pt-PT.coffee
2014-09-10 11:02:01 +01:00
Nick Winter
0b1f4ebada
Fixed two extra spaces in DE localizations.
2014-09-09 18:58:04 -07:00
djsmith85
19d3a6cc9f
Updated German translations (de-DE & de-AT)
...
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
2014-09-10 02:57:47 +02:00
Titounkle
d9ee5c248d
Update es-ES.coffee
...
Number 219 im not quite sure...I'll think about it.
2014-09-09 18:43:28 +02:00
Michael Schmatz
b35a0161e8
Inserted Battle For The Net banner
2014-09-09 12:34:30 -04:00
Nick Winter
2396f9c26d
Updates to go along with latest iPad app spell palette loading.
2014-09-08 21:40:52 -07:00
lukigno95
fa7f827fcb
Update it.coffee
2014-09-09 01:10:24 +02:00
Nick Winter
dd2cdf3ef9
Fixed bugs with forking ThangTypes.
2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74
Workaround for missing document.location inside child window in Windows Chrome.
2014-09-08 14:31:52 -07:00
Nick Winter
8dad2bf12d
Fixed some typo.
2014-09-08 14:26:17 -07:00
Scott Erickson
6c12384fe9
Reenabling on surface mouse moved.
2014-09-08 14:13:19 -07:00
Nick Winter
eb4293fee5
Temp: ThangTypes don't require kind.
2014-09-08 13:02:39 -07:00
Nick Winter
6ed89a2d79
Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView.
2014-09-08 12:29:49 -07:00
Nick Winter
ffdf48dadb
Fixed typo in spell palette event.
2014-09-08 09:01:34 -07:00
Nick Winter
1bd1ca0ced
Fixed #1530 . Propagated i18n. Starting to add some more events for the iOS app.
2014-09-07 20:54:25 -07:00
Nick Winter
40c37a8be1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-07 20:48:36 -07:00
Nick Winter
6ac8dc1d2d
Merge pull request #1531 from gutierri/master
...
more translations of phrases
2014-09-07 20:47:57 -07:00
Nick Winter
4908cb4d0a
Merge pull request #1529 from MajkPascal/patch-2
...
Polish translation
2014-09-07 20:47:38 -07:00
Nick Winter
25334d59a0
Merge pull request #1527 from Titounkle/patch-2
...
Update es-ES.coffee
2014-09-07 20:46:51 -07:00
Nick Winter
68812eef0a
Fixed a couple types in new ar.coffee.
2014-09-07 20:41:47 -07:00
Gutierri Barboza
9f6870130f
more translations of phrases
2014-09-07 23:18:35 -03:00
MajkPascal
f20b963a2b
Polish translation
2014-09-07 21:31:46 +02:00
Titounkle
ff3b718bf2
Update es-ES.coffee
2014-09-07 19:59:58 +02:00
CodeIter
35382ff57c
update ar
...
another trans.
2014-09-07 13:20:15 +01:00
CodeIter
fb7509612f
ترجمة- translate
...
it 's too hard to complete it now.
however google translate is very useful (most translation from google are good but it always need a human verification.that 's because it 's hard to complete it)
2014-09-07 11:54:53 +01:00
Nick Winter
19720c38be
Propagated i18.
2014-09-06 19:57:03 -07:00
Nick Winter
75538a158e
Merge pull request #1523 from Imperadeiro98/patch-3
...
Level editor fixes
2014-09-06 19:56:22 -07:00
Nick Winter
18114af2a3
Merge pull request #1521 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-09-06 19:56:01 -07:00
Nick Winter
067b32dfbf
Merge pull request #1520 from Imperadeiro98/patch-1
...
Fixed a typo
2014-09-06 19:55:26 -07:00
Nick Winter
df131ca90a
Merge pull request #1519 from keenanjohnson/master
...
Added Potion Master names for #53
2014-09-06 19:55:02 -07:00
Nick Winter
78a0568594
Merge pull request #1518 from Titounkle/patch-1
...
Update es-ES.coffee
2014-09-06 19:53:37 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Imperadeiro98
c6f6282ae1
Update edit.jade
...
Fixed some errors
2014-09-06 17:32:01 +01:00
Imperadeiro98
253b0dc35c
Update en.coffee
...
Added "Documentation"
2014-09-06 17:31:24 +01:00
Imperadeiro98
8ada8c3a88
Update pt-PT.coffee
2014-09-06 10:41:01 +01:00
Imperadeiro98
66451b6ef0
Fixed a typo
2014-09-06 10:18:16 +01:00
keenanjohnson
d79fc4c62f
Added Potion Master names for #53
2014-09-05 20:18:05 -05:00
Titounkle
0246bc8070
Update es-ES.coffee
...
He hecho algunos cambios, pero no se muy bien como trabajais esto ya que es la primera vez que me involucro en github, basta con quitar el # de delante de las cosas que vayamos traduciendo o hay que marcarlas de alguna otra manera??
Un saludo
2014-09-05 22:51:39 +02:00
Nick Winter
8de75024fc
Implemented placeholders for a bunch of sound triggers.
2014-09-05 13:04:05 -07:00
kotvaska
0383b2ce2b
Update ru.coffee
2014-09-05 12:49:23 -07:00
Nick Winter
ddddc44651
Fixed en-GB.coffee.
2014-09-05 12:49:23 -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
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
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
Scott Erickson
c70ffbeef5
Fixed onBackground for surface:stage-mouse-down events.
2014-09-02 16:42:03 -07:00
Nick Winter
7f9ac5e573
Fixed a few bugs where default hero level type wasn't getting pulled.
2014-09-02 16:02:30 -07:00
George Saines
e0b49ba2aa
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 15:33:28 -07:00
Scott Erickson
55bac798ee
Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width.
2014-09-02 15:33:23 -07:00
Nick Winter
e02431b26b
Fixed color group saving in Thang editor.
2014-09-02 15:25:00 -07:00
Nick Winter
d8ef2f8596
Made new related achievements open in a new tab in the level editor.
2014-09-02 15:00:14 -07:00
Nick Winter
523cbfd38e
Fixed a typo in the achievements:new event schema.
2014-09-02 14:27:13 -07:00
Nick Winter
ba53cb06fe
Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System.
2014-09-02 14:16:41 -07:00
Scott Erickson
1edf3de651
Fixed double clicking sometimes firing when you're just dragging units around in the level editor.
2014-09-02 14:06:37 -07:00
Scott Erickson
7e627277e1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322
Optimized level serialization a little so that level editing is a bit less painful.
2014-09-02 12:33:34 -07:00
Scott Erickson
13b066f6aa
Fixed not being able to drag thangs around every other attempt.
2014-09-02 11:53:03 -07:00
Nick Winter
4b9bf22e22
Thang editor now sets some default Components when you change the kind of a ThangType.
2014-09-02 11:29:33 -07:00
Scott Erickson
9c841991fd
Added links to the versions modal.
2014-09-02 11:07:58 -07:00
Nick Winter
2c22fdf84e
Merge pull request #1498 from 99133799/patch-1
...
Update ro.coffee
2014-09-01 22:21:11 -07:00
Nick Winter
7af2690c47
Propagated i18h.
2014-09-01 22:20:48 -07:00
Nick Winter
2446227387
Merge pull request #1505 from Imperadeiro98/patch-1
...
Update en.coffee
2014-09-01 22:20:02 -07:00
Nick Winter
af42bafb15
Added default goals. Don't show System versions in the Systems list if they're 0.
2014-09-01 21:58:22 -07:00
Nick Winter
e615dde6e2
Show inventory view now, for hero levels.
2014-09-01 21:10:45 -07:00
Nick Winter
632559f7db
Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'.
2014-09-01 20:53:53 -07:00
Nick Winter
9094c0ce19
Add hero placeholder to terrain generator on hero levels.
2014-09-01 20:22:46 -07:00
Nick Winter
b7d9e7a095
Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs.
2014-09-01 20:07:50 -07:00
George Saines
5f9cc2561a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 16:28:03 -07:00
Nick Winter
6085b70dfc
Fixed a bounds offset issue in the Thang Editor colors tab.
2014-09-01 16:22:04 -07:00
Nick Winter
72eb59b7c3
Fixed a few bugs.
2014-09-01 16:14:50 -07:00
George Saines
b278525785
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 16:14:42 -07:00
Imperadeiro98
a28269c531
Update en.coffee
...
I don't know if is necessary to change something in codecombat / app / templates / play.jade
2014-09-01 23:10:14 +01:00
Nick Winter
195e027b53
Fix for null/undefined objects in the diffs.
2014-09-01 14:27:47 -07:00
George Saines
0aea061275
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 14:26:56 -07:00
George Saines
2a3cecb118
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-01 14:09:43 -07:00
George Saines
d1eac35a4f
fixed transparency issue with thang image
2014-09-01 14:09:39 -07:00
Nick Winter
6df5ca00b2
Fixed #69 .
2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -07:00
Nick Winter
040ac4ff4e
Fixed bug with black flashes during script playback.
2014-08-31 16:05:21 -07:00
Nick Winter
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
George Saines
495247661b
bringing contribute avatars up to speed
2014-08-31 15:21:30 -07:00
MajkPascal
dc81e0d84b
Update pl.coffee
2014-08-31 22:31:28 +02:00
Nick Winter
9b2ee45a4d
Added DPS to item view.
2014-08-31 12:27:52 -07:00
Nick Winter
ef9a983e30
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
2014-08-31 12:21:25 -07:00
Nick Winter
5f132e55ba
Fixed #1414 . Also started lazily loading certain level editor tabs.
2014-08-30 23:04:45 -07:00
Nick Winter
a284c8eb37
Fixed #1428 .
2014-08-30 21:16:01 -07:00
Nick Winter
aa54cc32d1
Fixed #1458 .
2014-08-30 20:27:58 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
George Saines
6549b4ccc0
updating the diplomat list
2014-08-30 18:51:02 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
a8644d030e
Fixed #1355 .
2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -07:00
Scott Erickson
5f11a5ecca
Selected component in the thang components edit view shows up with a blue header.
2014-08-30 09:47:23 -07:00
Scott Erickson
6f2de166c0
Removed destroying scripts, since they don't have ace editors, and it was causing a bug.
2014-08-30 09:42:13 -07:00
Nick Winter
051f1a77ae
Fixed #1152 .
2014-08-30 09:19:41 -07:00
Nick Winter
1b0346a1b7
Propagated volume label i18n.
2014-08-30 08:24:14 -07:00
Nick Winter
da9bda3e8a
Merge pull request #1501 from Imperadeiro98/patch-2
...
Update pt-PT.coffee
2014-08-30 08:16:52 -07:00
Nick Winter
384d702c4b
Merge pull request #1500 from Imperadeiro98/patch-1
...
Fixed errors
2014-08-30 08:15:41 -07:00
Imperadeiro98
1f86430076
Update pt-PT.coffee
2014-08-30 14:04:31 +01:00
Imperadeiro98
93b1f782aa
Added "Volume" and fixed error
2014-08-30 13:48:36 +01:00
Imperadeiro98
caa372628b
Fixed errors
2014-08-30 13:48:19 +01:00
Tore Haugland
635f0224e4
Updated locale\no with a more common norwegian than a direct translation from English to make it easier to read for all ages
2014-08-30 11:06:10 +02:00
Tore Haugland
41e9778b3c
Updated locale\no with correct letter case on several translations
2014-08-30 10:54:30 +02:00
99133799
ece96bce2a
Update ro.coffee
2014-08-30 10:31:24 +03:00
Nick Winter
e5cf6c340b
Fixed #1140 . I just put it on the home page for now, but later we can put it somewhere where it makes sense.
2014-08-29 23:09:38 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
Nick Winter
40aa95ba16
Fixed #1297 .
2014-08-29 18:07:32 -07:00
Scott Erickson
7a9c53e424
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:04:50 -07:00
Scott Erickson
21e0889a86
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
2014-08-29 18:02:29 -07:00
Nick Winter
cb14149816
Fixed #1286 . Sort of.
2014-08-29 17:52:47 -07:00
Nick Winter
63f2c5db4f
Fixed #1268 .
2014-08-29 17:33:25 -07:00
Nick Winter
b918f5adfb
Fixed #1262 .
2014-08-29 17:18:38 -07:00
Scott Erickson
3f6c9c4f02
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-08-29 17:12:44 -07:00
Nick Winter
5503b3a2bc
Fixed #1147 .
2014-08-29 17:03:02 -07:00
Scott Erickson
b4d9a787f0
Fixed the rest of the server tests.
2014-08-29 16:28:07 -07:00
Matt Lott
8143d9c5ba
Real-time multiplayers to 'coding' after playback
2014-08-29 15:26:39 -07:00
Matt Lott
92cad5f46f
Real-time multiplayer subscription schemas
2014-08-29 15:10:04 -07:00
Nick Winter
68dcdaf223
A couple achievment/item editor error fixes.
2014-08-29 13:00:11 -07:00
Scott Erickson
434a0c071b
Few more bugs fixed for defaults.
2014-08-29 12:29:42 -07:00
Scott Erickson
2dfe39aafd
Migrated Achievement model's getExpFunction to use the new defaults system.
2014-08-29 12:28:45 -07:00
Scott Erickson
f93ef2005e
Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'.
2014-08-29 11:34:32 -07:00
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Matt Lott
68cca74b43
Real-time multiplayer initial commit
...
Simple matchmaking, synchronous multiplayer PVP, flags!
Rough matchmaking is under the game menu multiplayer tab, for ladder
games only. After creating a 2-person game there, you can exit that
modal and real-time cast to play against each other.
If you’re the first person to cast, you’ll sit at the real-time level
playback view waiting until the other player casts. When they do, you
both should start the real-time playback (and start placing flags like
crazy people).
If in a multiplayer session, the real-time simulation runs the players’
code against each other. Your multiplayer opponent’s name should be up
near the level name.
Multiplayer sessions are stored completely in Firebase for now, and
removed if both players leave the game. There’s plenty of bugs,
synchronization issues, and minimal polish to add before we push it to
master.
2014-08-28 23:34:07 -07:00
Nick Winter
a4b2333fd3
Added Systems documentation. Fixed #1115 .
2014-08-28 22:32:55 -07:00
Nick Winter
124f999bc8
Fixed #1105 . Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
2014-08-28 19:39:46 -07:00
Nick Winter
f74a152942
Fixed #1104 .
2014-08-28 18:55:33 -07:00
Scott Erickson
9406a8c920
Merge branch 'master' into feature/defaults
2014-08-28 17:58:58 -07:00
Scott Erickson
5fd154ca8b
Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed.
2014-08-28 17:57:39 -07:00
Nick Winter
e67b4ae064
Fixed #1090 .
2014-08-28 17:08:05 -07:00
Scott Erickson
74ca7fe0cc
Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.
2014-08-28 17:05:46 -07:00
Scott Erickson
608d114c5c
Fixed metaschemas not being found.
2014-08-28 15:54:05 -07:00
Scott Erickson
8f95ad2787
Fixed a few bugs.
2014-08-28 15:42:46 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Scott Erickson
154b91c753
Changed LevelLoader to always deeply load components and thang types, not just for hero levels.
2014-08-28 15:19:04 -07:00
Nick Winter
0fa5d264f4
Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle.
2014-08-28 14:25:37 -07:00
Nick Winter
107a727d02
Fixed a bug in the WizardSettingsModal being destroyed and still trying to do things.
2014-08-28 14:06:53 -07:00
Nick Winter
f79a2848fd
Fixed #1038 . Focus should now remain on code editor when after clicking on Surface.
2014-08-28 14:00:54 -07:00
Scott Erickson
e3bc9045d1
Couple tweaks.
2014-08-28 13:53:00 -07:00
Scott Erickson
8b056cfb8f
Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.
2014-08-28 11:24:45 -07:00
Nick Winter
1094d09aa5
Fixed #1226 . Fixed #1156 . Fixed two other issues with spectate mode.
2014-08-28 11:23:52 -07:00
Nick Winter
d7ae07c012
Fixed Facebook login bug.
2014-08-28 11:16:55 -07:00
Nick Winter
a471462279
Merge pull request #1497 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-28 10:51:30 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Imperadeiro98
92055aaa21
Update pt-PT.coffee
2014-08-28 18:20:52 +01:00
Scott Erickson
94065a0c4c
Merged conflicts.
2014-08-28 09:59:07 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239
Fixed a bug with old, un-migrated level-set-playing events in button handlers.
2014-08-28 09:52:51 -07:00
Nick Winter
a50f6b9224
Fixed a bug with reloading non-writable code.
2014-08-28 09:41:47 -07:00
Nick Winter
a39097b366
Fixed #1494 .
2014-08-28 09:29:38 -07:00
Nick Winter
ec6b3d7e5f
Fixed #1481 . More Mediator schema fixes.
2014-08-28 09:27:42 -07:00
Nick Winter
28431703f5
Fixed #953 .
2014-08-27 22:23:24 -07:00
Nick Winter
02255044e3
Fixed #847 . Fixed some subscription schemas.
2014-08-27 18:43:17 -07:00
Scott Erickson
bcffc5811f
Migrated the Level populating of component and system config defaults to the new Treema utility method.
2014-08-27 18:17:47 -07:00
Nick Winter
cd3bf4d0db
Fixed a few bugs.
2014-08-27 18:05:18 -07:00
Nick Winter
2ef7bff2c5
Fixed #886 .
2014-08-27 17:54:16 -07:00
Scott Erickson
7bdfcb4313
Fixed pasting component configs into the thang component config treema.
2014-08-27 17:29:28 -07:00
Nick Winter
92b29915e2
Finished fixing #841 .
2014-08-27 17:26:56 -07:00
Nick Winter
3f16aaab61
Fixed a few more Backbone Mediator event validation issues.
2014-08-27 16:31:44 -07:00
Rikard Gehlin
7aa1a4112a
Update sv.coffee
2014-08-28 00:08:43 +02:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Scott Erickson
ac2c39a266
Fixed an infinite loop bug in CoordinateGrid.
2014-08-27 09:49:37 -07:00
djsmith85
8b80ac5c44
Added a few German translations
...
Added translations to de.coffee and synced them with de-DE.coffee and
de-AT.coffee.
2014-08-27 11:28:23 +01:00
Nick Winter
6ff01f7deb
Fixed #814 .
2014-08-26 18:11:35 -07:00
Nick Winter
871cd4b3c9
Fixed #784 .
2014-08-26 17:34:00 -07:00
Scott Erickson
607a2a133f
Made the SuperModel a little bit more clever about handling duplicate loaded models, hopefully fixed #1108 .
2014-08-26 16:46:23 -07:00
Scott Erickson
98752159ca
Made the SuperModel a little bit more clever about handling duplicate loaded models.
2014-08-26 16:31:53 -07:00
Nick Winter
1864cb09bc
Fixed #712 . Fixed a bug with listing files/musics in admin files view due to removed trailing slashes.
2014-08-26 15:42:33 -07:00
Scott Erickson
f1bf160755
Fixed merge conflict.
2014-08-26 15:42:03 -07:00
Scott Erickson
5d804c6d9a
Fixed merge conflict.
2014-08-26 15:41:59 -07:00
Scott Erickson
162aa7633e
Fixed the component and system settings treema, clearing out defaults for properties not being edited.
2014-08-26 15:40:51 -07:00
Nick Winter
a5c18a4140
Fixed #453 .
2014-08-26 15:22:13 -07:00
Nick Winter
50ad453345
Fixed #169 .
2014-08-26 14:34:23 -07:00
Scott Erickson
ab669739a6
Fixed a bug with the thang component edit view: labels of new components not showing up.
2014-08-26 14:15:21 -07:00
Nick Winter
7300c4b3b8
Finished removing grid from playback options menu.
2014-08-26 14:00:03 -07:00
Nick Winter
35b107cf58
Refactored grid. Fixed #158 .
2014-08-26 13:56:57 -07:00
Scott Erickson
2f72aa4f47
Fixed adding new components in the thang components edit view.
2014-08-26 13:48:57 -07:00
Scott Erickson
39d0df5153
Fixed name ordering in the thang components editor.
2014-08-26 13:27:17 -07:00
Scott Erickson
5b5bceda3a
Components tab now incorporates components inherited from thang types.
2014-08-26 13:08:56 -07:00
Nick Winter
3e9adf6b1a
Fixed issue with IndieSprites no longer coloring properly.
2014-08-26 12:39:30 -07:00
Nick Winter
a5912c8e40
Merge pull request #1490 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-26 11:34:58 -07:00
Nick Winter
741139db59
Apparently GitHub ids are integers, not strings.
2014-08-26 11:34:33 -07:00
Nick Winter
38dcb7fcef
Fixed #5 .
2014-08-26 11:29:16 -07:00
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
Jayant Jain
f700ddea0c
Adds temporary hack for infinite loops in randomise
2014-07-25 18:06:54 +05:30
Jayant Jain
1790215fea
Adds rooms and doors to dungeon preset
2014-07-25 18:06:44 +05:30
Jayant Jain
dc66218c00
Adds undo and redo buttons in editor topbar
2014-07-25 18:06:34 +05:30
Jayant Jain
9a24341fa5
Prevents overlapping of randomly generated thangs
2014-07-25 18:06:25 +05:30
Jayant Jain
3df2de8bec
Number of decorations scales appropriately with preset size
2014-07-25 18:06:13 +05:30
Jayant Jain
dce6254d4a
Fix for flickering thangs due to exact same coordinates
2014-07-25 18:06:03 +05:30
Jayant Jain
598e727500
Adds an initial dungeon preset, refactors border code to properly create dungeon walls
2014-07-25 18:05:49 +05:30
Jayant Jain
80da704d19
Background image paths automated, adds preset image files
2014-07-25 17:54:10 +05:30
Jayant Jain
c33491b04d
Presets in terrain_generate_modal shown from a list instead of hardcoded
...
Conflicts:
app/templates/editor/level/modal/terrain_randomize.jade
2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799
Refactors some code for presets in terrain generator
2014-07-25 17:50:21 +05:30
Jayant Jain
86cf344f28
Adds preset images to preview the generated terrain
2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893
Docs tab v2
2014-07-25 01:26:34 +03:00
Imperadeiro98
19f257f1d0
Update pt-PT.coffee
2014-07-24 22:43:39 +01:00
Michael Schmatz
d773c301fb
Add message if no player code in profile
2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b
Add login link to profile login prompt
2014-07-24 10:16:43 -07:00
Melondonut
26ab77b1ae
Update ko.coffee
2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b
Update ko.coffee
2014-07-24 15:30:54 +09:00
Michael Schmatz
e0d7392c1f
Merge pull request #1386 from codecombat/pr/1376
...
Pr/1376
2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0
Uncommented some commented translated lines
2014-07-23 15:23:53 -07:00
Michael Schmatz
7910c5d9cc
Implement #1370
2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d
Merge branch 'pr/1383'
...
Conflicts:
app/views/play/level/tome/SpellListTabEntryView.coffee
2014-07-23 14:44:15 -07:00
Ruben Vereecken
cde87e4fe5
Covered general patches with tests
2014-07-23 20:00:28 +02:00
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07:00
Dominik Kundel
5279b01483
fixed showing pinned popover
2014-07-23 17:39:16 +02:00
Scott Erickson
beef508e76
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc
Renamed problem and spell to their new, capitalized names.
2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f
fixed spell palette sliding behind HUD
2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3
fixed artefact
2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843
last fix for dimming the editor
2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6
disabled editor works again
2014-07-23 14:38:12 +02:00
Melondonut
cb3f547b9e
Update ko.coffee
2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81
Update ko.coffee
2014-07-23 13:56:18 +09:00
Ruben Vereecken
8969311d82
Butons on profile page now nicer
2014-07-22 21:52:52 +02:00
Dominik Kundel
5db634d6a8
fullscreen on keyboard shortcut
2014-07-22 21:47:36 +02:00
George Saines
8982c7ea5b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-22 09:11:30 -07:00
George Saines
574252df32
subbing in Pavel's better tiny programming language icons
2014-07-22 09:11:25 -07:00
greyhusky
a313c3ab27
More translations
...
Translated the "about" page and parts of "legal" page as well as some other stuff
2014-07-22 15:01:47 +02:00
Ruben Vereecken
411bb87985
Added contributor categories to user profile page
2014-07-22 12:50:56 +02:00
Melondonut
8476aa33f9
Update ko.coffee
2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff
Update ko.coffee
2014-07-22 10:13:24 +09:00
Michael Schmatz
283108da1e
Added login message for anonymous users on job profile
2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe
Add filter alerts to employer page
2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f
Removed filterActive from filter alerts
2014-07-21 14:47:44 -07:00
Ruben Vereecken
ebdbc0f891
Basis for user view is finished
2014-07-21 22:02:08 +02:00
Ruben Vereecken
972d231ff5
Refactored router and views to anticipate the renameViews feature
2014-07-21 19:49:16 +02:00
Ruben Vereecken
0d87209fa8
Recently played is now shown on account page
2014-07-21 19:06:22 +02:00
Michael Schmatz
735a7082ee
Correction to filter schema
2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2
Added saved employer filter alerts to schema
2014-07-21 09:44:40 -07:00
Ruben Vereecken
1c6da9711b
Added the Recently Played collection and endpoint
2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81
Half the account page is there
2014-07-21 13:40:11 +02:00
Nick Winter
ac7e663418
Merge pull request #1359 from Melondonut/patch-2
...
translation Update ko.coffee
2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0
uncommented line 485
2014-07-21 14:11:17 +09:00
Darredevil
61ebc4d15b
Docs tab
2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe
Merge pull request #1360 from Darredevil/master
...
Docs page enhancement
2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9
Docs page enhancement
2014-07-21 02:23:01 +03:00
Nick Winter
99e1a8b30a
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
...
Changed point marker to crosshair, made it bigger, and changed color to white
2014-07-20 16:04:29 -07:00
Nick Winter
a7905db316
Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.
2014-07-20 15:51:48 -07:00
Melondonut
f5ac5423f8
Update ko.coffee
...
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c
fix for no user logged
2014-07-20 22:14:33 +03:00
Melondonut
9724c4f218
Update ko.coffee
...
Hi there.
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."
thank you,
Melondonut.
안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed
Changed point marker to crosshair, and changed color to white
2014-07-19 20:12:56 -04:00
Nick Winter
d45c2d31de
New language icons.
2014-07-18 20:14:41 -07:00
Scott Erickson
e7a70bbd0b
Merge conflict handling.
2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853
More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.
2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804
Removed the deprecated ErrorView.
2014-07-18 16:56:08 -07:00
Scott Erickson
00c11fd70e
Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data.
2014-07-18 16:46:28 -07:00
Scott Erickson
9ad166048d
Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.
2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-18 16:12:27 -07:00
Scott Erickson
90a4a1b635
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-18 16:12:27 -07:00
George Saines
18631ec5b1
upgrading our level icons
2014-07-18 15:42:53 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Imperadeiro98
3ac1d6c77c
Update pt-PT.coffee
2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc
Update pt-PT.coffee
2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11
Propagated i18n tags for code language blurbs.
2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145
Updated code language logos. Added code language blurb i18n tags.
2014-07-17 20:12:59 -07:00
Scott Erickson
708f67ebd5
Merge branch 'master' into renameViews
2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 17:23:56 -07:00
Scott Erickson
59b723b890
Refactoring View to ModalView.
2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583
Refactoring View to CocoView.
2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c
Refactoring View to RootView. Refactoring some RootViews to be routed manually.
2014-07-17 17:16:32 -07:00
Nick Winter
079d336881
Stopped .nano from overriding Bootstrap's column width for component docs page.
2014-07-17 16:36:59 -07:00
Scott Erickson
2b4b91733c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e
Work on the job profile view, initial work on the code modal.
2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d
Merge pull request #1344 from Darredevil/master
...
fix for no user logged
2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-17 16:29:26 -07:00
Scott Erickson
4818a81854
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-17 16:22:06 -07:00
Nick Winter
e412a7b73f
Merge pull request #1341 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-17 16:00:54 -07:00
Nick Winter
769c26229e
Merge pull request #1340 from sunzenshen/master
...
Fixed typo: Chose -> Choose
2014-07-17 15:59:08 -07:00
Nick Winter
8813a7f545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec
Restored legacy candidates view
2014-07-17 13:16:17 -07:00
Scott Erickson
590626d5f8
Centered social link icons.
2014-07-17 09:30:27 -07:00
Scott Erickson
6f09e95d68
Removed background from job profile view.
2014-07-17 09:22:52 -07:00
Darredevil
b6469ff45b
fix for no user logged
2014-07-17 19:12:26 +03:00
Darredevil
80b420ebbf
fix for no user logged
2014-07-17 19:11:23 +03:00
Michael Schmatz
ccb2ad67ac
Merge pull request #1342 from codecombat/feature/mail-system
...
Feature/mail system
2014-07-17 07:18:39 -07:00
Imperadeiro98
17a4a689e4
Update pt-PT.coffee
2014-07-17 14:18:29 +01:00
Imperadeiro98
991ef61d62
Update pt-PT.coffee
2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77
Update pt-PT.coffee
2014-07-17 13:25:25 +01:00
Alan Shen
c56be02222
Fixed typo: Chose -> Choose
...
It may be late to describe incoming targets with past tense.
2014-07-17 01:16:08 -06:00
Darredevil
83177c5f00
language sensitive docs added
2014-07-17 03:19:09 +03:00
Darredevil
8da06f6c6b
language sensitive docs added
2014-07-17 03:18:06 +03:00
Michael Schmatz
ae23679a26
Hard code mail tasks and add unsubscribe
2014-07-16 16:37:06 -07:00
Nick Winter
781e1da93e
Fixed typo: massword -> password.
2014-07-16 16:14:48 -07:00
Nick Winter
42af807e5c
Merged in geometry work from #51 .
2014-07-16 16:01:37 -07:00
Nick Winter
855461a67e
Don't let test view interfere with normal body styles.
2014-07-16 16:01:37 -07:00
Michael Schmatz
b74bdfbf51
Added metadata to mail sent schema
2014-07-16 12:12:11 -07:00
Michael Schmatz
bb3c583300
Add approved date to job profile
2014-07-16 10:51:45 -07:00
nemoyatpeace
f17112ecf8
Minor adjustment to the aoe script
2014-07-17 00:53:52 +08:00
Nick Winter
5ce0cff538
Propagated i18n. Added password repeat to base en.coffee.
2014-07-16 08:03:25 -07:00
Nick Winter
1fd28c0181
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-16 07:54:23 -07:00
Nick Winter
bf0e1ead92
Merge pull request #1335 from rubenvereecken/settings_patch
...
Did UX changes, added an error and fixed a job profile editing bug
2014-07-16 07:52:04 -07:00
Nick Winter
085951fa4a
Removed more counselor stuff.
2014-07-16 07:47:41 -07:00
Nick Winter
5b693d02cf
Merge pull request #1330 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-16 07:47:08 -07:00
Ruben Vereecken
bfc4ef58b0
Did UX changes, added an error and fixed a job profile editing bug
2014-07-16 14:47:55 +02:00
Imperadeiro98
4dbb49aa72
Update en.coffee
2014-07-16 13:24:16 +01:00
Nick Winter
6e9091fdf0
More fixes to documentation popovers.
2014-07-15 19:25:53 -07:00
Nick Winter
906ab3ac2b
Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette.
2014-07-15 18:54:55 -07:00
Nick Winter
03cc2d1af0
Fixed Grass01-Grass05 scaling issues.
2014-07-15 18:08:00 -07:00
George Saines
8c9c41f477
copy tweak on the employer homepage
2014-07-15 17:27:26 -07:00
Jayant Jain
fa595fcb32
Better positioned level border trees
2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251
Borders and floors are placed inside positive axes
2014-07-16 05:03:18 +05:30
Imperadeiro98
7d476470c7
Corrected a mistake
2014-07-15 20:17:50 +01:00
Imperadeiro98
32d4408f67
Update pt-PT.coffee
...
Delete lines 747-753 and 775-776.
2014-07-15 20:02:23 +01:00
Scott Erickson
3325332626
Fixes #1328 .
2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87
Added watchers to list of properties to skip in deltas/patches.
2014-07-15 11:23:35 -07:00
Nick Winter
e06f9132d1
Fixed #469 .
2014-07-15 10:24:18 -07:00
Nick Winter
da73975f20
Fixed #1095 .
2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171
Fixed #1010 .
2014-07-15 09:35:14 -07:00
Nick Winter
39bea855d1
Propagated new i18n tags with the script.
2014-07-15 08:22:02 -07:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Ruben Vereecken
c423fe989b
Merge branch 'navbar' into achievements
2014-07-15 16:16:01 +02:00
Ruben Vereecken
40ba28f49b
Basics for account and user home pages
2014-07-15 16:15:21 +02:00
Nick Winter
b3e8eb8504
Working on something for #1327 .
2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3
Fixed #1321 .
2014-07-14 17:54:32 -07:00
Scott Erickson
d8d40ab0f6
Fixes #1116
2014-07-14 17:46:12 -07:00
Scott Erickson
b113e126a3
Fixes #1316 and #1318
2014-07-14 17:18:48 -07:00
Scott Erickson
888ee6c0bb
Fixed deltas in the version history modal.
2014-07-14 16:37:10 -07:00
Scott Erickson
9d22a35194
Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat
2014-07-14 15:13:52 -07:00
Nick Winter
f2f3817e10
Fixed Thang Editor scaling.
2014-07-14 14:10:46 -07:00
Nick Winter
cfeb6c34a4
Merge pull request #1324 from Darredevil/master
...
docs page minor update
2014-07-14 13:23:52 -07:00
Ruben Vereecken
1f1ff25a5a
merge
2014-07-14 20:27:47 +02:00
Nick Winter
23dc8d2947
Removed a bad log.
2014-07-14 11:21:03 -07:00
Darredevil
c579742955
docs page update
2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007
GET /auth/name/<name> now serves possible free names
...
anonymous users are now warned if their new name is already chosen
User Settings is now without auto-save
Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.
Refactored conflicted name checking so it can be used in more places
Signup form now has an optional name field
Covered extra case where the debounced check happened too late. Support for submitting on enter.
Worked in scott's comments and got tests working again
2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9
Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.
2014-07-14 11:05:59 -07:00
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Ruben Vereecken
ae4a5eb460
Deduplicated bootstrap include
2014-07-14 18:52:23 +02:00
Ruben Vereecken
5aa6db7696
Made the sass more snappy
2014-07-14 18:40:23 +02:00
Nick Winter
7446c9ee08
Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.
2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2
Don't ask for team again if we already have a child window.
2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00
Merge branch 'jayant1992-master'
2014-07-14 07:33:59 -07:00
Nick Winter
42cf0b5cce
Added missing starting quote.
2014-07-14 07:30:18 -07:00
Nick Winter
d27dbdddbb
Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13
2014-07-14 07:29:47 -07:00
Ruben Vereecken
7a52c195eb
More user navbar styling! Also need to investigate browser reflow
2014-07-14 15:32:02 +02:00
Ruben Vereecken
1aa566e4f7
Layout of navbar user dropdown about finished
2014-07-14 14:56:44 +02:00
Ruben Vereecken
5f2c7665ea
Navbar refactored, starting to look good already.
2014-07-14 14:20:13 +02:00
Ruben Vereecken
d261f888d7
Refactored profile view to be a userView. Would still like to test remarks though
2014-07-14 12:18:28 +02:00
Tery Lim
0f4a7df982
Use spl instead of trailing space for spacing
2014-07-14 13:56:27 +08:00
Inez KEMENES
ca3a2b620b
Update hu.coffee
...
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
2014-07-14 07:22:19 +02:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed
Less geometric random borders for the terrain generator
2014-07-14 08:11:33 +05:30
Nick Winter
bd47b3bc83
Fixed #1210 based on #1313 .
2014-07-13 18:53:01 -07:00
Nick Winter
1d9afbabd2
Fixes for duplicate Thang IDs and reverting randomized Thangs.
2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4
Merge branch 'master' of git://github.com/jayant1992/codecombat
2014-07-13 18:21:27 -07:00
Nick Winter
b1b9f87ebe
Fixed root test view URL to not need the trailing slash.
2014-07-13 17:34:51 -07:00
Jayant Jain
493ebd07e6
Changes randomise to randomize
2014-07-14 06:01:09 +05:30
Nick Winter
f92b29a4a3
Added rotate to Vector APIs.
2014-07-13 17:25:24 -07:00
Michael Schmatz
2a5a366c12
Made language selection in opponent modal
2014-07-13 17:22:06 -07:00
Nick Winter
daff7a2640
Merge pull request #1314 from TheSecretSquad/issue#1213
...
Added point marker shape, and split updateSize method into helpers.
2014-07-13 17:08:11 -07:00
Nick Winter
a076822a08
Merge pull request #1306 from kerradus/master
...
update ru.coffee
2014-07-13 17:07:45 -07:00
Nick Winter
01fdc5b520
Merge pull request #1311 from rubenvereecken/pretty_wizard_modal
...
Bootstrappified Wizard Settings modal
2014-07-13 17:07:07 -07:00
Nick Winter
6eea28dc19
Error handling for syntax errors in component code.
2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e
Added point marker shape, and split updateSize method into helpers.
2014-07-13 19:31:34 -04:00
Nick Winter
6dc2a48b75
Tracking time spent reading initial guides.
2014-07-13 16:07:15 -07:00
Ruben Vereecken
bd7c2d0d36
Bootstrappified Wizard Settings modal
2014-07-14 00:25:24 +02:00
Ruben Vereecken
9db84befa6
Set up a 301 Redirect for account/profile instead of a backbone redirect
2014-07-13 22:34:32 +02:00
Scott Erickson
ebfb329da7
Fixed a bug where pressing escape would not properly end scripts in the session state.
2014-07-13 13:11:45 -07:00
Jayant Jain
deecd7d2ff
Deletes previously randomised thangs when generating again
2014-07-14 01:34:32 +05:30
Jayant Jain
b934d22cbd
Batches insertion of thangs to treema to speed up terrain generation
2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd
Moves randomise modal template and view to editor/level/modal
2014-07-14 01:34:32 +05:30
Jayant Jain
be223197df
Updates i18n tags and en.coffee
2014-07-14 01:33:45 +05:30
Scott Erickson
667ea14442
Merge branch 'mediator-schema' of https://github.com/jthemphill/codecombat into jthemphill-mediator-schema
2014-07-13 12:20:11 -07:00
Scott Erickson
3b6d17286b
Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.
2014-07-13 12:19:51 -07:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Dmitry
e60832bcfa
Update ru.coffee
...
some fixes
2014-07-13 23:13:42 +04:00
Nick Winter
202a562c51
Merge pull request #1303 from maryannv/patch-1
...
Add space before "Contribute"
2014-07-13 12:08:27 -07:00
Scott Erickson
843ed97643
Another fix for mongoose i18n locale object hack.
2014-07-13 10:05:58 -07:00
Nick Winter
868a6ed43b
Fixed a couple i18n issues. Fixed #1302 .
2014-07-13 09:31:56 -07:00
Nick Winter
49e6ed13ba
Fixed LatestVersionReferenceNode's collection initialization.
2014-07-13 09:11:06 -07:00
Nick Winter
373c1688ed
Merge pull request #1287 from rubenvereecken/user_patch
...
Noty errors don't show up on user save fails anymore
2014-07-13 08:54:20 -07:00
Nick Winter
8a7e7e82a0
Let's try a heads-up whenever there's a JS error.
2014-07-13 08:37:39 -07:00
Nick Winter
83248f039c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-13 07:52:35 -07:00
Nick Winter
39f6874682
Merge pull request #1304 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-13 07:48:42 -07:00
Dmitry
b1aa0a1973
update ru.coffee
2014-07-13 15:33:50 +04:00
Maryann Vellanikaran
f9c92d2731
Add space before "Contribute"
...
Before: http://cl.ly/image/0p1f1P1D0P2d
After: http://cl.ly/image/3a0x12070C28
2014-07-12 15:45:53 -07:00
Nick Winter
d48f5256a7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-12 10:19:19 -07:00
Scott Erickson
f4b22fedc9
Tweaking the visuals for the i18n treema node to mostly ignore the property required to get around mongoose not handling empty objects.
2014-07-12 09:58:28 -07:00
Scott Erickson
8cb7cd770c
Fixed i18n population because mongoose has problems with empty objects.
2014-07-12 09:58:28 -07:00
Jeff Hemphill
a8d369ed1a
Add schemas for tome subscriptions
2014-07-12 01:55:35 -07:00
Imperadeiro98
178e147565
Update pt-PT.coffee
2014-07-12 08:54:16 +01:00
Nick Winter
89dc724d31
Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay
...
Centered CoordinateDisplay background and label
2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5
Centered CoordinateDisplay background and label
2014-07-11 22:10:13 -04:00
Nick Winter
c62f5f3fa0
Skipping docs for language-inappropriate entries in spell palette.
2014-07-11 18:42:55 -07:00
Nick Winter
f13f0ddfef
Merge pull request #1296 from dreamist/patch-1
...
Update th.coffee
2014-07-11 18:11:57 -07:00
Nick Winter
17ba4bc8a7
Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.
2014-07-11 18:07:00 -07:00
Nick Winter
788562f2ea
Merge pull request #1295 from Imperadeiro98/master
...
Updated some strings
2014-07-11 14:28:29 -07:00
Michael Schmatz
fede037e89
Fixed time NaN
2014-07-11 13:55:31 -07:00
dreamist
ca78638a21
Update th.coffee
...
One fix and a few more translations
2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea
Update pt-PT.coffee
2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349
Update pt-PT.coffee
2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489
Fixed a issue with headers
...
There was a issue with the headers that is now corrected.
2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f
Update pt-PT.coffee
2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567
Update pt-PT.coffee
2014-07-11 15:17:16 +01:00
Nick Winter
65e39ad4e3
Propagated i18n updates.
2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0
Fixes, tweaks, and i18n for the employers page.
2014-07-10 19:17:51 -07:00
Nick Winter
3d5cd29519
Removed some logging.
2014-07-10 17:35:59 -07:00
Michael Schmatz
80e7b7664e
Changed employer artisanal message font
2014-07-10 15:42:45 -07:00
Nick Winter
f17e24013b
Fixed #1217 (scaleFactor, debug shapes).
2014-07-10 14:22:15 -07:00
Jayant Jain
d6928eb1c4
Removes okay button, hides modal upon generation
2014-07-11 01:43:51 +05:30
Jayant Jain
a76a79bb9d
Fixes bug with placing addThang after randomise
2014-07-11 01:07:24 +05:30
Jayant Jain
5fb4f161d0
Removes console logs
2014-07-11 00:01:19 +05:30
Jayant Jain
da0b0d9830
Big terrain generator commit -
...
1.Adds method for randomising decorations/doodads
2.Creates presets
3.Adds thang clusters which can be used to create presets easily
2014-07-11 00:01:19 +05:30
Jayant Jain
dbe464df16
Removes console logs
2014-07-11 00:01:19 +05:30
Jayant Jain
b401b04893
Adds randomiseFloor and randomiseBorder functions
2014-07-11 00:01:19 +05:30
Jayant Jain
38bed0ee93
Random thangs are now created and positioned in the thangs view
2014-07-11 00:01:19 +05:30
Jayant Jain
74205b31d2
Adds code for passing randomised thangs to thang view
2014-07-11 00:01:18 +05:30
Jayant Jain
1436a4dac7
Cleans up some css for terrain generator modal
2014-07-11 00:01:18 +05:30
Jayant Jain
813ecaa59c
Adds randomise option to dropdown on editor page
2014-07-11 00:01:18 +05:30
Jayant Jain
c40da260f0
Adds initial modal and view for terrain generator
2014-07-11 00:01:18 +05:30
Jayant Jain
efa2bee08c
Adds shortcuts for undo/redo for thangs tab view
2014-07-11 00:01:18 +05:30
Scott Erickson
a3c524424c
Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users
2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f
Fixed some schema issues related to snippets and code languages.
2014-07-10 08:31:40 -07:00
Ruben Vereecken
750d94c478
Noty errors don't show up on user save fails anymore
2014-07-10 10:30:23 +02:00
nemoyatpeace
8700da6570
Update play_view.coffee
...
Added my level to the page.
2014-07-10 09:19:59 +08:00
Michael Schmatz
013ace65f6
Basic email structure plus distributed locking system
2014-07-09 16:24:14 -07:00
Nick Winter
a48fe4f18f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-09 15:34:22 -07:00
Nick Winter
bcf3c19f81
Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.
2014-07-09 15:32:57 -07:00
Nick Winter
833d59fb1f
Merge pull request #1282 from Alphir/patch-1
...
Update fr.coffee
2014-07-09 14:17:51 -07:00
Nick Winter
4b16e2fc57
Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master
2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1
Merge branch 'dkundel-feature/fullscreen-editor'
2014-07-09 13:41:57 -07:00
Nick Winter
0ed8d2b371
Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.
2014-07-09 13:41:42 -07:00
Alphir
0ee0b2d5e3
Update fr.coffee
2014-07-09 22:13:05 +02:00
Darredevil
4309bfbe67
new Documentation page
2014-07-09 23:01:53 +03:00
Scott Erickson
d74a778f67
Made creating components open to everyone!
2014-07-09 12:21:32 -07:00
Nick Winter
44e5c2826c
Proper Treema node behavior for different code languages in default code, property documentation, and snippets.
2014-07-09 11:59:27 -07:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Scott Erickson
3fbce8334d
Fixed #1276
2014-07-09 10:47:02 -07:00
Ruben Vereecken
5dc54c784d
Added case and demo for user not found. Should be made prettier as soon as users can be queried by name
2014-07-09 18:13:22 +02:00
Ruben Vereecken
b065a524c1
Got down the basic layout for achievement overview
...
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
gosnat
4d50a6d76a
Update play_view.coffee
...
Added "Guide Everyone Home" level
2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba
Made some style tweaks to the employers page to move the filters into a sidebar when authorized.
2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c
Fixed some wizard positioning issues in multiplayer.
2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03
Working on flippable tile highlight bounds marks.
2014-07-08 16:43:36 -07:00
Michael Schmatz
21d056ff01
Instant application of filters
2014-07-08 11:19:14 -07:00
Michael Schmatz
bbc793b003
Fixed modal popping up when logging out sometimes
2014-07-08 10:42:36 -07:00
Michael Schmatz
aa40257034
Table styling/ copy edit
2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02
Implement candidate filter counts next to filters
2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4
Move featured candidates to top of sort
2014-07-07 21:29:48 -07:00
Michael Schmatz
08b9a8fdaa
Various changes to education filter
2014-07-07 21:04:12 -07:00
Michael Schmatz
30745a25ca
Consolidated iOS and Android into Mobile
2014-07-07 20:24:29 -07:00
Nick Winter
9381a4dec6
Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups.
2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec
Merge pull request #1264 from kinez/patch-12
...
Update hu.coffee
2014-07-07 20:13:36 -07:00
Michael Schmatz
285c7ff049
Added school changes to schema
2014-07-07 20:05:28 -07:00
Michael Schmatz
cef8fe074a
Add mobile developer to the schema
2014-07-07 20:03:02 -07:00
Michael Schmatz
9313541f9f
Fixed targeting on employers CSS
2014-07-07 20:02:01 -07:00
Michael Schmatz
30671d82f6
Removed PM and Management from filters
2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd
Various fixes to employer page/profile view
2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4
Merge pull request #1261 from Imperadeiro98/master
...
Translated some more strings
2014-07-07 18:50:20 -07:00
Scott Erickson
c1f77e3f07
Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch
2014-07-07 18:48:26 -07:00
Scott Erickson
5d00aedac7
Widened the click area on the wizard settings view for color config.
2014-07-07 18:13:19 -07:00
Scott Erickson
1263d4724a
Fixed the title in the gold view to handle when goldEarned isn't available.
2014-07-07 16:56:47 -07:00
Scott Erickson
49c8360d5b
Fixed me emitting 'me:synced' and anything listening for that.
2014-07-07 16:53:34 -07:00
Scott Erickson
908772d8fe
Fixed an instance where a level loading callback was erroring if called before the surface was built.
2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3
Fixed the gold view not showing numbers until the first change.
2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c
Enabled submitting patches for thangs and articles.
2014-07-07 15:19:22 -07:00
Michael Schmatz
0305374580
Add featured field to curation
2014-07-07 10:42:16 -07:00
Michael Schmatz
b76239b4e9
Replaced candidate avatars on employer page
2014-07-07 10:29:35 -07:00
Scott Erickson
12543cf4dd
Added the foundation of a component docs view.
2014-07-07 10:11:02 -07:00
Scott Erickson
86a3fbacd1
Made the CocoCollection more strict about setting the model property.
2014-07-07 10:11:02 -07:00
Michael Schmatz
3151db6fc5
Hide briefcase when no work history
2014-07-07 09:49:13 -07:00
Ruben Vereecken
ea3d1fee74
Starting on achievement overview style
2014-07-07 15:03:28 +02:00
Imperadeiro98
d9d1d25c3c
Update pt-PT.coffee
2014-07-07 13:31:03 +01:00
Ruben Vereecken
9055612b24
Fixtures set up, demo start
2014-07-07 12:47:32 +02:00
Ruben Vereecken
b5702bc314
Added simple demo page
2014-07-07 12:11:43 +02:00
Ruben Vereecken
75b738f126
User loading now have async callbacks
2014-07-07 12:03:48 +02:00
Scott Erickson
aea1d0e8f2
Changed the angel logigng to use info instead of log, to more easily differentiate.
2014-07-06 15:01:39 -07:00
Scott Erickson
850712442d
Added underscore.string to the worker.
2014-07-06 15:01:20 -07:00
Scott Erickson
a2740279bc
Added styling for tables in the guide.
2014-07-06 15:00:51 -07:00
Ruben Vereecken
ec78f95da1
Prepared things for Scott
2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066
Got users and achievements to load in a neat way
2014-07-06 22:48:33 +02:00
Ruben Vereecken
128008daa1
Hid the progress bar on load failed
2014-07-06 21:48:31 +02:00
Ruben Vereecken
10735867a4
Got some basic hierarchy set up for user view and template inheritance
2014-07-06 21:10:28 +02:00
Ruben Vereecken
e33bb44ffc
Start of new user routing and views are there
2014-07-06 20:45:27 +02:00
Ruben Vereecken
51bc8e5a7c
Merged master
2014-07-06 20:07:47 +02:00
Ruben Vereecken
1f02b99942
Refactored showNotFound into notFoundView
2014-07-06 20:01:47 +02:00
Scott Erickson
d640dac33a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-06 09:36:12 -07:00
Scott Erickson
37a28cf826
Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor.
2014-07-06 09:35:28 -07:00
Inez KEMENES
cc0e818824
Update hu.coffee
2014-07-06 16:26:51 +02:00
Imperadeiro98
21c180e206
Update pt-PT.coffee
2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5
Update pt-PT.coffee
2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07
Update pt-PT.coffee
2014-07-05 22:10:21 +01:00
Scott Erickson
94a6e3961b
Added a button in the level editor to choose which team to play when editing a ladder level.
2014-07-05 13:54:41 -07:00
Imperadeiro98
cc8fec9283
Update pt-PT.coffee
2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4
Update pt-PT.coffee
2014-07-05 19:11:06 +01:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Tery Lim
a5476f90ed
Minor cleanup for convention and readability
2014-07-05 18:48:08 +08:00
Scott Erickson
b635c4cf16
Fixes #1220 . Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.
2014-07-04 20:45:42 -07:00
Scott Erickson
dc49499679
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-04 18:12:10 -07:00
Scott Erickson
41a8d21bfe
Merged conflicts.
2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af
Merged conflicts.
2014-07-04 18:11:26 -07:00
Scott Erickson
92948e64b5
Merge pull request #1245 from greyhusky/patch-2
...
new translations
2014-07-04 18:09:02 -07:00
Scott Erickson
be3a428b50
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-04 18:02:12 -07:00
Scott Erickson
eed521fb8c
Merged conflicts.
2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5
Merged conflicts.
2014-07-04 17:54:24 -07:00
Scott Erickson
81121faebf
Merge pull request #1242 from differentmatt/master
...
Fix Placement Agreement typo
2014-07-04 17:39:38 -07:00
Scott Erickson
4e284d81b7
Handled conflicts, throwing out changes to ladder_tab.coffee.
2014-07-04 17:36:10 -07:00
Scott Erickson
1ce55e356c
Making the ladder tab reload when social network friends load. See #1196 .
2014-07-04 17:32:16 -07:00
Scott Erickson
ca8394621d
Fixes #1223
2014-07-04 11:46:33 -07:00
Scott Erickson
f553a1c493
Merge pull request #1256 from rubenvereecken/patch_fix
...
Patch fix: applyDelta now always called
2014-07-04 11:45:22 -07:00
Ruben Vereecken
08030dc785
Cleaned up patch rendering logic
2014-07-04 20:18:26 +02:00
Ruben Vereecken
44c84b3689
proofed the SearchView's runSearch
2014-07-04 19:36:55 +02:00
Ruben Vereecken
a367082cc4
Corrected statistic logic, wrote test case
2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b
All edits are now tracked
...
intermediate
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
7a4c6daec8
stats.gamesCompleted is now tracked in users
2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4
Added achievement preview, exp test, stuff
2014-07-04 19:27:37 +02:00
Ruben Vereecken
45798aab02
added images for achievements! Demo is now operational
2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
fe5b675d18
Achievement polling now successfully tested
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
1fe2c67ffe
Added tests for repeatable achievements, including complicated xp
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
6e4170012f
Made sure applyDelta is called in all cases
2014-07-04 18:38:15 +02:00
Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Tery Lim
329f0e7e22
Clean up for coffeescript convention
2014-07-04 22:23:47 +08:00
Ruben Vereecken
63401025f6
proofed the SearchView's runSearch
2014-07-04 15:13:06 +02:00
Scott Erickson
2855d2a402
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
...
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
2014-07-03 17:41:58 -07:00
Michael Schmatz
cc917162a7
Fixed doober alignment
2014-07-03 17:01:09 -07:00
Michael Schmatz
6a33ca0892
Removed autoscrolling
2014-07-03 16:40:00 -07:00
Michael Schmatz
d3cc9ae179
10 pixel margin on photos
2014-07-03 16:33:10 -07:00
Michael Schmatz
45e3da0945
Hover on logout button
2014-07-03 16:32:20 -07:00
Michael Schmatz
615303395c
Various fixes for recruiting page
2014-07-03 16:30:27 -07:00
Michael Schmatz
6c31f08853
Unchecked all by default
2014-07-03 15:48:50 -07:00
George Saines
4d12aff35e
removing the counselor from the contribute page and all other links
2014-07-03 15:42:24 -07:00
George Saines
6d438319ab
Merge branch 'employer-redesign' of https://github.com/codecombat/codecombat into employer-redesign
2014-07-03 15:17:41 -07:00
George Saines
88b0a0a97b
making changes to the employer page icon dimensions
2014-07-03 15:17:38 -07:00
Michael Schmatz
52ddb8db62
Add login link and rounded corners for pics
2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c
Added login button and fixed bg color
2014-07-03 14:40:39 -07:00
Michael Schmatz
538344094b
Fixed filter behavior
2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3
Filter functional
2014-07-03 11:39:44 -07:00
Michael Schmatz
b58f2c49eb
Fix description
2014-07-03 10:22:50 -07:00
Michael Schmatz
49e4dd71ae
Merge branch 'master' into employer-redesign
...
Conflicts:
app/schemas/models/user.coffee
2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a
Filter button
2014-07-03 10:14:32 -07:00
Michael Schmatz
e54b190918
Added shortDescription
2014-07-03 10:02:42 -07:00
Imperadeiro98
dbdd8c672c
Update pt-PT.coffee
2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034
Update pt-PT.coffee
2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b
Update pt-PT.coffee
2014-07-03 13:55:50 +01:00
Michael Schmatz
397140d9b0
Basic filtering
...
Only visas work
2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b
Basic filtering functionality
...
Still has a few bugs
2014-07-02 15:48:26 -07:00
Dominik Kundel
484749400e
Merge remote-tracking branch 'upstream/master'
2014-07-02 20:54:46 +02:00
Dominik Kundel
004a14ae3c
fixed autocomplete issue related to switching the programming language
2014-07-02 20:52:16 +02:00
Michael Schmatz
1adefbb3b6
Update user schema (to avoid cherry picking)
2014-07-02 11:50:44 -07:00
Michael Schmatz
c6cc28b976
Various fixes to enable employers page to function correctly
2014-07-02 11:45:00 -07:00
Michael Schmatz
7eeb964d3e
Restyled employers page
2014-07-02 11:44:45 -07:00
Michael Schmatz
8e6807ab60
Redesigned layout of employers page
2014-07-02 11:44:33 -07:00
Michael Schmatz
fe08fdb2b0
Made new recruitment base styles
2014-07-02 11:43:39 -07:00
Michael Schmatz
5da1db8f6e
Made new recruitment base layout
2014-07-02 11:43:26 -07:00
Michael Schmatz
ebc79668ef
Added image assets for recruitment page
2014-07-02 11:42:02 -07:00
Michael Schmatz
f756a16aa4
Added curated section to user schema
2014-07-02 11:41:14 -07:00
greyhusky
467b9adf74
new translations
...
i translated some parts, will translate more later
2014-07-02 11:33:19 +02:00
Dominik Kundel
3f57644b0b
Merge remote-tracking branch 'upstream/master'
2014-07-01 19:58:01 +02:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Michael Schmatz
2dd4ba6203
Increased max skills from 30 to 40
2014-06-30 16:43:31 -07:00
Matt Lott
ffdd73a503
Fix Placement Agreement typo
2014-06-30 16:01:00 -07:00
Dominik Kundel
568e334f13
Merge remote-tracking branch 'upstream/master'
2014-06-28 12:53:20 +02:00
Dominik Kundel
6ea2f1c76d
added title for tab trigger
2014-06-28 12:53:09 +02:00
Nick Winter
66da53f8f9
Launching the language selector on the front page.
2014-06-27 10:21:38 -07:00
Nick Winter
58bf85d234
Simulator handles when there are no Greed matches to randomly simulate.
2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e
Exposing Vector z property. Getting ready to use new builtin property documentation.
2014-06-27 00:36:18 -07:00
Philippe Rigovanov
dd6209cd99
Update ru.coffee
...
With @M-r-A fixes
2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6
Update ru.coffee
...
With fixes from [M-r-A](https://github.com/M-r-A )
2014-06-27 04:11:46 +04:00
Michael Schmatz
28bb28cf85
Fixed employer view for manually created candidates
2014-06-26 17:07:17 -07:00
George Saines
a94053fd1d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-26 10:38:18 -07:00
George Saines
e294133bcf
adding the files I forgot
2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94
Merged in the language-war branch.
2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0
Improved per-language spell palette and tab documentation.
2014-06-25 22:56:39 -07:00
Nick Winter
4cebf1f434
Merge pull request #1232 from Darredevil/patch-11
...
Added new tip tag
2014-06-25 21:23:41 -07:00
Darredevil
c6f19f7d3a
Added new tip tag
2014-06-26 06:23:36 +03:00
Nick Winter
8c6ee66684
Better handling of alternate spell palette documentation syntax for other code languages.
2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b
Added a joke tip
2014-06-26 02:11:15 +03:00
Philippe Rigovanov
f2898e3bc0
Update diplomat.jade
...
added myself to diplomats
2014-06-26 00:56:41 +04:00
Inez KEMENES
96f74183a5
Update hu.coffee
2014-06-25 17:28:13 +02:00
Nick Winter
04976a7b14
Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225 .
2014-06-24 21:08:01 -07:00
Nick Winter
512e287b6a
Merge pull request #1184 from greyhusky/patch-1
...
Update de-CH.coffee
2014-06-24 17:41:32 -07:00
George Saines
b5ec38f811
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a
modifying the employer page to be more explanatory
2014-06-24 16:43:27 -07:00
Nick Winter
dd9b8a0018
Migrating from tileGroupNumber to tileGroupLetter.
2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98
Messing with marks.
2014-06-24 15:45:33 -07:00
Michael Schmatz
e3a87156a2
Send BCC email to employer when contacting candidates
2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4
Patch modal handles invalid patches.
2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61
Changed the versions history modal to show name and date.
2014-06-24 16:41:55 -04:00
Scott Erickson
327d273cbe
Fixed gplus login.
2014-06-24 14:44:37 -04:00
Michael Schmatz
988ad6ffda
Attempting to fix G+
2014-06-24 11:29:43 -07:00
Scott Erickson
0363166736
Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.
2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3
Fixed bug showing spell palette for languages missing any code snippets.
2014-06-24 10:17:38 -07:00
Nick Winter
8719b80663
Showing expired profiles to admins.
2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2
A bit of error logging for #1220 .
2014-06-24 09:43:20 -07:00
Nick Winter
3862bd2376
Clearing backups of old models when saving new versions of versioned models.
2014-06-24 09:43:20 -07:00
Scott Erickson
dde43d5df3
Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups.
2014-06-23 16:57:54 -04:00
Nick Winter
815ef88e78
Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.
2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f
Fix #1207
2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb
Added new level "K-means++ Cluster Wars"
...
Added new level "K-means++ Cluster Wars"
2014-06-23 03:43:54 +03:00
Nick Winter
a267933f0b
Merge pull request #1200 from Airunedz/patch-1
...
Improve Spanish (Spain) translations
2014-06-22 15:39:43 -07:00
Philippe Rigovanov
f7ec30a586
Update ru.coffee
2014-06-23 01:55:45 +04:00
Nick Winter
105d22c802
Merge pull request #1202 from kumabotz/minor-cleanup
...
Minor cleanup
2014-06-22 07:56:15 -07:00
Nick Winter
8698589625
Applying Scott's fix for #1198 .
2014-06-22 07:55:29 -07:00
Tery Lim
f03f8da50a
Remove extra spaces
2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d
Fix typo
2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7
Remove trailing comma
2014-06-22 16:39:07 +08:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Airunedz
dfff43d66a
Improve Spanish (Spain) translations
...
Changes: Add some translations to Spanish (I'm from Spanin)
2014-06-22 01:07:05 +02:00
Nick Winter
1f29a923cf
Fixed playing multiplayer levels without an opponent, against the AI.
2014-06-21 12:24:14 -07:00
Nick Winter
6813279871
Fixed an infinite loop timeout issue.
2014-06-21 10:56:55 -07:00
Nick Winter
a8f4baebbc
Restricted some more analytics.
2014-06-21 09:47:48 -07:00
Nick Winter
564c463431
Stop tracking Simulator events to Mixpanel.
2014-06-21 09:17:56 -07:00
Nick Winter
52b2e756ef
Merge pull request #1195 from thanosme/patch-1
...
Update el.coffee
2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5
Update el.coffee
2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf
A bit of cleanup.
2014-06-20 20:52:50 -07:00
Nick Winter
17366af245
Merge pull request #1188 from a1ip/master
...
Update ru.coffee
2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c
Merge pull request #1181 from djsmith85/patch-1
...
Update de.coffee
2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2
Merge pull request #1180 from djsmith85/patch-2
...
Update de-DE.coffee
2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa
Merged.
2014-06-20 20:41:34 -07:00
Nick Winter
60ca6e46d3
Ooops, that's a function.
2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb
Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.
2014-06-20 17:19:18 -07:00
Fergus Leen
88aa8d234c
Facebook friends patch
2014-06-20 02:18:40 +01:00
Nick Winter
bb8b9b2e93
bid -> makeBid.
2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754
Increased infinite loop timeout
2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad
Temporary fix for bid function in hover debugger
2014-06-19 17:09:45 -07:00
Nick Winter
7b59c42f5d
Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.
2014-06-19 15:41:35 -07:00
thanosme
625750614a
Update el.coffee
...
Added some tranlations with minor corrections
2014-06-20 01:14:30 +03:00
Nick Winter
1e9b403ce5
More zazz for home page code language selection.
2014-06-19 14:55:16 -07:00
Nick Winter
cf57411b5c
Added another logging message for more easily seeing when transpiled code might be misfiring.
2014-06-19 13:42:38 -07:00
Nick Winter
666c020389
Switching code language based on selection now.
2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be
Fixed a bug with logging missing documentation.
2014-06-19 16:15:38 -04:00
Nick Winter
a58f3e0fb6
More styling work on code language selector.
2014-06-19 12:31:56 -07:00
Michael Schmatz
51923459e0
Changed autocomplete to on by default
2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244
Merge pull request #1186 from dkundel/master
...
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730
Emergency linkedin hot fix
2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78
Working on home language selection.
2014-06-19 08:06:34 -07:00
Philippe Rigovanov
ebaeac7e80
Some translations
2014-06-19 05:42:15 +04:00
Dominik Kundel
7e8845332e
updated Ace minified
2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05
updated Ace
2014-06-18 23:18:58 +02:00
Michael Schmatz
548eaefae1
Add debug variable inspection progress bar
2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e
Merge remote-tracking branch 'upstream/master'
2014-06-18 21:50:55 +02:00
Nick Winter
ac6c7292c8
Fixed Gridmancer session linking on profile view.
2014-06-18 12:05:40 -07:00
Scott Erickson
50fea7e937
Added a method for returning all requests in mock-ajax.
2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524
Maybe fixing the toggleModal system once and for all.
2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465
merge conflict solved
2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b
integrated autocomplete
2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244
Update de-CH.coffee
...
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
2014-06-18 11:09:10 +02:00
Nick Winter
59654da24b
Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.
2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc
ModelModal now grants real ultimate power.
2014-06-17 15:17:25 -07:00
djsmith85
2fff271200
Update de-DE.coffee
...
Updated a few translations in the German locale file.
2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880
Update de.coffee
...
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f
Added UserRemarks.
2014-06-17 13:03:13 -07:00
Scott Erickson
3e24b2f86e
Fixed tests running in karma.
2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81
Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.
2014-06-16 11:40:09 -07:00
Scott Erickson
ee791da34c
Moved services into their own folder, and made no services run for both testing and demo pages.
2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25
Refactored vendor loading
2014-06-16 11:40:09 -07:00