Commit Graph

606 Commits

Author SHA1 Message Date
Tyler Renelle 10e9d3eb40 fixed undo on checkboxed items 2013-03-17 21:43:03 -04:00
Tyler Renelle 2f3d0fa86a start adding undo functionality 2013-03-17 21:30:24 -04:00
Tyler Renelle 2be827f484 Merge branch 'cdn-scripts' into develop 2013-03-17 09:33:19 -04:00
Tyler Renelle 0bcea534ae better "reroll" comment 2013-03-17 09:13:25 -04:00
Tyler Renelle 0c1151b123 don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
Tyler Renelle dbc3906eb3 possible fix to dom losing functions after model.resetDom() 2013-03-16 20:02:01 -04:00
Tyler Renelle 903479af5a add view functions and(), or(), notEqual() 2013-03-16 19:10:40 -04:00
Tyler Renelle 48cbe7c383 Merge branch 'master' into develop
Conflicts:
	views/app/settings.html
2013-03-15 18:40:21 -04:00
Tyler Renelle 545e5fc2a4 allow manually unlocking party system 2013-03-15 18:39:39 -04:00
Tyler Renelle 368748b67a add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:59:15 -04:00
Tyler Renelle 6c61c0f7db add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:58:37 -04:00
Tyler Renelle 325d906708 begin adding toggle-header 2013-03-15 17:30:59 -04:00
Tyler Renelle 174a0d2362 cleaner view.fn "tnl" 2013-03-15 17:30:46 -04:00
Tyler Renelle 7f93b525c0 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
Tyler Renelle 3fa6aaceed add 'show helm' option 2013-03-15 17:20:15 -04:00
Tyler Renelle f2faf8c968 add 'show helm' option 2013-03-15 17:20:01 -04:00
Tyler Renelle 823f524d57 begin adding toggle-header 2013-03-15 16:47:48 -04:00
Tyler Renelle b76b1a33f5 cleaner view.fn "tnl" 2013-03-15 12:06:38 -04:00
Tyler Renelle d2837afbd4 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
Tyler Renelle 2f372124b3 start moving javascript loading functionality back to <Scripts:> so we
can utilize CDNs
2013-03-15 11:15:35 -04:00
Tyler Renelle 3f251c4b32 Merge pull request #624 from zakkain/ui-tweaks
Time to update the dev preview again!
2013-03-14 11:38:06 -07:00
Tyler Renelle bb57eddec1 divide exp gain by 2, temporary hack since people are leveling way too
fast.
2013-03-12 10:05:18 -04:00
Tyler Renelle 4d5110c9d3 Merge pull request #627 from toebu/high-level-algo-fix
Changing expModifier and hpModifier algo to be less influenced by level....
2013-03-10 08:46:42 -07:00
Tyler Renelle 72e81b8891 #315 fixes: newValue not accessible at scope, only remove duff history
entries, not all
2013-03-10 11:40:58 -04:00
Tyler Renelle 0332ee7b48 Merge pull request #616 from MrConcept/fix
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
Tobias Leugger cbbfdaa542 Changing expModifier and hpModifier algo to be less influenced by level. For high lvls (~50), you actually get HP instead of losing them with the current formula. This now doesn't happen anymore (at least for levels up to 100, which is the current max). 2013-03-09 20:14:42 +01:00
Tobias Leugger 9aac271b60 Improving readability of the statements for setting the colour of a task 2013-03-09 20:06:53 +01:00
Zachary Kain f89037da53 new drag animation, tiny outline & shadow tweaks 2013-03-08 22:26:01 -05:00
Zachary Kain 17dcb70e04 Merge remote-tracking branch 'upstream/develop' into ui-tweaks 2013-03-08 19:01:25 -05:00
Philip How 50c5069224 notifications tweak and history fix 2013-03-08 00:10:11 +00:00
Tyler Renelle 75aadf6eb1 add default numbers for restore tool if one isn't provided: #594 2013-03-06 13:32:10 -05:00
Philip How 0dbf2257d7 New Algorithms + fixes 2013-03-06 17:02:08 +00:00
Zachary Kain 456580e352 gut & re-style Task Options, only Rewards tasks & options left to go through 2013-03-06 00:50:39 -05:00
Zachary Kain 84e07a0317 better a11y than display:none 2013-03-06 00:50:39 -05:00
Zachary Kain ce19fed852 remove responsive from bootstrap includes. Rolling our own! 2013-03-06 00:50:38 -05:00
Tyler Renelle b6564828ce use different rewards selector for items-unlocked popover, wasn't getting it 2013-03-05 21:41:01 -05:00
Tyler Renelle 4f7cdc38e9 add help popover to difficulty 2013-03-05 18:58:15 -05:00
Tyler Renelle 9c14b29a3d rename priority multiplier to "Difficulty" -> easy, medium,
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 18:07:22 -05:00
Tyler Renelle 26a26b5344 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-05 14:23:00 -05:00
Tyler Renelle 22c5acc303 tour fix 2013-03-05 14:02:46 -05:00
Philip How 7e402c5688 iterative levelling 2013-03-05 13:17:46 +00:00
Philip How 8e7c93aa0b iterative levelling 2013-03-05 13:11:13 +00:00
Philip How d616579e4e cap deltas 2013-03-05 09:51:42 +00:00
Tyler Renelle 17ab9b9a22 Merge pull request #582 from MrConcept/onlies
Onlies
2013-03-04 14:07:14 -08:00
Philip How 78ba0f5214 comment logging 2013-03-04 22:04:02 +00:00
Philip How 7c10aafb1c Fixes galore 2013-03-04 22:00:12 +00:00
Tyler Renelle 8c1c5bba13 possible fix for #562 - reflists sometimes contain a null value 2013-03-04 15:20:53 -05:00
Tyler Renelle bb5fe4520f only setup bootstrap growl notifications once. i still don't get this.
this issue is caused after browser.resetDom(), which happens on (1)
cron, (2) reset, (3) reroll. after which for some people this commit
will cause notifications to disappear altogether, while for others
reverting this commit will cause notifications to double.
2013-03-04 12:50:49 -05:00
Tyler Renelle 721803d4de don't use bootstrap tour until #578 fixed 2013-03-04 12:48:10 -05:00
Tyler Renelle 378a03b6a0 add bootstrap tour as a submodule, some cleanup 2013-03-04 12:47:33 -05:00