Commit graph

598 commits

Author SHA1 Message Date
Nick Winter
f74a152942 Fixed #1104. 2014-08-28 18:55:33 -07:00
Nick Winter
54207f0f7d Fixed #1000. 2014-08-28 10:50:20 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
28176c7f72 Misc workarounds. 2014-08-20 13:26:48 -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
366dfadba5 Fixed a bug in IDify. 2014-08-15 10:36:21 -07:00
Scott Erickson
8233df514e Added an acceptor field to patches. 2014-08-15 10:36:21 -07:00
Scott Erickson
7db821309a Tweaked isRecalculable. 2014-08-15 10:11:22 -07:00
Scott Erickson
ca83023591 Tweaked the earned achievement recalculator. 2014-08-15 10:11:22 -07:00
Ruben Vereecken
4f22723084 Added Query streams wherever possible to ease server load. 2014-08-15 10:11:11 -07:00
Scott Erickson
34207d28c9 Streamifying and optimizing the recalculating of stats scripts. 2014-08-15 10:10:52 -07:00
Ruben Vereecken
40818fd7bc GitHub Login implemented 2014-08-15 16:20:45 +02:00
Matt Lott
98bed57751 Merge pull request #1441 from differentmatt/master
Instrument user code problems
2014-08-14 16:17:47 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Matt Lott
9b79e2ca27 Instrument user code problems 2014-08-14 13:32:00 -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
Ruben Vereecken
5f7ef825f8 Introduced findBySlugOrId to fix a bug 2014-08-14 16:38:50 +02:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Scott Erickson
04e8680263 Added an endpoint for loading all items. 2014-08-13 10:35:14 -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
Nick Winter
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Nick Winter
9a1dd412c9 Added Delighted feedback emails. 2014-08-09 23:11:26 -07:00
Ruben Vereecken
e6569539dc User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02: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
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +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
Ruben Vereecken
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Nick Winter
84ccde9fd3 Merged User editableProperties move with adding savedEmployerFilterAlerts to editableProperties. 2014-08-04 12:48:41 -07:00
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Michael Schmatz
2c809759a3 Merge pull request #1395 from rubenvereecken/master
Added test cases for fetching related by user slug instead of ID
2014-07-31 08:08:53 -07:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
f3e5b30f11 Merge remote-tracking branch 'upstream/master' 2014-07-29 16:50:31 +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
0f3b049189 Added test cases for fetching related by user slug instead of ID 2014-07-29 12:48:31 +02:00
Michael Schmatz
2e3234fc58 Merge pull request #1394 from rubenvereecken/master
First step towards fetching related by slug
2014-07-28 12:31:25 -07:00
Ruben Vereecken
cc7474538f First step towards fetching related by slug 2014-07-28 21:25:11 +02:00
Ruben Vereecken
a03e3aedd1 Managed to recalculate translation/misc patches after all 2014-07-24 19:43:09 +02:00
Ruben Vereecken
b2c11fa087 Added achievement recalculation script 2014-07-24 15:05:26 +02:00
Ruben Vereecken
3191c87cf1 Added recalculation for patches. Struggled with translations. Won't recalculate those probably 2014-07-24 14:41:06 +02: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
Ruben Vereecken
2394bd8129 Added the recalculation script for a couple of statistics 2014-07-23 15:22:53 +02:00
Ruben Vereecken
ebfe1fc1c0 Proofed admin endpoint some more, no more dangling connections 2014-07-23 13:06:51 +02:00
Ruben Vereecken
19d59ac8ff Refactored Users and Level Sessions to have private properties: 2014-07-22 20:07:00 +02:00
Michael Schmatz
22fabe13ea Increased scoring task timeout to 10 minutes
Temporary increase until we can increase it only for Brawlwood
2014-07-22 06:59:47 -07:00