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

763 commits

Author SHA1 Message Date
Nick Winter
9fd31c70e7 Hid parts of game menu that aren't ready yet. 2014-08-12 09:13:23 -07:00
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
31d7e641e6 Fixes for equipping items and adding them to the World. 2014-08-11 11:04:38 -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
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
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Nick Winter
cc0ea25262 Merge pull request #1412 from rubenvereecken/meh 
Table headers are now unhoverable
 2014-08-08 08:38:05 -07:00
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
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
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07: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
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
Jayant Jain
dc66218c00 Adds undo and redo buttons in editor topbar 2014-07-25 18:06:34 +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
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
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
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
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -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
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02: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
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
a7905db316 Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible. 2014-07-20 15:51:48 -07:00
Darredevil
f8cc64dc4c fix for no user logged 2014-07-20 22:14:33 +03: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
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
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12: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
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Scott Erickson
6f09e95d68 Removed background from job profile view. 2014-07-17 09:22:52 -07:00