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

4560 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Scott Erickson
dc27f25a37 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-10 11:13:20 -07:00
Scott Erickson
e18b906e04 Name conflicts migration script. 2014-07-10 11:13:11 -07:00
Michael Schmatz
2eeb7ec5aa Make random games come from all levels 2014-07-10 10:42:59 -07:00
Ruben Vereecken
9e296b7c3d Added a test case for unsetting slugs (and fixed related bug) 2014-07-10 18:24:02 +02:00
Ruben Vereecken
94210fc461 Anonymous users are now silently renamed upon signup in case of conflict 2014-07-10 18:00:32 +02:00
Nick Winter
9ee373428f Fixed some schema issues related to snippets and code languages. 2014-07-10 08:31:40 -07:00
Ruben Vereecken
6e593b2ec0 User name slugs can now be unset by emptying their name 2014-07-10 10:46:41 +02:00
Ruben Vereecken
750d94c478 Noty errors don't show up on user save fails anymore 2014-07-10 10:30:23 +02:00
Ruben Vereecken
a310afc750 Corrected sending errors in auth 2014-07-10 10:07:36 +02:00
Nick Winter
7e0da9f12a Merge pull request #1284 from nemoyatpeace/patch-1 
Update play_view.coffee
 2014-07-09 18:34:21 -07: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
6d467adb46 Merge branch 'Darredevil-master' 2014-07-09 15:34:06 -07:00