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

2073 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dominik Kundel
fca5bbfb1f added aceConfig to user schema 2014-03-14 02:08:31 +01:00
Nick Winter
42a8862fa9 Merge pull request #541 from dkundel/master 
Easy use of coordinates as discussed in #10 and minor fixes
 2014-03-13 18:05:04 -07:00
Darredevil
88659aa191 Update ro.coffee 
Check line 234
Also need alternative for the word "ladder" in this context, there is translation that makes sense(will try to see how other games translate it and come back)
 2014-03-14 03:00:32 +02:00
Nick Winter
a22c390568 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 17:59:21 -07:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
Dominik Kundel
6f2a04c5c0 added new editor config modal 2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32 added button to access new modal for editor config 2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b highlight lines after insertion 2014-03-14 00:52:18 +01:00
Michael Schmatz
68f2679421 Merge pull request #542 from codecombat/master 
Master into production
 2014-03-13 16:12:56 -07:00
Michael Schmatz
edb28f6caf Changed cron handler IP check 2014-03-13 16:11:44 -07:00
Nick Winter
8ccd12866e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:46:53 -07:00
Scott Erickson
8431fd1e57 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:45:41 -07:00
Scott Erickson
abd50b9495 Fixed the new build queue system for levels where there are multiple builders for a single thang type. 2014-03-13 15:45:24 -07:00
Nick Winter
8554de7c4b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2 Merge branch 'master' of github.com:codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c Various changes to spectate view 2014-03-13 15:22:35 -07:00
Scott Erickson
b2e9768127 Set up a build queue for async sprite sheet building, which lessens blocking the main thread. 2014-03-13 13:25:03 -07:00
Scott Erickson
c238b49f52 Fixed initial wizard position. 2014-03-13 11:07:08 -07:00
Nick Winter
485b179f5d Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee. 2014-03-13 10:33:20 -07:00
Nick Winter
2b41efe466 Resolved some merge conflicts. 2014-03-13 10:32:18 -07:00
Nick Winter
9d8b8e7395 Probably too mean to tell users that their password is wrong three times, so just once will do. 2014-03-13 10:27:32 -07:00
TigroTigro
206af3184d Update diplomat.jade 2014-03-13 18:01:52 +01:00
Björn Kimminich
055241c994 Update de.coffee 2014-03-13 17:57:27 +01:00
Nick Winter
ff76e0b303 Merge branch 'master' into production 2014-03-13 09:07:23 -07:00
TigroTigro
94e7e6185b Update pl.coffee 2014-03-13 17:04:22 +01:00
TigroTigro
13fce18d5f Update pl.coffee 2014-03-13 17:03:07 +01:00
Nick Winter
c8103154a9 Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n. 2014-03-13 09:02:19 -07:00
Nick Winter
2d848b4cce Merged some conflicts. 2014-03-13 08:39:53 -07:00
Nick Winter
4ad0fba860 Merge pull request #537 from jayant1992/master 
UI and UX improvements to editor
 2014-03-13 07:07:13 -07:00
Nick Winter
0be08574fc Merge pull request #536 from bkimminich/master 
Added/fixed some German translations
 2014-03-13 07:05:17 -07:00
Nick Winter
3e50e0c58c Merge pull request #535 from M-r-A/patch-1 
Update i18n
 2014-03-13 07:04:45 -07:00
Nick Winter
10e4bc737a Merge pull request #534 from Shrihari/fix-grid-toggle 
Fix Grid Toggle consistency
 2014-03-13 06:50:56 -07:00
Björn Kimminich
87ddd10dd4 Update diplomat.jade 2014-03-13 14:19:59 +01:00
Björn Kimminich
e87031afa0 Update de.coffee 2014-03-13 14:18:57 +01:00
Jayant Jain
17debf49e6 Implements smoother panning around the map for keyboard controls 2014-03-13 18:32:23 +05:30
Alexei Nikitin
e7c85d76b9 Update ru.coffee 2014-03-13 03:24:33 -07:00
Alexei Nikitin
3b04cd1e19 Update en.coffee 2014-03-13 03:24:26 -07:00
Alexei Nikitin
f844a4f630 Update ru.coffee 2014-03-13 03:07:55 -07:00
Shrihari
fb7f64ddb0 Grid toggle consistent with the button and the shortcut 2014-03-13 15:21:00 +05:30
Shrihari
d230c267a3 Fixed a locale issue which was making brunch fail 2014-03-13 15:00:00 +05:30
Jayant Jain
3c1ebc25ca Sass changes for footer and search in editor 2014-03-13 13:30:30 +05:30
Jayant Jain
c24469e86b Minor UI updates to level editor's thang tab 2014-03-13 12:19:51 +05:30
Nick Winter
8be2f8c455 Used i18n script to add new i18n tags to other languages. 2014-03-12 21:21:23 -07:00
Nick Winter
19a30bb1c7 Saved some commented-out translations. 2014-03-12 21:16:16 -07:00
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Dominik Kundel
5c97fea363 fixed issue of multiple insertions due to multiple event handlers 2014-03-13 03:38:34 +01:00
Dominik Kundel
c01d29907d try to achieve higher contrast between background and 'executing' line 2014-03-13 03:08:28 +01:00
Dominik Kundel
60214abb41 Change cursor if moving on map with pressed 'shift' 2014-03-13 02:50:09 +01:00
Michael Schmatz
6f87b79cb5 Merge pull request #533 from codecombat/master 
Master into production
 2014-03-12 17:52:47 -07:00