Tyler Renelle
6ec5f818d5
use potion and reroll from shop sheet
2013-02-08 13:57:12 -05:00
Tyler Renelle
4ac5d5e24d
put debugging in if in debugging environment
2013-02-08 13:57:00 -05:00
Tyler Renelle
2be5136a2f
shop items now working. really crappy css (@Pandoro save me?) but it works
2013-02-08 13:43:57 -05:00
Tyler Renelle
a166f7c909
move *.styls out into their own files
2013-02-08 13:29:09 -05:00
Tyler Renelle
5160595354
add @Pandoro's new sprites to /styl, clean up
2013-02-08 13:22:09 -05:00
Tyler Renelle
e062b7bc50
Merge branch 'master' into customizations
2013-02-08 12:51:06 -05:00
Tyler Renelle
9c8cc056a6
Merge branch 'master' of github.com:lefnire/habitrpg
2013-02-08 12:50:59 -05:00
Tyler Renelle
9250b8b2b5
some more fixes on "nextItem"
2013-02-08 12:50:37 -05:00
Stan Lindsey
f42bf76217
Create googlef3b1402b0e28338a.html
2013-02-08 08:14:02 -08:00
Tyler Renelle
3fa27a6a48
Merge pull request #343 from Pandoro/new_pixel_art
...
Reorganized and improved sprites
2013-02-08 07:38:17 -08:00
Alex
eb804a1d7d
Reorganized and improved sprites
...
*Gimp file into female and male.
*Created sprites for both of them
*Created a shop.xcf Here shop versions for all items will be kept.
*Created a shop sprite. Includes potion, reroll icon and gold, silver, copper coins
*Created a development xcf. This will contain items which are in development and a base pixel art for male and female which can be used to cross check your new items against. E.g. does my helmet fit the system yes or no?
2013-02-08 15:18:44 +01:00
Stan Lindsey
0f0f2b0582
Merge pull request #342 from Orangyfresh/master
...
Gimp files for Iron, Red Robes and Rogue armor sets.
2013-02-08 06:06:21 -08:00
Harry Stringer
9e5554b2a4
Gimp files for Iron, Red Robes and Rogue armor sets.
2013-02-09 00:51:36 +11:00
Tyler Renelle
5e5a62ab52
back to orig #racer, i had to revert a codeparty commit
2013-02-08 03:23:32 -05:00
Tyler Renelle
a1fa301528
back to orig #racer, i had to revert a codeparty commit
2013-02-08 03:23:15 -05:00
Tyler Renelle
0967ac684d
use frozen racer version (newer commits break things)
2013-02-08 02:39:35 -05:00
Tyler Renelle
e894ecb9c7
use frozen racer version (newer commits break things)
2013-02-08 02:39:13 -05:00
Tyler Renelle
8b9b277036
update schema
2013-02-08 02:30:26 -05:00
Tyler Renelle
b4fda373cb
all item-code refactored into its own classes, item store working
2013-02-08 02:01:48 -05:00
Tyler Renelle
8d28cf1bfa
start moving item-specific code to it's own file
2013-02-08 01:32:55 -05:00
Tyler Renelle
1bcd4a3fbd
some more half-backed changes for the new customization engine
2013-02-08 01:04:38 -05:00
Tyler Renelle
9eb94988ba
Merge pull request #338 from Shaners/master
...
New Pet Sprites
2013-02-07 20:08:42 -08:00
Shane Lister
1a74640a97
New Pet Sprites
...
New sprites for pet: tiger, panda, and flying pig.
2013-02-07 20:04:16 -08:00
Tyler Renelle
e42d4e6ba6
half-baked commit to save my progress and show my direction, we may
...
want to rever this
2013-02-07 22:42:59 -05:00
Tyler Renelle
b6398964fe
got most of the character customizations working
2013-02-07 22:28:44 -05:00
Tyler Renelle
b134ec558d
add in popover for customizations (can't get css working properly)
2013-02-07 21:24:04 -05:00
Tyler Renelle
76231aed12
begin integrating spritesheet
2013-02-07 20:53:11 -05:00
Tyler Renelle
6738d0ae56
disable database preening for now
2013-02-07 19:20:56 -05:00
Tyler Renelle
a8882620d5
party subscriptions fixes
2013-02-07 19:19:26 -05:00
Tyler Renelle
e5005400a3
Merge branch 'master' of github.com:lefnire/habitrpg
2013-02-07 17:07:03 -05:00
Tyler Renelle
9b91977f59
set batchupdate.obj if not already set (thanks @SlappyBag!)
2013-02-07 17:06:22 -05:00
Tyler Renelle
1a02707828
Merge pull request #327 from alanthing/nconf
...
Use nconf to load in configuration values
2013-02-07 08:11:13 -08:00
Alan Ivey
537b7e1f1f
Use nconf to load in configuration values
...
A config.json file can be used for all ENV settings, and nconf will still allow using ENV overrides. See https://github.com/flatiron/nconf for syntax, or copy the config.json.example file to config.json.
2013-02-07 07:47:34 -05:00
Tyler Renelle
05df606a85
Merge branch 'master' of github.com:lefnire/habitrpg
2013-02-06 22:56:36 -05:00
Tyler Renelle
4bb155939d
attempt #2 at user obj being null
2013-02-06 22:55:34 -05:00
Tyler Renelle
1be82a4313
Merge pull request #321 from Shaners/master
...
Addition of 4 new Pet Sprites
2013-02-06 18:04:34 -08:00
Shane Lister
1883ee4a28
New Pet Sprites
...
New Pet Sprites for: Fox, Bear Cub, Dragon, and Lion.
2013-02-06 18:00:47 -08:00
Tyler Renelle
f020eb1162
fix to undfeind 'items' (this shouldn't be happening)
2013-02-06 15:19:37 -05:00
Tyler Renelle
1aa047d163
remove debuggging buttons
2013-02-06 15:05:14 -05:00
Tyler Renelle
f54c30bb78
racer #37 still an issue
2013-02-06 14:57:12 -05:00
Tyler Renelle
c82a10a670
don't migrate already-migrated users
2013-02-06 14:30:05 -05:00
Tyler Renelle
906932090f
Merge branch 'parties'
...
Conflicts:
src/app/helpers.coffee
src/app/scoring.coffee
2013-02-06 14:16:52 -05:00
Tyler Renelle
9854bc1a3c
some typo fixes
2013-02-06 14:12:05 -05:00
Tyler Renelle
7764447355
many fixes to party system actions causing dom refresh
2013-02-06 13:59:56 -05:00
Tyler Renelle
0e6d08e16b
add more debug tools, and email me on error
2013-02-06 02:44:42 -05:00
Tyler Renelle
a0c4480c53
cleanup, typos, html tidying
2013-02-06 01:59:02 -05:00
Tyler Renelle
427e2983cf
some setup and comments for unsubscribe, for when we get that fixed in
...
the future
2013-02-06 01:11:12 -05:00
Tyler Renelle
972a7af0ff
various fixes and page-refresh fallbacks
2013-02-06 00:47:08 -05:00
Tyler Renelle
6ce382af51
closure queries fully setup, but they break on page refresh. just
...
regenerate each time for now
2013-02-06 00:15:00 -05:00
Tyler Renelle
d8bc88dcb0
closure access to party and members query, setting up for
...
unsubscription / resubscription
2013-02-05 23:42:30 -05:00
