Nick Winter
d3da5e330a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-17 15:09:14 -08:00
Matt Lott
f56d01419f
Update sync pvp teams and real-time playback
...
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
igornishka
3abe0db1e5
A couple of translations added :)
2014-11-18 01:00:28 +02:00
Nick Winter
9fabe74da6
Changed the name of incorrectly preloaded old spell palette background texture.
2014-11-17 14:45:09 -08:00
Nick Winter
e50e5d3319
Merge branch 'ehnydeel-patch-1'
2014-11-17 12:43:51 -08:00
Nick Winter
736fbaa474
Merged de-DE.
2014-11-17 12:43:31 -08:00
Nick Winter
d9fb5e9f6c
Merge branch 'master' into production
2014-11-17 09:29:13 -08:00
Nick Winter
ec77a3b737
Builder's Hammer has been renamed to Crude Builder's Hammer.
2014-11-17 09:20:44 -08:00
Nick Winter
ccc4cf59db
Stop zooming in on hero during real-time playback, because it can mess with ability to place flags.
2014-11-17 09:09:04 -08:00
Nick Winter
a7069e19bd
Ignore (and warn about) achievements with empty queries. Fixed embarrassing bug with more-practice / skip-ahead branching not doing anything for non-admins.
2014-11-17 08:44:53 -08:00
Nick Winter
0d68ad250d
Fixed awardable items showing up in inventory/store items list when not earnned, and showing up at the end when earned.
2014-11-17 08:25:27 -08:00
Nick Winter
b6570236d8
Fixed flag history not getting cleared on real-time resubmission in single-player.
2014-11-17 08:00:44 -08:00
Nick Winter
e5aada2e5b
Incorporated tweaked victory modal background assets.
2014-11-16 21:26:21 -08:00
Nick Winter
4676f3e3ef
Merge branch 'master' into production
2014-11-16 20:38:35 -08:00
Nick Winter
5927b36402
Made a few new levels available for advance early playtesting.
2014-11-16 20:38:27 -08:00
Nick Winter
dbad4d232d
Merge pull request #1758 from Soraph/patch-2
...
Added more translations
2014-11-16 09:40:45 -08:00
Matteo Canu
b8abeed60c
Added more translations
2014-11-16 18:15:24 +01:00
Nick Winter
4aff5265c3
Fixed being unable to select important spells on a few old, multi-spell levels.
2014-11-16 08:11:39 -08:00
Nick Winter
f9a7aba5d9
Some fixes for programmatically generated flag events not polluting session flag history.
2014-11-15 16:56:35 -08:00
Nick Winter
85a94df854
Merge pull request #1754 from Imperadeiro98/patch-1
...
Update en.coffee
2014-11-15 14:01:57 -08:00
Imperadeiro98
eb23438f6a
Update en.coffee
...
Updated achievements titles. Don't know if lines 750-752 are needed or not, as they do not display in the website.
2014-11-15 22:01:06 +00:00
Nick Winter
348cf82258
Merge branch 'master' into production
2014-11-15 12:47:05 -08:00
Nick Winter
0f70b7e552
Admins can play all heroes. Fixed another bug with playback controls being disabled when they shouldn't be.
2014-11-15 12:46:57 -08:00
Nick Winter
ff30935a58
Merge pull request #1753 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-11-15 11:09:09 -08:00
Imperadeiro98
2da1b7d65e
Update pt-PT.coffee
2014-11-15 19:05:04 +00:00
Imperadeiro98
0a0b3b2041
Update pt-PT.coffee
2014-11-15 19:02:51 +00:00
Nick Winter
67963b7aab
Merge branch 'sunxb10-master'
2014-11-15 07:43:26 -08:00
Nick Winter
74aefa42b9
Merged in sunxb10's translations.
2014-11-15 07:42:57 -08:00
Nick Winter
e28f6bf994
Propagated i18n.
2014-11-15 07:40:58 -08:00
Nick Winter
b7c2a33ddc
Fixed some i18n on the PlayHeroesModal, and started showing special hero skills.
2014-11-15 07:40:10 -08:00
Nick Winter
7bbc270f26
Merge pull request #1748 from Imperadeiro98/master
...
Update achievements.jade
2014-11-15 07:32:28 -08:00
Nick Winter
61308feca7
Merge pull request #1745 from LuSilf/master
...
Some translation in ru.coffee
2014-11-15 07:32:15 -08:00
Nick Winter
6f7faced23
Merge branch 'master' into production
2014-11-14 18:25:16 -08:00
Nick Winter
55196bc589
Fixed disabling of playback accidentally when disabling anything.
2014-11-14 18:25:07 -08:00
Ehnydeel
d23cf5c725
Added some german translations
...
Added some german translations
2014-11-14 22:27:24 +01:00
Scott Erickson
8c953fffed
Hid the G+ "Welcome back" message, since we are managing logins manually now.
2014-11-14 11:14:08 -08:00
Nick Winter
638ec00b79
Merge branch 'master' into production
2014-11-14 11:05:49 -08:00
Nick Winter
000e652f56
Merge branch 'master' into production
2014-11-14 11:04:40 -08:00
Scott Erickson
36305cde97
Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window.
2014-11-14 11:04:24 -08:00
Nick Winter
635c4e18df
Restricted Roughedge and Sharpened Sword for Kithgard Gates Builder's Hammer swap, too.
2014-11-14 11:03:01 -08:00
Nick Winter
99e47064af
Merge branch 'master' into production
2014-11-14 09:24:57 -08:00
Nick Winter
7e12c10649
Temporarily disabled code toolbar for a few more levels. Worked around The First Kithmaze / Haunted Kithmaze switch for preventing level unlock problems.
2014-11-14 09:24:42 -08:00
Nick Winter
5fde9e6a64
Merge pull request #1740 from ann304/patch-1
...
Update vi.coffee
2014-11-14 06:59:17 -08:00
sunxb10
1c560511c3
Simplified Chinese translation (zh-HANS)
2014-11-14 18:01:51 +08:00
Nick Winter
2f1ed2f8b9
Merge branch 'master' into production
2014-11-13 10:55:22 -08:00
Nick Winter
01d6c6d239
Stop whole-line selection on gutter clicks.
2014-11-13 10:54:50 -08:00
Nick Winter
05a3577de9
Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.
2014-11-13 10:49:37 -08:00
Imperadeiro98
4c8d959c8a
Update achievements.jade
...
The titles were not being translated.
2014-11-13 17:02:32 +00:00
Nick Winter
f522d2fb04
Merge branch 'master' into production
2014-11-12 20:45:40 -08:00
Nick Winter
29860caeea
Implemented new blue background texture for dialogue messages.
2014-11-12 20:45:15 -08:00
