Commit Graph

67 Commits

Author SHA1 Message Date
Blade Barringer 6441888d3f Moved mountMaster watch to feeding function 2015-01-02 19:09:50 -06:00
Blade Barringer 9b82da064f Moved the beastMaster modal alert from notifications to inside the hatching function 2015-01-02 18:52:25 -06:00
Blade Barringer 71a2ef91ca Fixed modals from not popping up when beastMaster and mountMaster
achieved
2015-01-01 20:52:55 -06:00
Blade Barringer cea2879539 Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster 2014-12-11 08:15:18 -06:00
Tyler Renelle 66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
Taldin 506ac6ebe7 added mountmaster support
inventoryCtrl: Changed Matt to show 90 mounts instead of 180
notificationCtrl: added mountmaster achievement test
userCtrl: added scope.profile.mountCount
user.js: added fields for mountMaster and mountMasterCount (not used
yet),  mountCount function
modals/achievements.jade - added modal dialog for mountmaster (note:
wolf graphic was not available locally)
profiles/achievements - jade  - mountmaster added
stats.jade -- uncommented broken Mounts Tamed section, since it works
now
2014-10-30 12:35:40 -07:00
Tyler Renelle 0b9c5271bb feat(newStuff): show newStuff modal on page load if present 2014-08-25 17:49:53 -06:00
Tyler Renelle 06b6b4cde0 Merge pull request #3856 from Fandekasp/add_audio
Add audio
2014-08-15 17:30:12 -06:00
Alice Harris 2566ddac94 fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787 2014-08-12 07:14:50 +10:00
Adrien Lemaire e00ea4c248 add missing sound actions 2014-08-09 19:09:58 +09:00
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Matteo Pagliazzi 176b39a1a0 fix(typo) 2014-08-03 12:55:17 +02:00
Matteo Pagliazzi a30ee4368a fix(notifications): fix drop notifications 2014-08-03 12:28:29 +02:00
Tyler Renelle d848faee8e fix(quests): show completion dialog 2014-07-12 14:32:13 -06:00
James Hsiao 70af0869c6 Avoid modals for streaks > 1 and beastmaster > 91 2014-04-22 13:54:52 -04:00
Tyler Renelle a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
Tyler Renelle c95c6a4c3b chore(modals): remove mathUpdates modal (no longer in use). reference
this commit for any future emergency updates
2014-02-12 21:24:50 -07:00
Matteo Pagliazzi 8fdc5327e9 refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification 2014-02-12 15:10:22 +01:00
Matteo Pagliazzi fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Tyler Renelle ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
Tyler Renelle ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3
Conflicts:
	views/options/social/tavern.jade
2014-02-07 00:03:33 -07:00
Tyler Renelle 106a7fa475 refactor(errors): refactor the way errors, offline, & queued ops are handled 2014-02-06 21:10:13 -07:00
Matteo Pagliazzi e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Marcelo Sizer 386d108c3c Replace hard-coded strings for window.env.t on js files 2014-02-05 20:43:49 -02:00
Matteo Pagliazzi ce5edbee58 refactor(bs3): consistent style for modals 2014-02-05 16:51:35 +01:00
Matteo Pagliazzi 379da41982 refactor(bs3): port notifications 2014-02-04 20:53:09 +01:00
Matteo Pagliazzi cdc13d2ffb refactor(bs3): misc 2014-02-03 19:24:37 +01:00
Matteo Pagliazzi 07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi 317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Matteo Pagliazzi af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Matteo Pagliazzi ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Andrew Bloomgarden dc368bb652 Remove references to $rootScope.Shared & .Content in non-view code.
Instead, have them request services that return them so tests don’t need to prepare special state.
2014-01-15 21:33:58 -08:00
Sabe Jones 6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Tyler Renelle bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2
Beef up critical hit notification with its own style and icon
2014-01-07 10:34:07 -08:00
Sabe Jones 1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
Sabe Jones be2def91f1 Fix #2048 (streak bonuses not appearing to add up) 2014-01-07 11:14:34 -06:00
Cole Gleason eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00
Cole Gleason f218a52bf2 Add Critical Hit notification by watching user._tmp.crit 2014-01-02 13:41:50 -06:00
Sabe Jones be38029015 Extend notification time, fix MP alerts 2013-12-31 10:29:48 -06:00
Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
Tyler Renelle 13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3
Fix #2072 (add Mana delta alerts)
2013-12-27 07:53:12 -08:00
Sabe Jones 3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Sabe Jones e5b8a92ea2 Minimal fix for #2092 2013-12-25 23:56:51 -06:00
Sabe Jones f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle 8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle bc0034f022 apiv2 handle notifications circular-dependency. migration
fixes. Rest=>Sleep fixes
2013-12-15 10:57:53 -07:00
Tyler Renelle ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
Tyler Renelle 8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00
Matteo Pagliazzi e722a064c8 revert drop notification change 2013-11-22 20:11:35 +01:00