1090 Commits

Author SHA1 Message Date
Joshua Barretto
59f76e9fb5 Merge branch 'zesterer/small-fixes' into 'master'
Camera tweaks

See merge request veloren/veloren!1004
2020-05-19 17:35:43 +00:00
Forest Anderson
6ec101ecc2 Merge branch 'jbeich/veloren-freebsd' into 'master'
Enable system assets on more Unices

See merge request veloren/veloren!1005
2020-05-19 00:20:07 +00:00
Joshua Barretto
833bd30602 Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Jan Beich
b3fa399a82 Enable system assets on more Unices 2020-05-18 15:53:50 +00: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
5e96162ad4 Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Joshua Barretto
3b8dae468a Merge branch 'small-fixes' into 'master'
Dungeon Bosses

See merge request veloren/veloren!994
2020-05-15 19:07:11 +00:00
Joshua Barretto
1f99350448 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
5c8aefc51b Merge branch 'mockersf/fix-doc-generation' into 'master'
fix doc generation

See merge request veloren/veloren!993
2020-05-15 14:18:15 +00:00
Shane Handley
3fe0159ab0 Correctly set the exp target for the next level when spawning a character.
Removed the unwrap_or from the update method for stats persistence, and
have a dedicated method for updating single rows with a new connection.
2020-05-15 13:27:26 +10:00
François Mockers
ba0d9d3037 fix iterator type 2020-05-14 22:13:08 +02:00
CapsizeGlimmer
bb0881253d Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Forest Anderson
5ea3f19d18 Merge branch 'shandley/persistence-stats' into 'master'
Stats Persistence

See merge request veloren/veloren!970
2020-05-13 13:43:22 +00:00
Imbris
d587708958 Fill in entity_count in metrics 2020-05-12 19:44:27 -04: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
Shane Handley
ceb3e26341 Stats persistence
- Update client code to use persisted stats
- Add a system for stats persistence
- Add a basic scheduler to control duration between execution of
persistence systems
2020-05-13 09:14:08 +10:00
Shane Handley
622465b35d Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
jshipsey
16c382ebc3 cyclops 2020-05-11 21:44:21 -04:00
Imbris
d605242fe7 Merge branch 'CapsizeGlimmer/tab_completion' into 'master'
Tab completion code review suggestions

Closes #553

See merge request veloren/veloren!979
2020-05-11 23:56:48 +00:00
CapsizeGlimmer
805c5d651e Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
Forest Anderson
3c6025fd46 Merge branch 'CapsizeGlimmer/tab_completion' into 'master'
Capsize glimmer/tab completion

See merge request veloren/veloren!972
2020-05-11 17:49:26 +00:00
Imbris
3c37ae3ab1 fix leaning 2020-05-11 00:53:37 -04:00
Imbris
12c22bf287 Show component in error message when sync modification fails because it does not exist 2020-05-11 00:09:17 -04:00
Imbris
8bd19d62b1 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
03986d2070 Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer" 2020-05-10 19:17:34 -04:00
CapsizeGlimmer
c2e7d3e00a Fixed player list tab completion 2020-05-10 19:17:17 -04:00
CapsizeGlimmer
acd9f1bb6e Implement tab completion of enums (/object /time /spawn) and numbers 2020-05-10 19:16:34 -04:00
CapsizeGlimmer
e00ca17f01 Finish tab completion implementation 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
078aec757a Tab completion returns real results 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
16a32d0003 Server server::cmd depends on common::cmd 2020-05-09 21:50:51 -04:00
CapsizeGlimmer
d2a77f25bb Groundwork for tab completion of player names and command arguments 2020-05-09 21:24:33 -04:00
jshipsey
7bf0d99a9a fmt 2020-05-09 18:11:25 -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
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
CapsizeGlimmer
a58e884e9c Add optional argument to /get_items 2020-05-07 18:39:48 +00:00
Monty Marz
06867348fc Fix animals not attacking 2020-05-04 16:59:32 +00:00
CapsizeGlimmer
fe9deb29af Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00: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
Joshua Barretto
70d798bafd Added dungeon entrances 2020-04-29 17:01:34 +02:00
Justin Shipsey
61c0c2991d new animals 2020-04-28 03:13:23 +00:00
Joshua Barretto
f722a67911 fmt 2020-04-26 17:56:09 +01:00
Joshua Barretto
da11d54b6c Fixed projectile solid collisions 2020-04-26 17:56:09 +01:00
Joshua Barretto
3370d0a08f Stopped velocity when point particles hit walls 2020-04-26 17:56:09 +01:00
Joshua Barretto
0763e6250f Fixed logic issue with sticky objects 2020-04-26 17:56:09 +01:00
Joshua Barretto
f4de3d0806 Added on_ceiling check for sticky entities 2020-04-26 17:56:09 +01:00