Nick Winter
|
1982d8d5f1
|
Merge pull request #2595 from nemoyatpeace/patch-5
Update the shift-click insertion
|
2015-04-06 07:53:01 -07:00 |
|
Nick Winter
|
3913ae9909
|
Wizard Dude gets his own avatar from winning the Greed tournament.
|
2015-04-03 12:19:06 -07:00 |
|
nemoyatpeace
|
b50c3fbc89
|
Update the shift-click insertion
Insertion is now language specific.
|
2015-03-29 01:14:13 +08:00 |
|
Nick Winter
|
ceb81494a0
|
Preparing for Zero Sum tournament starting tomorrow morning.
|
2015-03-26 21:05:46 -07:00 |
|
Nick Winter
|
7dff105cdf
|
Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs.
|
2015-03-25 16:47:31 -07:00 |
|
Nick Winter
|
7ebb2d0200
|
Actually committing my Super Important Fixes. I must have been crazy yesterday. Also, populate i18n may work in the level editor now.
|
2015-03-24 15:39:35 -07:00 |
|
Matt Lott
|
7e340fcd41
|
Update purchase tracking to work with GA goals
Need an integer value field.
|
2015-03-24 15:02:57 -07:00 |
|
Nick Winter
|
b4ea78e5cb
|
Implementing alternative pricing with Alipay in China to support dedicated China server.
|
2015-03-23 15:26:44 -07:00 |
|
Nick Winter
|
e288b95543
|
Fixed #1961 (castDrainLife -> cast('drain-life') in the docs).
|
2015-03-20 13:43:00 -07:00 |
|
Nick Winter
|
8760725b8d
|
Unholy Tome III instead of IV for Zero Sum.
|
2015-03-20 11:07:41 -07:00 |
|
Nick Winter
|
bae7612703
|
Disabled pinned docs clicks for now, since their CSS is wonky.
|
2015-03-20 09:03:36 -07:00 |
|
Nick Winter
|
0e0d2830be
|
Zero Sum mirror match using Golden Wand and Unholy Tome IV now.
|
2015-03-19 21:37:47 -07:00 |
|
Vlevo
|
49b32a8ff1
|
Update ControlBarView.coffee
added a clause for the "older campaigns"
|
2015-03-19 16:02:53 -06:00 |
|
Nick Winter
|
c6cd7b032d
|
Fixed Alipay auto locale detection.
|
2015-03-18 17:17:30 -07:00 |
|
Nick Winter
|
585fa40a8c
|
Added first draft of campaign info to campaign selector screen.
|
2015-03-18 16:20:30 -07:00 |
|
Nick Winter
|
792e65767d
|
I could try to compile it first, I guess.
|
2015-03-17 22:04:30 -07:00 |
|
Nick Winter
|
8af94209b4
|
Lua is not experimental any more. (But CoffeeScript is.)
|
2015-03-17 22:02:15 -07:00 |
|
Nick Winter
|
3236abc5da
|
Added emphasis for Apocalypse.
|
2015-03-17 21:20:26 -07:00 |
|
Nick Winter
|
d6cba0de67
|
Enabled Alipay support. Updated to latest version of Stripe checkout.js.
|
2015-03-16 10:50:15 -07:00 |
|
Nick Winter
|
89bdb3b790
|
Fixed #2518.
|
2015-03-14 09:57:31 -07:00 |
|
Nick Winter
|
57e77a0cd7
|
Upcoming ladder level Zero Sum equalizes all players' heroes and equipment.
|
2015-03-14 09:39:43 -07:00 |
|
Nick Winter
|
3ff41f5619
|
Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues.
|
2015-03-12 11:08:58 -07:00 |
|
Nick Winter
|
3458f2069b
|
Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller.
|
2015-03-11 20:21:54 -07:00 |
|
Nick Winter
|
8fc893dd6f
|
Fixed a couple issues with errors during incompletely loaded levels or weird child window global situations using level editor.
|
2015-03-10 14:37:12 -07:00 |
|
Nick Winter
|
9c99fc455a
|
A few poll fixes.
|
2015-03-10 09:45:21 -07:00 |
|
Matt Lott
|
5a0a4d1446
|
No auto-fullscreen for admins
|
2015-03-09 12:57:10 -07:00 |
|
Nick Winter
|
e58734894a
|
Tweaked style on space-disabling and default-locking by player level.
|
2015-03-09 10:50:00 -07:00 |
|
Nick Winter
|
f5633f05dc
|
Merge pull request #2414 from h3yduck/lock_issue
Only lock spacebar and default code when the player is lower level (issue 2406)
|
2015-03-09 10:37:40 -07:00 |
|
Nick Winter
|
efe1b77e9e
|
First poll should be askable.
|
2015-03-09 09:51:15 -07:00 |
|
Nick Winter
|
495845a633
|
Storing certain poll results in User object. Showing a poll once per day.
|
2015-03-09 09:30:51 -07:00 |
|
Nick Winter
|
e21360127d
|
Polls!
|
2015-03-08 16:36:17 -07:00 |
|
Nick Winter
|
10f2df3480
|
Added extra lesson resource links to the Guide.
|
2015-03-05 08:58:11 -08:00 |
|
Nick Winter
|
60db16b1c3
|
Making all code languages load for level editor to avoid busted level previews. Added CoffeeScript compiler to web worker so we can use Referee extraCode.
|
2015-03-04 11:29:03 -08:00 |
|
Nick Winter
|
2d18bcf9f0
|
Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level.
|
2015-03-03 09:04:53 -08:00 |
|
Nick Winter
|
44008be95f
|
Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level.
|
2015-02-27 21:37:55 -08:00 |
|
Matt Lott
|
86d167394e
|
Remove Segment analytics dependency
Call Google Analytics, Errorception, and Inspectlet directly.
|
2015-02-27 16:07:41 -08:00 |
|
Szabolcs Gelencser
|
dde3e8cf8f
|
Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired
|
2015-02-27 17:33:38 +01:00 |
|
Nick Winter
|
9b34d4e166
|
Ooops, that was just for testing.
|
2015-02-26 16:04:57 -08:00 |
|
Szabolcs Gelencser
|
b138001205
|
for issue #2406
|
2015-02-26 23:42:37 +01:00 |
|
Nick Winter
|
77bca72002
|
Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white.
|
2015-02-26 14:24:00 -08:00 |
|
Nick Winter
|
7e889a2a80
|
Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory.
|
2015-02-25 18:09:55 -08:00 |
|
Nick Winter
|
c8c76e6b74
|
Trying to track down the cause of InventoryModal loading without a hero assigned.
|
2015-02-25 16:19:49 -08:00 |
|
Nick Winter
|
a2a78286da
|
Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.
|
2015-02-25 14:24:32 -08:00 |
|
Nick Winter
|
a66e1c5389
|
Retoring next level highlight arrow for players who are very new when they click off a selected level.
|
2015-02-25 11:58:03 -08:00 |
|
Nick Winter
|
13f9d71cca
|
You can now use bitcoin to buy gems.
|
2015-02-25 11:33:51 -08:00 |
|
Nick Winter
|
1ab8274c43
|
Added a clear storage button to the campaign editor.
|
2015-02-25 11:09:15 -08:00 |
|
Nick Winter
|
9dd07b024e
|
Fixed item shop not loading items with later letters of the alphabet, since there are now so many items.
|
2015-02-24 12:15:35 -08:00 |
|
Nick Winter
|
63b24b9bf1
|
Properly showing the back of wizards' robes.
|
2015-02-22 21:50:56 -08:00 |
|
Nick Winter
|
40ff7d4116
|
Harmonized enter shortcut for PlayHeroesModal.
|
2015-02-21 14:22:51 -08:00 |
|
Nick Winter
|
8355ba5a6d
|
Replayable level awards now count up from where they were last time instead of from 0.
|
2015-02-18 18:01:22 -08:00 |
|
Nick Winter
|
f2a5c4bc5a
|
Merge pull request #2353 from amankr/sound
Volume bug fix #2202
|
2015-02-18 13:36:59 -08:00 |
|
Nick Winter
|
a81663f06a
|
CampaignView shouldn't use localStorage backups unless it's in editor mode.
|
2015-02-18 13:35:47 -08:00 |
|
Aman Kumar
|
e4a3890f39
|
fixed volume bug #2202
|
2015-02-19 02:05:41 +05:30 |
|
Aman Kumar
|
a74c2a58e2
|
fixed volume bug #2202
|
2015-02-19 01:58:24 +05:30 |
|
Nick Winter
|
178082d4e8
|
Fixed bug with dragging an item to unequip it not updating rest of state.
|
2015-02-18 09:57:03 -08:00 |
|
laituan245
|
0cf16e157c
|
Fix issue #1832
|
2015-02-18 16:12:19 +09:00 |
|
Imperadeiro98
|
d575bb2992
|
Small spacing fix
|
2015-02-16 13:33:44 +00:00 |
|
Nick Winter
|
7f2e5c4404
|
Achievements list now shows proper amount of gems and exp for repeatable achievements.
|
2015-02-13 18:55:23 -08:00 |
|
Nick Winter
|
c29bb432e1
|
Merge pull request #2314 from laituan245/master
A small fix to the PR #2313
|
2015-02-13 13:46:45 -08:00 |
|
Matt Lott
|
81678e81d9
|
Merge pull request #2315 from amankr/autocomplete2
Autocomplete bug fix #2233 - method 2
Thanks @amankr!
|
2015-02-13 13:12:22 -08:00 |
|
Aman Kumar
|
85a024546b
|
Autocomplete bug fix #2233
|
2015-02-14 02:21:54 +05:30 |
|
Aman Kumar
|
224213ccb0
|
Autocomplete bug fix #2233
|
2015-02-14 02:11:00 +05:30 |
|
laituan245
|
93bbedd02d
|
A small fix to the PR #2313
|
2015-02-14 05:27:58 +09:00 |
|
Aman Kumar
|
80fb124772
|
Autocomplete bug fix #2233
|
2015-02-14 01:56:05 +05:30 |
|
Nick Winter
|
4fec64c3ca
|
Merge pull request #2313 from laituan245/master
Added a "god mode" button to the local dev environment (issue #2164)
|
2015-02-13 09:08:09 -08:00 |
|
laituan245
|
9c754bbd96
|
Added a "god mode" button to the local dev environment #2164
|
2015-02-14 01:46:04 +09:00 |
|
Nick Winter
|
5cf37d1796
|
A few tweaks to visuals on PlayHeroesModal hero previews.
|
2015-02-13 04:09:40 -08:00 |
|
Nick Winter
|
991a374da2
|
Fixed up SpectateView for hero ladder games. Addd player names to their heroes in spectate and observation mode. Fixed #1679.
|
2015-02-12 19:47:57 -08:00 |
|
Nick Winter
|
1aa738b256
|
Fixed up headless client, I hope.
|
2015-02-12 16:07:19 -08:00 |
|
Nick Winter
|
e01e71d5e8
|
Fixed #2181, I hope.
|
2015-02-12 11:59:38 -08:00 |
|
Nick Winter
|
85ad3f5960
|
Fixed #2293.
|
2015-02-11 14:09:00 -08:00 |
|
Nick Winter
|
d09636306c
|
Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs!
|
2015-02-11 13:12:54 -08:00 |
|
Matt Lott
|
9bda187f90
|
Add terrain to loaded world map event
|
2015-02-10 14:20:18 -08:00 |
|
Nick Winter
|
abbab26d80
|
Using i18n for achievement descriptions in HeroVictoryModal.
|
2015-02-09 13:06:00 -08:00 |
|
Nick Winter
|
7b34f90230
|
Added rough draft of subscribe button in gem shop.
|
2015-02-09 09:22:18 -08:00 |
|
Nick Winter
|
22c2c7df63
|
Fixed bug with incompletely added levels jamming the campaign editor.
|
2015-02-09 08:19:59 -08:00 |
|
divyanshu013
|
4269f6a652
|
Improved upon the Buy Gems Window for #2238
Added the header and close button for the Buy Gems Window.
|
2015-02-09 02:31:03 +05:30 |
|
Matt Lott
|
d5ac001a55
|
Restrict share progress prompt to named players
|
2015-02-06 19:49:13 -08:00 |
|
Matt Lott
|
972c3d0d6f
|
Share progress modal
Shown after forgetful-gemsmith
|
2015-02-06 14:49:50 -08:00 |
|
Nick Winter
|
e311eb2700
|
Fixed preloading of level sessions before starting a level.
|
2015-02-06 13:04:15 -08:00 |
|
Nick Winter
|
2bd7c86638
|
Added bottom footer background texture.
|
2015-02-06 11:17:48 -08:00 |
|
Nick Winter
|
860868c285
|
Stopped preloading sessions for now, since it's buggy.
|
2015-02-05 16:14:32 -08:00 |
|
Nick Winter
|
3cbf11d404
|
Added a back button to hit campaign selector view.
|
2015-02-05 15:40:45 -08:00 |
|
Nick Winter
|
1d8f91c42f
|
Added campaign world selector portal screen for half of players.
|
2015-02-05 15:05:33 -08:00 |
|
Nick Winter
|
35c04974dd
|
Added a difficulty badge when going to play a replayable level.
|
2015-02-04 13:42:49 -08:00 |
|
Nick Winter
|
11a3316dec
|
Preloading levels and sessions when clicking on a level, before clicking start.
|
2015-02-04 13:24:22 -08:00 |
|
Nick Winter
|
ac44acb867
|
Campaign status gets out of the way after four seconds on non-dungeon campaigns.
|
2015-02-04 13:00:07 -08:00 |
|
Nick Winter
|
46ef93190a
|
Show old difficulty instead of new difficulty when observing a replayable success. This will likely need revisiting when we are using observing for more than just leaderboards.
|
2015-02-04 11:31:43 -08:00 |
|
Nick Winter
|
18202b6852
|
Merge pull request #2237 from divyanshu013/master
Fixed Comment Out My Code for infinite loops for #1788
|
2015-02-04 10:29:13 -08:00 |
|
divyanshu013
|
929c89d2ac
|
Fixed Comment Out My Code for infinite loops for #1788
Fixed the issue for incorrect comments by correcting the syntax per language
|
2015-02-04 21:48:01 +05:30 |
|
Nick Winter
|
5542bd8a89
|
Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed.
|
2015-02-03 18:25:38 -08:00 |
|
Nick Winter
|
762192a4a7
|
A few visual improvements to leaderboadrs.
|
2015-02-03 17:07:15 -08:00 |
|
Nick Winter
|
60d68ca23c
|
Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings.
|
2015-02-02 18:02:57 -08:00 |
|
Nick Winter
|
3f78071e5e
|
A few small fixes.
|
2015-02-02 11:50:25 -08:00 |
|
Nick Winter
|
1e410e0b14
|
Worked around bug with item portraits disappearing after item purchase. Fixed #1980.
|
2015-01-31 14:38:54 -08:00 |
|
Nick Winter
|
936ebf67a7
|
Fixed #2140.
|
2015-01-31 13:18:32 -08:00 |
|
Nick Winter
|
4b388f2775
|
Fixed some memory leaks. Fixed a couple minor bugs.
|
2015-01-31 12:23:44 -08:00 |
|
Nick Winter
|
b538a83fd1
|
Oops, that was just for testing...
|
2015-01-31 10:37:43 -08:00 |
|
Nick Winter
|
c977ecc16f
|
Adding easy observing of leaderboard matches (except top 5).
|
2015-01-31 10:04:11 -08:00 |
|
sotonin
|
751ae0fac8
|
Adding support for hudName property
|
2015-01-31 00:07:23 -06:00 |
|
Nick Winter
|
e59f2bcc62
|
Recording scores even for non-real-time-submit levels.
|
2015-01-30 22:06:22 -08:00 |
|
Nick Winter
|
022d31c19a
|
Basic leaderboards are working.
|
2015-01-30 21:36:48 -08:00 |
|
Nick Winter
|
4efbe0a12f
|
Leaderboard skeletons.
|
2015-01-30 21:36:47 -08:00 |
|
Matt Lott
|
58f8eb6688
|
Add support for premium video tutorials
|
2015-01-30 10:48:49 -08:00 |
|
Nick Winter
|
77cca7189f
|
Updated a bunch of code that got busted with CoffeeScript 1.9.0.
|
2015-01-30 07:51:57 -08:00 |
|
Nick Winter
|
1630b30351
|
Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them.
|
2015-01-29 19:05:30 -08:00 |
|
Nick Winter
|
fd0e7a8c44
|
Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players.
|
2015-01-29 18:19:03 -08:00 |
|
Matt Lott
|
92f070ecca
|
Fix help video events
Removing the protocol broke the video player event hooks.
|
2015-01-29 16:45:18 -08:00 |
|
Nick Winter
|
5addacddf0
|
First draft of ParticleMan particle emitters for showing hidden levels in CampaignView.
|
2015-01-29 16:11:13 -08:00 |
|
Nick Winter
|
57d12c199e
|
Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet.
|
2015-01-29 09:07:25 -08:00 |
|
Nick Winter
|
aab6d17047
|
Added campaign completion progress indicator.
|
2015-01-29 08:26:12 -08:00 |
|
Nick Winter
|
a6043ca1be
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2015-01-28 17:59:11 -08:00 |
|
Nick Winter
|
22070ddff2
|
Identifying lastLevel to Segment. Added Ogre Headhunter names.
|
2015-01-28 17:58:56 -08:00 |
|
yaur
|
dc39a55cf8
|
remove logging
|
2015-01-28 18:37:07 -05:00 |
|
yaur
|
30f9188090
|
Remove the scheme from help videos so that they maintain the scheme of the
calling page
|
2015-01-28 18:33:28 -05:00 |
|
Nick Winter
|
e3bf8f74ab
|
Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all.
|
2015-01-22 12:26:37 -08:00 |
|
Nick Winter
|
64008276c2
|
Finally translating level names and descriptions in the campaign view.
|
2015-01-22 11:22:35 -08:00 |
|
Nick Winter
|
e49a70a62e
|
Fixed mountain map background ratio.
|
2015-01-22 10:48:41 -08:00 |
|
Matt Lott
|
6b271799be
|
Update level loading view sub event data
Sending level slug instead of name.
|
2015-01-21 13:41:38 -08:00 |
|
Nick Winter
|
7dd128780f
|
Unlocking all audition levels in Auditions campaign.
|
2015-01-21 11:49:56 -08:00 |
|
Nick Winter
|
706b2ca930
|
Don't includeFlow for Thangs with skipProtectAPI on, because we don't care about their flow anyway (non-read-write custom Programmables).
|
2015-01-16 18:47:30 -08:00 |
|
Nick Winter
|
f86d106077
|
Showing replayable level difficulty in control bar.
|
2015-01-16 12:50:10 -08:00 |
|
Matt Lott
|
116c7d0bf2
|
Update internal analytics
Adding level session ID where applicable.
Slimming down fields for most common events.
|
2015-01-15 11:04:52 -08:00 |
|
Nick Winter
|
38297a1fd7
|
Fixed problem with levels that don't have next levels in campaign editor.
|
2015-01-15 09:07:47 -08:00 |
|
Scott Erickson
|
3c02f14f95
|
Reworking PlayHeroesModal to use Lanks and LayerAdapter to control hero animations.
|
2015-01-14 14:10:33 -08:00 |
|
Scott Erickson
|
afe590c5cc
|
Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest.
|
2015-01-13 15:34:06 -08:00 |
|
Nick Winter
|
f691eb9a86
|
Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level.
|
2015-01-13 09:04:20 -08:00 |
|
Scott Erickson
|
22e1318970
|
Added a rudimentary (aka programmer-designed) hero-type filter for the item store.
|
2015-01-12 15:30:18 -08:00 |
|
Scott Erickson
|
5cb8f14065
|
Fixed the HeroVictoryModal handling of earned achievements which were earned a while ago. Before they were appearing as if achievements were always newly achieved.
|
2015-01-12 14:43:29 -08:00 |
|
Matt Lott
|
8977450fed
|
Add levelID to Saw Victory analytics event
|
2015-01-08 16:09:39 -08:00 |
|
Nick Winter
|
d66243ad75
|
Beating replayable levels now shows you the proper gems and xp.
|
2015-01-07 18:36:02 -08:00 |
|
Nick Winter
|
4ea2a51ff6
|
In middle of debugging non-functioning repeatable achievements.
|
2015-01-06 21:32:58 -08:00 |
|
Nick Winter
|
9a3f18e60a
|
Save more UserCodeProblems and LevelSessions.
|
2015-01-06 13:03:09 -08:00 |
|
Nick Winter
|
947811c01b
|
Replayable once-per-day increasing-difficulty level basics.
|
2015-01-05 10:44:24 -08:00 |
|
Nick Winter
|
163cf50528
|
Fixed processing of default Programmable config.
|
2015-01-03 13:22:54 -08:00 |
|
Nick Winter
|
c2d74a812d
|
Updates to require/restrict level logic.
|
2015-01-02 15:44:43 -08:00 |
|
Nick Winter
|
f66afa1dc0
|
Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor.
|
2015-01-02 12:40:17 -08:00 |
|
Nick Winter
|
728f726748
|
Fixed problem opening GameMenuModal when there are no help videos.
|
2014-12-29 13:04:03 -08:00 |
|
Nick Winter
|
1440584633
|
Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting.
|
2014-12-29 12:47:53 -08:00 |
|
Nick Winter
|
d85bf8d59a
|
Fixed disabled level logic.
|
2014-12-29 08:46:02 -08:00 |
|
Nick Winter
|
fa9f3e2a61
|
Fixed typo in HeroVictoryModal.
|
2014-12-28 13:53:50 -08:00 |
|
Nick Winter
|
744d30737e
|
Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents.
|
2014-12-28 13:25:20 -08:00 |
|
Nick Winter
|
b4341ad46c
|
Merge branch 'feature/campaign-editor'
|
2014-12-27 11:03:51 -08:00 |
|
Imperadeiro98
|
9fbd1076f9
|
Fixed a link
|
2014-12-26 18:02:40 +00:00 |
|
Nick Winter
|
b116321deb
|
Tested and cleaned up comment detection for space disablement sensitivity.
|
2014-12-24 12:37:25 -08:00 |
|
Nick Winter
|
c7eadb5670
|
Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4
|
2014-12-24 12:24:27 -08:00 |
|
Nick Winter
|
1c1f2008a5
|
Now able to suggest required items for purchase before level start.
|
2014-12-24 11:01:50 -08:00 |
|
Nick Winter
|
f361674fb4
|
Enabling new levels for playtesting.
|
2014-12-23 17:14:59 -08:00 |
|
Nick Winter
|
f0826c865e
|
Preparing new campaign levels for migration to new campaign editor.
|
2014-12-23 17:14:35 -08:00 |
|
Scott Erickson
|
0dd2d9efbd
|
Handled merge conflict.
|
2014-12-22 12:33:52 -05:00 |
|