Commit Graph

575 Commits

Author SHA1 Message Date
Joshua Yanovski
33900fd12b Merge branch 'treeco/new-map' into 'master'
Changed default map and seed, lowered site counts

See merge request veloren/veloren!992
2020-05-21 20:46:54 +00:00
Monty Marz
a6569bc2ae Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Barretto
833bd30602 Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Joshua Barretto
7ae8881b32 Made figure placement correct with warping 2020-05-18 15:15:58 +01:00
Justin Shipsey
462461fc0a Merge branch 'silentium/arms-and-armor' into 'master'
Added 2 sets of armour.

See merge request veloren/veloren!951
2020-05-17 19:03:00 +00:00
Silentium
ee9b137d5f Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Monty Marz
7a362810ee Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel Märtens
c55ec95bb7 swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Joshua Barretto
1f99350448 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Treeco
e5f638d27c Changed default map and seed, lowered site counts 2020-05-15 11:36:19 +01:00
CapsizeGlimmer
bb0881253d Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
d988b34c22 - Update the stats of characters individually, reverting the change with
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
2020-05-13 09:14:09 +10:00
jshipsey
16c382ebc3 cyclops 2020-05-11 21:44:21 -04:00
Treeco
6107cd8630 Removed old-style dungeons
I believe this means that trees are the only thing still using the
old-style structure spawning. Maybe it can be simplified a lot more?
2020-05-11 18:37:16 +01:00
Justin Shipsey
fc711a0eb2 Merge branch 'snowram/dragon-animation' into 'master'
dragon

See merge request veloren/veloren!969
2020-05-10 18:39:29 +00:00
CapsizeGlimmer
f0908210be Update english welcome message 2020-05-09 22:54:15 -04:00
jshipsey
9d6a7981ac dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
a6d16e61e1 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
7f94028653 Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
6171a1c01c dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
73ac1c5600 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
e3cbdc82bc asset and manifest tweaks 2020-05-09 18:09:06 -04:00
Snowram
35e1a8ae60 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
6101085193 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
6c8bfe8d70 Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
211f1276df Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
739ff253ec Dragon work 2020-05-09 18:07:31 -04:00
S Handley
7a6c392fc3 - Load characters after login.
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
Monty Marz
06867348fc Fix animals not attacking 2020-05-04 16:59:32 +00:00
Monty Marz
a52face268 Merge branch 'CapsizeGlimmer/functional_lanterns' into 'master'
Equipped lanterns now provide an illumination effect.

See merge request veloren/veloren!935
2020-05-04 15:15:31 +00:00
CapsizeGlimmer
fe9deb29af Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Julian
caa1af418d Added new SFX and adjusted sfx.ron
New SFX sounds.

add_item.wav (Better fitting pickup sound)
drop_item.wav (New sound for dropping items)
open_inventory.wav (The old pickup sound, can be used for opening the bag but needs to be implemented)
sword_in.wav (Better fitting sound)
sowrd_out.wav (Better fitting sound)

Fixed the drop sfx sound in sfx.ron
Its the drop_item sound instead of a grass moving step.
2020-05-03 21:52:11 +02:00
Monty Marz
20aee17e94 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
65151bf175 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Pfauenauge90
6bdd8471a9 cleanup, more dungeon entrances 2020-04-29 17:01:35 +02:00
Joshua Barretto
70d798bafd Added dungeon entrances 2020-04-29 17:01:34 +02:00
Joshua Barretto
fde7e6fedc Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
1c5c0adf15 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Justin Shipsey
61c0c2991d new animals 2020-04-28 03:13:23 +00:00
Monty Marz
7c4effd1a1 Merge branch 'pfau/ui-fixes' into 'master'
UI Fixes

See merge request veloren/veloren!946
2020-04-26 01:44:56 +00:00
Monty Marz
4f8076c2ba UI Fixes 2020-04-26 01:44:56 +00:00
Justin Shipsey
82bafaaef8 body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Barretto
091933d5b0 Made GPU bone updates more conservative for moar fps 2020-04-25 21:44:23 +01:00
Joshua Barretto
b6b8b5363f Squashed figure vertices for better performance 2020-04-25 21:44:23 +01:00
Joshua Barretto
0249facbd6 Reduced size of terrain sprite vertices 2020-04-25 21:44:23 +01:00
Joshua Barretto
3d5ca63a55 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Pfauenauge90
f2f413cc34 sprites VD slider visuals 2020-04-25 21:44:23 +01:00
jshipsey
6feb375da4 fix for hollow chests 2020-04-25 21:44:23 +01:00
Joshua Barretto
7eedb6e09f Better LoD distance scaling 2020-04-25 21:44:23 +01:00
Songtronix
4152181264 fix: misspelling in english translation 2020-04-24 18:30:58 +02:00