Commit graph

170 commits

Author SHA1 Message Date
Scott Erickson
9ba11e2354 Got the WebGLSprite to work with nested MovieClips. 2014-09-15 15:08:02 -07:00
Scott Erickson
a633f6f82f Built most of the WebGLSprite. 2014-09-15 13:53:20 -07:00
Scott Erickson
08bdcb2cb6 Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it. 2014-09-12 16:33:01 -07:00
Scott Erickson
5551c622fa Added a new test to webgl: making giant canvases. 2014-09-11 11:36:26 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Scott Erickson
a4b3a09eff Added a webgl demo, testing a bunch of performance things. 2014-09-05 12:48:48 -07:00
Nick Winter
632559f7db Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'. 2014-09-01 20:53:53 -07:00
Scott Erickson
b4d9a787f0 Fixed the rest of the server tests. 2014-08-29 16:28:07 -07:00
Scott Erickson
0ba9db6c14 Fixed some server tests. 2014-08-29 12:58:23 -07:00
Scott Erickson
154b91c753 Changed LevelLoader to always deeply load components and thang types, not just for hero levels. 2014-08-28 15:19:04 -07:00
Scott Erickson
8b056cfb8f Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself. 2014-08-28 11:24:45 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Scott Erickson
98752159ca Made the SuperModel a little bit more clever about handling duplicate loaded models. 2014-08-26 16:31:53 -07:00
Scott Erickson
39d0df5153 Fixed name ordering in the thang components editor. 2014-08-26 13:27:17 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f Bunch of fixes to the thang component edit view. 2014-08-26 09:48:33 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
Nick Winter
e48b218533 Projected models can now update their projections and re-fetch. Hero ThangTypes now do this. 2014-08-25 15:39:47 -07:00
Scott Erickson
1669871acc Fixed a demo. 2014-08-25 11:39:38 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -07:00
Scott Erickson
86ba46b64c Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand. 2014-08-18 13:43:17 -07:00
Nick Winter
03e39c3f5c Fixed Level denormalize test. 2014-08-15 11:15:48 -07:00
Scott Erickson
8233df514e Added an acceptor field to patches. 2014-08-15 10:36:21 -07:00
Matt Lott
98bed57751 Merge pull request #1441 from differentmatt/master
Instrument user code problems
2014-08-14 16:17:47 -07:00
Scott Erickson
9404c40b47 Another stab at fixing the tests. 2014-08-14 14:22:02 -07:00
Scott Erickson
2060bb5ac5 Turning off a test that for some reason is breaking on Travis but nowhere else. 2014-08-14 14:07:20 -07:00
Scott Erickson
827f6ee8b8 Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way. 2014-08-14 14:04:03 -07:00
Matt Lott
9b79e2ca27 Instrument user code problems 2014-08-14 13:32:00 -07:00
Scott Erickson
f9e8bfad9f Made some minor changes. 2014-08-13 13:45:24 -07: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
19b9a99167 Fixed some tests. 2014-08-13 10:48:22 -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
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Scott Erickson
88252806c7 Fixed #1413. 2014-08-11 18:47:41 -07:00
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Ruben Vereecken
672b0f54f6 Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +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
Scott Erickson
29770bd220 Added a function for denormalizing levels, extending level thang components and configs with ones from thang types. 2014-08-06 15:18:22 -07: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
0f3b049189 Added test cases for fetching related by user slug instead of ID 2014-07-29 12:48:31 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a03e3aedd1 Managed to recalculate translation/misc patches after all 2014-07-24 19:43:09 +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