Nick Winter
|
5e30ab091b
|
Updated i18n tags.
|
2014-03-28 13:19:17 -07:00 |
|
Nick Winter
|
13d5536eb3
|
Merged.
|
2014-03-28 13:08:30 -07:00 |
|
Jasper D'haene
|
fa6ef5aa49
|
added authors to quotations
|
2014-03-28 19:58:33 +01:00 |
|
Nick Winter
|
ff7e2d5d47
|
Fixed #728.
|
2014-03-28 11:02:23 -07:00 |
|
Jasper D'haene
|
cd3019296c
|
added tips/quotes to loading bar
|
2014-03-28 19:01:31 +01:00 |
|
Dominik Kundel
|
35a16b47ff
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-28 14:37:14 +01:00 |
|
Darredevil
|
a91e067549
|
Added funny tip
|
2014-03-28 00:13:40 +02:00 |
|
Ting-Kuan
|
6012a3ce9e
|
Show error message when editor fails to initiate.
|
2014-03-27 14:35:20 -04:00 |
|
Scott Erickson
|
781b33092c
|
Added a google plus connect button.
|
2014-03-26 14:19:05 -07:00 |
|
Scott Erickson
|
132b22f14a
|
Got the gplus friends loading now.
|
2014-03-26 13:50:01 -07:00 |
|
Glen De Cauwsemaecker
|
5825b2676b
|
Added myself to the signature.
|
2014-03-26 04:46:49 +01:00 |
|
Dominik Kundel
|
fe8a4901de
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/locale/de.coffee
bower.json
|
2014-03-25 17:07:36 +01:00 |
|
Glen De Cauwsemaecker
|
305e2f6d68
|
Merge pull request #685 from JasperDhaene/master
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
|
2014-03-25 13:27:13 +01:00 |
|
JasperDhaene
|
748081b4a7
|
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
|
2014-03-25 09:25:20 +01:00 |
|
Nick Winter
|
e6e216fcd3
|
Mergred Diplomats.
|
2014-03-24 14:20:40 -07:00 |
|
Nick Winter
|
fd2d9b6833
|
Merge pull request #658 from ItsLastDay/editor_tweaks
Added tooltip in level-editor (issue #174)
|
2014-03-22 17:30:52 -07:00 |
|
Mikhail Koltsov
|
baf8adcc74
|
added nothing
|
2014-03-22 20:50:50 +04:00 |
|
Scott Erickson
|
2cdfbf1c48
|
Merged conflicts.
|
2014-03-21 19:56:25 -07:00 |
|
Scott Erickson
|
6445924598
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/templates/play/ladder/ladder_tab.jade
app/views/play/ladder/ladder_tab.coffee
|
2014-03-21 19:53:32 -07:00 |
|
Scott Erickson
|
14ee9c30ce
|
Added facebook friends to the ladder page.
|
2014-03-21 19:50:54 -07:00 |
|
Nick Winter
|
dfcdcaa678
|
No email addresses for non-admins on CLA submissions.
|
2014-03-21 17:20:47 -07:00 |
|
Nick Winter
|
4bc1e6805b
|
Improved page title. Fixed Twitter card image.
|
2014-03-21 17:06:51 -07:00 |
|
Nick Winter
|
f0640dd2e8
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-21 16:22:51 -07:00 |
|
Nick Winter
|
ba66dbf5a1
|
Adding CLAs view.
|
2014-03-21 16:22:47 -07:00 |
|
dpen2000
|
6363c40fe2
|
Update cla.jade
p -> a. Using html syntax to avoid linking full stop.
|
2014-03-21 21:59:31 +00:00 |
|
Nick Winter
|
b30bf35945
|
Fixed #638, I hope.
|
2014-03-21 08:09:08 -07:00 |
|
Nick Winter
|
a3dadd6a40
|
Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks
|
2014-03-21 07:25:33 -07:00 |
|
Nick Winter
|
bba85745f7
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-20 19:18:49 -07:00 |
|
Nick Winter
|
9e4908ade2
|
A couple ladder tweaks.
|
2014-03-20 19:18:46 -07:00 |
|
J Phani Mahesh
|
edc90c4598
|
Fix login popup being displayed under trailer. (#596)
|
2014-03-21 06:44:21 +05:30 |
|
Nick Winter
|
ca1e3742c0
|
Added simulation counts.
|
2014-03-20 15:40:02 -07:00 |
|
Scott Erickson
|
22555790b5
|
Set up a trimmed down leaderboard showing just top players and your rank.
|
2014-03-20 14:40:17 -07:00 |
|
Scott Erickson
|
dbbf9ce8b3
|
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
|
2014-03-20 11:22:23 -07:00 |
|
Mikhail Koltsov
|
a6523719e4
|
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
Conflicts:
app/locale/ru.coffee
|
2014-03-20 09:07:11 +04:00 |
|
Nick Winter
|
b7e8f2ecb5
|
Merge pull request #605 from kvasnyk/master
Fix for #272 bug.
|
2014-03-19 18:31:20 -07:00 |
|
Nick Winter
|
ff1e64e1f6
|
Less useless ladder refresh requests.
|
2014-03-19 18:26:38 -07:00 |
|
Nick Winter
|
097c6bc2cd
|
Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed.
|
2014-03-19 17:25:56 -07:00 |
|
Glen De Cauwsemaecker
|
71a13a5670
|
Adding missing translations for the Dutch local file
|
2014-03-20 00:33:50 +01:00 |
|
Glen De Cauwsemaecker
|
e2a7c15776
|
Merge conflicts resolved from Ruben's branch
|
2014-03-20 00:05:41 +01:00 |
|
Glen De Cauwsemaecker
|
eab52f45e5
|
Applied proofread of Julian.
|
2014-03-19 02:21:45 +01:00 |
|
Glen De Cauwsemaecker
|
f7777ef501
|
Merge branch 'patch-2' of github.com:feugy/codecombat
|
2014-03-19 02:16:54 +01:00 |
|
Glen De Cauwsemaecker
|
5dc89529ca
|
Described myself.
|
2014-03-19 02:10:58 +01:00 |
|
Mikhail Koltsov
|
c9a08a0b25
|
thang editor: added i18n binding to 'Save' button
|
2014-03-19 01:43:27 +04:00 |
|
Jayant Jain
|
80f53d2c6b
|
Adds search bar for adding thangs in level editor
|
2014-03-19 00:41:03 +05:30 |
|
Ruben Vereecken
|
04465eb72c
|
Wrapped up locale files
|
2014-03-18 10:24:58 +01:00 |
|
Ruben Vereecken
|
e4fee7296c
|
Merged in old locale
|
2014-03-18 10:19:33 +01:00 |
|
Ruben Vereecken
|
b476e6b333
|
Ladder i18n refactoring
|
2014-03-18 10:18:38 +01:00 |
|
kvasnyk
|
5216432bf9
|
Fix for #272 bug.
|
2014-03-18 05:47:53 +01:00 |
|
Damien
|
65f148974c
|
Add to french diplomats list
|
2014-03-17 23:39:36 +01:00 |
|
Dominik Kundel
|
c55b608886
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/templates/play/level/modal/editor_config.jade
|
2014-03-17 19:39:38 +01:00 |
|
Nick Winter
|
794b1472f6
|
Merge pull request #587 from cassiocardoso/patch-1
Update diplomat.jade
|
2014-03-17 08:50:45 -07:00 |
|
yangxuan8282
|
4b2bcc283f
|
Update diplomat.jade
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
|
2014-03-17 23:32:20 +08:00 |
|
Cassio Cardoso
|
2917255193
|
Update diplomat.jade
Add my username in brazilian portuguese diplomats list.
|
2014-03-17 11:51:55 -03:00 |
|
Aditya Raisinghani
|
b5bef94eb3
|
Fixed issue with video on multiplayer page modal
|
2014-03-17 19:52:03 +05:30 |
|
Randi Katrine Hillerøe
|
5cecbeea40
|
Update diplomat.jade
Added my name to the contributors list.
|
2014-03-17 13:59:48 +01:00 |
|
Nick Winter
|
6c2a78c060
|
Show videos in HD if possible. Use ready state on level loader.
|
2014-03-17 05:52:19 -07:00 |
|
Nick Winter
|
36a90de7f9
|
Last bits of #546.
|
2014-03-17 04:44:00 -07:00 |
|
Nick Winter
|
1397b63e50
|
Merged.
|
2014-03-17 04:37:54 -07:00 |
|
pouyio
|
f5e3e717f1
|
Update diplomat.jade
added a spanish translator
|
2014-03-17 12:33:35 +01:00 |
|
Nick Winter
|
287bf0398e
|
Embedded new video in multiplayer launch modal.
|
2014-03-17 03:18:13 -07:00 |
|
Scott Erickson
|
7555dce172
|
Tweaked the loading page progress bar.
|
2014-03-17 00:05:45 -07:00 |
|
Scott Erickson
|
729a016b1f
|
More tweaks to the video.
|
2014-03-16 22:57:16 -07:00 |
|
Scott Erickson
|
1fa18fe2e0
|
Added a border to the home view video.
|
2014-03-16 22:46:57 -07:00 |
|
Scott Erickson
|
5ddd2b9109
|
Added a few more tips.
|
2014-03-16 22:11:21 -07:00 |
|
Scott Erickson
|
dc4252a94d
|
Moved the tips into the level loader screen and gave them i18n.
|
2014-03-16 22:01:21 -07:00 |
|
Nick Winter
|
f02f4e77d0
|
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
|
2014-03-16 21:33:46 -07:00 |
|
Nick Winter
|
f3a76da47c
|
Added i18n for multiplayer launch modal.
|
2014-03-16 20:50:49 -07:00 |
|
Nick Winter
|
ffb9ec2908
|
Merged.
|
2014-03-16 20:36:18 -07:00 |
|
Nick Winter
|
9a64fb5dac
|
Work on /multiplayer modal.
|
2014-03-16 20:32:24 -07:00 |
|
Scott Erickson
|
296a7584a6
|
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
|
2014-03-16 20:28:02 -07:00 |
|
honam bang
|
41d26f5709
|
Refactoring ModalView Templates
|
2014-03-17 11:00:25 +09:00 |
|
Scott Erickson
|
957fdd22e6
|
Tweaked the rank button to be much larger in the my matches tab.
|
2014-03-16 18:48:56 -07:00 |
|
Scott Erickson
|
5cb42fa92c
|
Tweaked the video on the home page.
|
2014-03-16 18:10:39 -07:00 |
|
Scott Erickson
|
150077ab22
|
Removed the new button from the home view.
|
2014-03-16 17:48:16 -07:00 |
|
Scott Erickson
|
e430a6c2de
|
Added multiplayer launch view.
|
2014-03-16 17:33:57 -07:00 |
|
Nick Winter
|
b550708113
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 17:07:24 -07:00 |
|
Nick Winter
|
6db33fd967
|
Brawlwood protectAPI on!
|
2014-03-16 17:07:10 -07:00 |
|
Scott Erickson
|
209a1a3563
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 17:00:12 -07:00 |
|
Scott Erickson
|
eee8fbba2c
|
New level page with new artwork.
|
2014-03-16 16:59:48 -07:00 |
|
Nick Winter
|
1f1802dc38
|
A couple tweaks for #577.
|
2014-03-16 16:04:17 -07:00 |
|
Nick Winter
|
753952e519
|
Merge pull request #577 from IngridMorstrad/templates
Templates
|
2014-03-16 16:00:24 -07:00 |
|
IngridMorstrad
|
dadf0dab86
|
refactored docs and reload
|
2014-03-17 02:57:15 +05:30 |
|
Nick Winter
|
aa4f1baf73
|
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
|
2014-03-16 13:23:01 -07:00 |
|
IngridMorstrad
|
57f24932fb
|
Removed redundant code for close button
|
2014-03-17 01:10:55 +05:30 |
|
IngridMorstrad
|
52115876bb
|
Refactored docs.jade to use the base template
|
2014-03-17 01:03:27 +05:30 |
|
honam bang
|
29a88ee128
|
Merge remote-tracking branch 'codecombat/master'
|
2014-03-17 02:20:44 +09:00 |
|
Nick Winter
|
125ffa9f43
|
Merged
|
2014-03-16 10:06:47 -07:00 |
|
honam bang
|
34be8917cb
|
Fixes #546
|
2014-03-17 01:41:19 +09:00 |
|
IngridMorstrad
|
8d9a8aaf73
|
Change victory.jade to use the base template
|
2014-03-16 21:16:00 +05:30 |
|
George Saines
|
417ff1e48d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-15 15:12:09 -07:00 |
|
Dominik Kundel
|
46133ab85d
|
added select statement for programming language
|
2014-03-15 22:00:29 +01:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|
George Saines
|
c00c7ed56b
|
adding the new website background images
|
2014-03-14 15:24:36 -07:00 |
|
Nick Winter
|
5c76ca71e3
|
Added configuring of behaviors to the editor config.
|
2014-03-14 10:14:48 -07:00 |
|
Nick Winter
|
c28d2bb576
|
Merge pull request #545 from dkundel/master
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
|
2014-03-14 07:35:11 -07:00 |
|
Dominik Kundel
|
190469d794
|
removed unnecessary comment
|
2014-03-14 03:28:20 +01:00 |
|
Dominik Kundel
|
0392f630cc
|
including i18n support for new editor config and minor styling changes
|
2014-03-14 03:26:53 +01:00 |
|
Nick Winter
|
6e9945040f
|
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
|
2014-03-13 19:20:22 -07:00 |
|
Nick Winter
|
795bd8f63b
|
Moved Glen from Archmages to About.
|
2014-03-13 18:27:08 -07:00 |
|
Dominik Kundel
|
6f2a04c5c0
|
added new editor config modal
|
2014-03-14 00:54:06 +01:00 |
|
Dominik Kundel
|
f618338d32
|
added button to access new modal for editor config
|
2014-03-14 00:53:29 +01:00 |
|
Nick Winter
|
2b41efe466
|
Resolved some merge conflicts.
|
2014-03-13 10:32:18 -07:00 |
|
TigroTigro
|
206af3184d
|
Update diplomat.jade
|
2014-03-13 18:01:52 +01:00 |
|
Nick Winter
|
c8103154a9
|
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
|
2014-03-13 09:02:19 -07:00 |
|
Nick Winter
|
4ad0fba860
|
Merge pull request #537 from jayant1992/master
UI and UX improvements to editor
|
2014-03-13 07:07:13 -07:00 |
|
Nick Winter
|
0be08574fc
|
Merge pull request #536 from bkimminich/master
Added/fixed some German translations
|
2014-03-13 07:05:17 -07:00 |
|
Nick Winter
|
10e4bc737a
|
Merge pull request #534 from Shrihari/fix-grid-toggle
Fix Grid Toggle consistency
|
2014-03-13 06:50:56 -07:00 |
|
Björn Kimminich
|
87ddd10dd4
|
Update diplomat.jade
|
2014-03-13 14:19:59 +01:00 |
|
Shrihari
|
fb7f64ddb0
|
Grid toggle consistent with the button and the shortcut
|
2014-03-13 15:21:00 +05:30 |
|
Jayant Jain
|
c24469e86b
|
Minor UI updates to level editor's thang tab
|
2014-03-13 12:19:51 +05:30 |
|
Nick Winter
|
28d56f526e
|
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
|
2014-03-12 20:59:19 -07:00 |
|
Michael Schmatz
|
aea9e9d1a6
|
Spectate view is nearing completion
|
2014-03-12 17:51:13 -07:00 |
|
Nick Winter
|
7e16821743
|
Updates for /play levels list.
|
2014-03-12 16:41:09 -07:00 |
|
Nick Winter
|
ac8f12ef20
|
I don't think we need this template any more.
|
2014-03-12 16:03:32 -07:00 |
|
Ruben Vereecken
|
b845961218
|
Clean up
|
2014-03-12 21:25:14 +01:00 |
|
Ruben Vereecken
|
f4637251be
|
Added i18n to play modal
|
2014-03-12 21:23:25 +01:00 |
|
Ruben Vereecken
|
ca271fedd6
|
Added i18n to my matches tab
|
2014-03-12 21:13:01 +01:00 |
|
Ruben Vereecken
|
9f5c0f03be
|
Added i18n to ladder_tab
|
2014-03-12 20:51:38 +01:00 |
|
Ruben Vereecken
|
c2e81db200
|
Added i18n to ladder.jade
|
2014-03-12 20:46:25 +01:00 |
|
Nick Winter
|
da762fbc4f
|
Merge branch 'rubenvereecken-versions_modal'
|
2014-03-12 08:30:02 -07:00 |
|
Nick Winter
|
0125c46dc2
|
Resolved merge conflict.
|
2014-03-12 08:29:42 -07:00 |
|
Ruben Vereecken
|
27fd580324
|
Got rid of CRLF line endings
|
2014-03-12 16:03:36 +01:00 |
|
Ruben Vereecken
|
8acf35b290
|
Added i18n for components
|
2014-03-12 15:42:57 +01:00 |
|
Ruben Vereecken
|
ddae5d0763
|
Added Version History to Level Components
|
2014-03-12 15:32:55 +01:00 |
|
Michael Schmatz
|
a6fb2a3994
|
Various changes to spectate view
|
2014-03-12 07:32:30 -07:00 |
|
Ruben Vereecken
|
2a86daaa2a
|
Added Version History to Thang Types
|
2014-03-12 15:22:15 +01:00 |
|
Nick Winter
|
8c57b31c54
|
Fixed a couple bugs with the matches tab.
|
2014-03-11 18:06:48 -07:00 |
|
Nick Winter
|
392534878a
|
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
|
2014-03-11 16:31:39 -07:00 |
|
Nick Winter
|
bba3c78107
|
Ties are not victories in the emails.
|
2014-03-11 13:20:52 -07:00 |
|
Michael Schmatz
|
4062bba245
|
Created initial spectate level view
|
2014-03-11 13:12:45 -07:00 |
|
Ruben Vereecken
|
8709cdc472
|
Finished Article History
|
2014-03-11 19:33:27 +01:00 |
|
Nick Winter
|
d012e0d7a9
|
Merge pull request #508 from Rahazan/patch-2
Update Dutch Translations
|
2014-03-11 09:46:18 -07:00 |
|
Nick Winter
|
eac219a2be
|
Inserted score history graph into ladder update emails.
|
2014-03-10 22:03:33 -07:00 |
|
Nick Winter
|
32baf2ae79
|
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
|
2014-03-10 21:30:46 -07:00 |
|
Nick Winter
|
6ce65488aa
|
Added simple rank history graph. Improving ladder update mail.
|
2014-03-10 20:22:25 -07:00 |
|
Ruben Vereecken
|
af73e5a594
|
Added a versions modal for every type
|
2014-03-10 23:29:34 +01:00 |
|
Ruben Vereecken
|
8e989ec08f
|
Got the level history view set up as before, but better
|
2014-03-10 23:17:19 +01:00 |
|
Nick Winter
|
77f7276759
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 11:29:47 -07:00 |
|
Ruben Vereecken
|
29901787f7
|
Added i18n for Version History
|
2014-03-10 19:11:37 +01:00 |
|
Ruben Vereecken
|
06ae06fa34
|
Used mix-ins to combine Modal and VersionView
|
2014-03-10 19:08:53 +01:00 |
|
Nick Winter
|
234b3f105d
|
Reworked ladder game victory modal main call to action to actually submit game for ranking.
|
2014-03-10 10:36:28 -07:00 |
|
Ruben Vereecken
|
f6ece2d63e
|
Created a modal version of Version History
|
2014-03-10 12:16:08 +01:00 |
|
Nick Winter
|
3d71fcbc70
|
Wins, losses, and realizing that I'm not doing server code right.
|
2014-03-09 18:46:11 -07:00 |
|
Rahazan
|
66b7ba40e8
|
Added missing Dutch diplomats
|
2014-03-09 23:54:06 +01:00 |
|
Nick Winter
|
59314bcb3c
|
Merge pull request #500 from M-r-A/i18n
Update i18n
|
2014-03-09 08:19:02 -07:00 |
|
Alexei Nikitin
|
81084a24c6
|
Add admin i18n
|
2014-03-09 04:36:48 +04:00 |
|
Alexei Nikitin
|
f6d6805534
|
Add password i18n
|
2014-03-09 04:31:15 +04:00 |
|
Alexei Nikitin
|
bfebd0b47a
|
Add revert i18n
|
2014-03-09 04:13:30 +04:00 |
|
Nick Winter
|
39c4657204
|
Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.
|
2014-03-08 15:43:56 -08:00 |
|
Nick Winter
|
cd79403736
|
Merge pull request #494 from M-r-A/patch-3
Fix l18n tags
|
2014-03-08 11:27:00 -08:00 |
|
Nick Winter
|
68099bbd7c
|
Victory modal for ladder games takes you back to the ladder matches.
|
2014-03-07 21:20:09 -08:00 |
|
Nick Winter
|
085fb82cc9
|
Fixed a multiplayer link and debug mark alpha.
|
2014-03-07 21:02:10 -08:00 |
|
Scott Erickson
|
be03485538
|
Set up the ladder play modal to be more forthright getting new players to play the tutorial.
|
2014-03-07 12:58:17 -08:00 |
|
Alexei Nikitin
|
535881b637
|
Update ambassador.jade
|
2014-03-07 12:20:17 -08:00 |
|
Alexei Nikitin
|
b002ae376b
|
Update counselor.jade
|
2014-03-07 12:19:14 -08:00 |
|
Alexei Nikitin
|
317ae5cc32
|
Update scribe.jade
|
2014-03-07 12:17:32 -08:00 |
|
Scott Erickson
|
cf2a0a999e
|
Set up the ladder play modal to point to the tutorial level dynamically.
|
2014-03-07 11:57:31 -08:00 |
|
Scott Erickson
|
a6c4fe8d02
|
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
|
2014-03-05 20:04:14 -08:00 |
|
Nick Winter
|
4556536df4
|
Hooked up new HUD icons.
|
2014-03-04 11:15:31 -08:00 |
|
Ruben Vereecken
|
d43ff5d217
|
Added an anonymous check on the Fork button
|
2014-03-04 11:24:38 +01:00 |
|
Scott Erickson
|
1b257252f9
|
Merge branch 'production'
|
2014-03-03 16:52:01 -08:00 |
|
Nick Winter
|
7b25eeec47
|
HUD properties now flow into columns more evenly, have max styling.
|
2014-03-03 16:45:03 -08:00 |
|
Scott Erickson
|
619b628661
|
Reworked the victory modal styling a bit.
|
2014-03-03 16:39:56 -08:00 |
|
Nick Winter
|
c944e78271
|
Ladder views now show level descvription content if present.
|
2014-03-03 14:59:39 -08:00 |
|
Ruben Vereecken
|
b7fbf67e89
|
Enabled Fork button again. Previous commits solve issue #455
|
2014-03-03 22:52:37 +01:00 |
|
Ruben Vereecken
|
0aa8e7bb7d
|
Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet
|
2014-03-03 22:21:56 +01:00 |
|
Nick Winter
|
461d66c795
|
Typo in my matches team ranking.
|
2014-03-03 13:02:34 -08:00 |
|
Nick Winter
|
0c4a2a2f2b
|
Multiplied visible scores by 100 for more awesome.
|
2014-03-03 12:27:32 -08:00 |
|
Ruben Vereecken
|
05b4f536c1
|
Fixed a link to point correctly
|
2014-03-03 21:22:04 +01:00 |
|
Ruben Vereecken
|
ee920afea9
|
Disabled buttons for non-owners in Article Editor
|
2014-03-03 21:13:02 +01:00 |
|
Scott Erickson
|
1efb96f24a
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/templates/play/ladder/ladder_tab.jade
|
2014-03-03 12:08:11 -08:00 |
|
Scott Erickson
|
fb75ad36e7
|
Added team icons to the ladder play view.
|
2014-03-03 12:04:31 -08:00 |
|
Ruben Vereecken
|
942b69ea9f
|
Created hasWriteAccess on Cocomodel, used it for level access
|
2014-03-03 20:41:35 +01:00 |
|
Scott Erickson
|
65d39e658d
|
Removed the old team view cruft.
|
2014-03-03 11:15:46 -08:00 |
|
Scott Erickson
|
ff3f3e5a07
|
Removed a link to the old team view.
|
2014-03-03 11:11:27 -08:00 |
|
Scott Erickson
|
feaeb1dc98
|
Made the wizard icons colored based on user settings.
|
2014-03-03 10:21:51 -08:00 |
|
Scott Erickson
|
d3b6836a06
|
Fixed some bugs with the new ladder view when you haven't played before.
|
2014-03-03 09:20:14 -08:00 |
|
Scott Erickson
|
5bb56ac818
|
Merge branch 'feature/new-ladder-view'
|
2014-03-03 09:05:52 -08:00 |
|
Scott Erickson
|
22e80f6d24
|
Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.
|
2014-03-03 09:03:44 -08:00 |
|
Karthig
|
b04d63d5bf
|
- create sass file to center 404 image on page
|
2014-03-03 11:42:07 -05:00 |
|
Karthig
|
357ef45cb0
|
- insert random error image into 404 page
|
2014-03-03 10:58:33 -05:00 |
|
Nick Winter
|
20fb9ba5b4
|
Merge pull request #461 from rubenvereecken/master
Localization centred patches and additions
|
2014-03-03 07:37:46 -08:00 |
|
Nick Winter
|
a665aca039
|
Merge pull request #443 from M-r-A/master
Finalized Russian translations
|
2014-03-03 07:21:49 -08:00 |
|
Ruben Vereecken
|
b8b22bb739
|
Localized 'Create New ..' and 'Search .. Here'
|
2014-03-03 12:45:04 +01:00 |
|
George Saines
|
4b6ebd6532
|
styled the victory modal a bit
|
2014-03-02 18:21:42 -08:00 |
|
Nick Winter
|
a8ef87c9ea
|
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
|
2014-03-02 16:06:22 -08:00 |
|
Ruben Vereecken
|
c3c699df49
|
Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications'
|
2014-03-02 23:28:16 +01:00 |
|
Scott Erickson
|
956e2b3c40
|
Set up the my matches tab in the new ladder view.
|
2014-03-02 13:24:41 -08:00 |
|
Scott Erickson
|
d0f416f668
|
Rearranging the ladder view.
|
2014-03-02 12:43:21 -08:00 |
|
Nick Winter
|
6c48660922
|
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
|
2014-03-01 16:57:29 -08:00 |
|
Nick Winter
|
c2f82690b4
|
Put Archmage and Artisan avatars in GitHub README.
|
2014-03-01 11:21:24 -08:00 |
|
Tay Yang Shun
|
f43dd2f3ff
|
Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.
|
2014-03-01 14:47:31 +08:00 |
|
Nick Winter
|
7855ca02d8
|
Hit a really bad victory modal image.
|
2014-02-28 21:29:14 -08:00 |
|
Alexei Nikitin
|
d68ff5a899
|
Fix diplomat.jade building
|
2014-03-01 04:54:54 +04:00 |
|
Alexei Nikitin
|
789b49e15f
|
Update diplomat.jade
|
2014-03-01 03:37:11 +04:00 |
|
Scott Erickson
|
10795df7d9
|
Renamed hardcoded project-dotas to brawlwoods.
|
2014-02-28 13:59:02 -08:00 |
|
Nick Winter
|
ad30130814
|
Merge pull request #437 from M-r-A/master
Fix indents
|
2014-02-27 17:10:48 -08:00 |
|
M-r-A
|
873cd55cf3
|
Update ambassador.jade
|
2014-02-27 17:00:04 -08:00 |
|
M-r-A
|
a1bb322e7c
|
Update archmage.jade
|
2014-02-27 16:56:02 -08:00 |
|