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

3842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ruben Vereecken
0be03aa1fe Refactored conflicted name checking so it can be used in more places 2014-07-13 17:47:08 +02:00
Ruben Vereecken
252edef9e5 Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all. 2014-07-13 17:47:08 +02:00
Ruben Vereecken
c3427bc200 User Settings is now without auto-save 2014-07-13 17:47:08 +02:00
Ruben Vereecken
a9074ce603 anonymous users are now warned if their new name is already chosen 2014-07-13 17:47:07 +02:00
Ruben Vereecken
1a587b607f GET /auth/name/<name> now serves possible free names 2014-07-13 17:47:07 +02: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
bbc1228c9c Merge pull request #1307 from kumabotz/minor-cleanup 
Remove extra require and minor cleanup
 2014-07-13 08:25:16 -07:00
Tery Lim
bc3b0645ea Remove extra require and minor cleanup 2014-07-13 23:18:55 +08: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
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
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
Scott Erickson
ad2e01ee61 Fixed a couple tests. 2014-07-10 14:31:50 -07:00
Nick Winter
f17e24013b Fixed #1217 (scaleFactor, debug shapes). 2014-07-10 14:22:15 -07:00
Scott Erickson
cf63989ee3 Tweak to make sure errors are noticed. 2014-07-10 14:18:35 -07:00
Nick Winter
b82e828272 Merge pull request #1290 from jayant1992/master 
Takes care of minor issues with terrain generator
 2014-07-10 13:24:58 -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
Nick Winter
2a571b5ce2 Merge pull request #1289 from jayant1992/terrain-generator 
Terrain generator
 2014-07-10 11:55:16 -07:00
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
f3f57c8581 Merge branch 'rubenvereecken-nameable_users' 2014-07-10 11:28:30 -07:00
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