Commit Graph

1087 Commits

Author SHA1 Message Date
Joshua Barretto
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Justin Shipsey
9e5c0ce601 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
1673a25e8b Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel Märtens
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Joshua Barretto
db59a3ca3d Merge branch 'small-fixes' into 'master'
Dungeon Bosses

See merge request veloren/veloren!994
2020-05-15 19:07:11 +00:00
Joshua Barretto
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
c3e1fd8664 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
a41576e767 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
ae712f77a2 fix iterator type 2020-05-14 22:13:08 +02:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Forest Anderson
acab072a63 Merge branch 'shandley/persistence-stats' into 'master'
Stats Persistence

See merge request veloren/veloren!970
2020-05-13 13:43:22 +00:00
Imbris
8f857e6e11 Fill in entity_count in metrics 2020-05-12 19:44:27 -04:00
Shane Handley
e852e0cfab - 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
7c6c9f4302 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
e5853dbdd4 Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
Imbris
7233dbee3e 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
49d1225823 Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
Forest Anderson
28402e2bc1 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
81227b917f fix leaning 2020-05-11 00:53:37 -04:00
Imbris
48a5001392 Show component in error message when sync modification fails because it does not exist 2020-05-11 00:09:17 -04:00
Imbris
8aa88b22a5 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
3f76d1d702 Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer" 2020-05-10 19:17:34 -04:00
CapsizeGlimmer
9d118b55a0 Fixed player list tab completion 2020-05-10 19:17:17 -04:00
CapsizeGlimmer
b486de28ac Implement tab completion of enums (/object /time /spawn) and numbers 2020-05-10 19:16:34 -04:00
CapsizeGlimmer
28e94afd3f Finish tab completion implementation 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
b0f0d716be Tab completion returns real results 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
7ecea34f85 Server server::cmd depends on common::cmd 2020-05-09 21:50:51 -04:00
CapsizeGlimmer
307e478671 Groundwork for tab completion of player names and command arguments 2020-05-09 21:24:33 -04:00
jshipsey
cf392b5a66 fmt 2020-05-09 18:11:25 -04:00
jshipsey
62bd79dba7 dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
5b77c74497 Add cockatrice 2020-05-09 18:09:27 -04:00
Robin Gilh
40360ff149 Dragon work 2020-05-09 18:07:31 -04:00
S Handley
5a13b54cbf - 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
63826d1a50 Add optional argument to /get_items 2020-05-07 18:39:48 +00:00
Monty Marz
b589c3fc71 Fix animals not attacking 2020-05-04 16:59:32 +00:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Joshua Barretto
d0b1c9eb6f Added dungeon entrances 2020-04-29 17:01:34 +02:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Joshua Barretto
bd58be9f58 fmt 2020-04-26 17:56:09 +01:00
Joshua Barretto
bd2093c819 Fixed projectile solid collisions 2020-04-26 17:56:09 +01:00
Joshua Barretto
58b30c4518 Stopped velocity when point particles hit walls 2020-04-26 17:56:09 +01:00
Joshua Barretto
b750b2b00c Fixed logic issue with sticky objects 2020-04-26 17:56:09 +01:00
Joshua Barretto
8e0f40c71e Added on_ceiling check for sticky entities 2020-04-26 17:56:09 +01:00
Joshua Barretto
eb23b0b2bd Added Colliders, made projectiles point particles 2020-04-26 17:56:09 +01:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Barretto
d2ab29b8bd Clean up reexport 2020-04-25 21:44:23 +01:00