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
4561 commits 27 branches 0 tags 134 MiB
Commit graph

519 commits

Author SHA1 Message Date
Nick Winter
63f2c5db4f Fixed #1268. 2014-08-29 17:33:25 -07:00
Scott Erickson
570380c2a4 Merge branch 'master' into feature/defaults 2014-08-29 08:14:43 -07:00
Nick Winter
a4b2333fd3 Added Systems documentation. Fixed #1115. 2014-08-28 22:32:55 -07:00
Scott Erickson
2dde77f8b0 Merge branch 'master' into feature/defaults 2014-08-28 15:26:04 -07:00
Nick Winter
1094d09aa5 Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode. 2014-08-28 11:23:52 -07:00
Nick Winter
54207f0f7d Fixed #1000. 2014-08-28 10:50:20 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239 Fixed a bug with old, un-migrated level-set-playing events in button handlers. 2014-08-28 09:52:51 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
2ef7bff2c5 Fixed #886. 2014-08-27 17:54:16 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Nick Winter
50ad453345 Fixed #169. 2014-08-26 14:34:23 -07:00
Scott Erickson
ef8ca9874a For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default. 2014-08-26 10:28:01 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -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
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Nick Winter
8777a87774 Made a real-time playback button. 2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Nick Winter
6fee881efd Fixed a few more issues with playback. 2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
def4d01c8e Starting to let us control the size of the achievements popup, although much more Sass math is needed. 2014-08-19 19:21:36 -07:00
Scott Erickson
9f6bfb854d Fixed the markdown treema node after changes to the ace editor node on treema broke things. 2014-08-18 16:04:43 -07:00
Nick Winter
f1a9848366 Fixed a couple errors. 2014-08-15 10:27:36 -07:00
Nick Winter
32c74db282 Merge pull request #1442 from dkundel/master 
Fixing most of the issues described in #18
 2014-08-15 09:02:15 -07:00
Dominik Kundel
755a86e3d3 moving some styling 2014-08-15 01:56:01 +02: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
Dominik Kundel
702656ad02 Merge remote-tracking branch 'upstream/master' 2014-08-14 22:30:19 +02:00
Dominik Kundel
b1252a4426 moving the popover for palette entries into the body to fix layering with popover of autocomplete 2014-08-14 22:29:57 +02: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
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -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
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
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Nick Winter
6d04b583f9 Added volume slider to game options. 2014-08-12 10:10:54 -07:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Scott Erickson
8fafd46b7f Reined in an overzealous css rule. 2014-08-12 09:04:36 -07:00
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00