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

569 commits

Author SHA1 Message Date
Nick Winter
04d74fb76f Fixed bug with scale not updating properly when paused. 2014-04-29 16:04:30 -07:00
Nick Winter
bea0589fad Fixed #935. 2014-04-29 15:31:18 -07:00
Nick Winter
369ea8a00f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 19:09:04 -07:00
Nick Winter
aea49cc27f Fixed bobbing. 2014-04-28 18:36:46 -07:00
Scott Erickson
bcad939eae Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 18:31:04 -07:00
Scott Erickson
57beb94b5c Fixed a bug with the levelloader loading articles. 2014-04-28 18:30:47 -07:00
Nick Winter
b954e70d85 Let's try 30 FPS. Fixed Surface destruction bug. 2014-04-28 17:06:43 -07:00
Nick Winter
0b947dbeee Let's try 30 FPS for a while now. 2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Michael Schmatz
544cc62cdb First steps towards hover debugger improvements 2014-04-28 15:05:54 -07:00
Scott Erickson
01f2a556f9 Set up the patches view with the new loading system, fixing a few things in the meanwhile. 2014-04-28 11:09:21 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Nick Winter
fc6ad1dd01 Properly tracking first-frame team gold. Slightly more visible team gold on hover. 2014-04-27 20:11:11 -07:00
Nick Winter
a7179ae3b2 Fixed some more gold view stuff. 2014-04-27 15:33:16 -07:00
Nick Winter
fa0e7f04f7 Fixed a thing. 2014-04-26 14:21:26 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
14d62915f4 Got projection and backups set back up, partially fixed the level editor. 2014-04-25 16:14:05 -07:00
Nick Winter
d8d2a57c38 Listed a few new levels. 2014-04-25 15:00:46 -07:00
Scott Erickson
7640a6365b Removed some logs. 2014-04-25 14:59:17 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Michael Schmatz
628a784ac4 Progress towards LinkedIn integration 2014-04-23 11:25:36 -07:00
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
Scott Erickson
e8da248302 Made the level editor not break when using units that are incomplete. 2014-04-22 10:39:15 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
dpen2000
75b759b1dc Add system names into delta messages 2014-04-18 17:25:25 -04:00
dpen2000
b20f8fd260 Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee 2014-04-18 21:06:57 +01:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Ting-Kuan
360e594f3d Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views 
Conflicts:
	server/commons/Handler.coffee
 2014-04-17 12:58:29 -04:00
Scott Erickson
9ed876d12a Some bug fixes to get Anya import to work. 2014-04-16 09:25:34 -07:00
Scott Erickson
bf7117d1c6 Merge pull request #854 from dpen2000/ShadowsIssue 
Fix #736 Invisible thangs still have shadows
 2014-04-16 08:38:59 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Scott Erickson
94c4179417 Fixed some things that were keeping brunch from working. 2014-04-16 08:03:41 -07:00
edtrist
5aa1afbf7a Fix console.warning bug that prevents page from loading 2014-04-16 00:03:43 +01:00
dpen2000
eae2ba6913 Fix #736 Invisible thangs still have shadows 2014-04-15 18:32:29 -04:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Nick Winter
03df078d5a Couple job profile fixes. 2014-04-15 08:39:18 -07:00
Nick Winter
1239617bd4 Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp. 2014-04-14 16:34:11 -07:00
Nick Winter
89ec5c900b Trying synchronous spritesheet building during level loading for speed. 2014-04-14 14:50:25 -07:00
Scott Erickson
dd36cdd092 Fixed #836 2014-04-14 11:14:09 -07:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Nick Winter
7fcff825a8 Fixed #310 by tweaking the styling to emphasize stroke over fill. 2014-04-13 16:42:21 -07:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -04:00
Aditya Raisinghani
ffd057899e Removed anon name collisions and reset anon user name if name is taken in interim. 2014-04-13 17:55:49 +05:30
Ting-Kuan
508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
 2014-04-12 17:07:30 -04:00
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Nick Winter
99ead5d193 #223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff. 2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6 Change populate model to accept resource name. 2014-04-11 22:35:20 -04:00
Michael Schmatz
7ddd84248b Simulator fixes! 
Fixed memory bug with aggregation framework
 2014-04-11 17:11:57 -07:00
Scott Erickson
bbb9fb7a64 Added a patches view. 2014-04-11 14:19:17 -07:00
Nick Winter
10bb17c38a Added getThangByID method to Thang. Handled a few error corner cases with the time popup. 2014-04-11 14:03:13 -07:00
Scott Erickson
e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader 
Conflicts:
	app/views/kinds/CocoView.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-11 11:19:16 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00
Michael Schmatz
e17fbdae73 Fixed common programmables not being saved 2014-04-10 14:08:20 -07:00
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Ting-Kuan
3ea4d1677c able to load level editor. 2014-04-09 15:11:59 -04:00
Nick Winter
3325c55c3f Fixed #759. 2014-04-08 14:58:34 -07:00
Ting-Kuan
16fe28ff55 Add ResourceManager. 2014-04-07 16:27:50 -04:00
Nick Winter
255cef83fb Fixed #738. 2014-04-03 16:16:53 -07:00
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Nick Winter
bfa71d01ff Merged. 2014-04-01 10:31:22 -07:00
swapnesh
497563bc0a Added more names for #53 2014-04-01 17:50:33 +05:30
Nick Winter
a319e183b6 Fixed a little mistake with user signup. 2014-03-31 14:02:15 -07:00
Nick Winter
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Nick Winter
cb27124285 Fixed #135. 2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions. 2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1 Merged 2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d Added Thang names 2014-03-30 20:43:48 +01:00
Nick Winter
e08265a725 Merge pull request #730 from Darredevil/master 
Added setGoalState
 2014-03-29 14:04:33 -07:00
Darredevil
c4de6ef996 Added setGoalState 2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103 Added setGoalState 2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d Added setGoalState 2014-03-29 03:52:02 +02:00
Nick Winter
cf81d51a89 Fixed #46. 2014-03-28 15:23:12 -07:00
Nick Winter
62f2fe80c3 Updated CoordinateDisplay styles; fixed #10. 2014-03-28 11:55:24 -07:00
Nick Winter
127c4a4e0f Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging. 2014-03-27 13:36:33 -07:00
Scott Erickson
fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
 2014-03-26 14:29:16 -07:00
Nick Winter
544070e578 Fix for infinite loop fix. 2014-03-26 12:34:45 -07:00
Nick Winter
515b8723a3 Simulator handles more errors. 2014-03-26 12:12:43 -07:00
Nick Winter
127eb3cef6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:32:49 -07:00
Nick Winter
cab343b0b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14 Added infinite loop handling to Simulator. 2014-03-26 11:25:05 -07:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30