Commit Graph

3897 Commits

Author SHA1 Message Date
François Mockers
ae712f77a2 fix iterator type 2020-05-14 22:13:08 +02:00
Monty Marz
fdd8303fe4 Merge branch 'CapsizeGlimmer/waypoint_notification' into 'master'
Popup message when setting waypoint

See merge request veloren/veloren!973
2020-05-14 16:56:10 +00:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Joshua Barretto
51eb928eb8 Merge branch 'small-fixes' into 'master'
Small fixes for 0.6

See merge request veloren/veloren!986
2020-05-13 16:01:52 +00:00
Forest Anderson
1179aa2586 Merge branch 'angelonfira/clean-changelog' into 'master'
Fix spelling and structure of changelog

See merge request veloren/veloren!977
2020-05-13 15:04:49 +00:00
Joshua Barretto
dd91fc53f8 Resolved bizarre dungeon spawn rate bug 2020-05-13 15:49:33 +01:00
Forest
b678796549 Fix spelling and structure of changelog 2020-05-13 09:58:42 -04: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
Shane Handley
fa8c6418f6 Write stats to the DB when a player disconnects from the server. 2020-05-13 22:08:26 +10:00
Forest Anderson
7703bc1214 Merge branch 'imbris/entity_count' into 'master'
Fill in entity_count in metrics

See merge request veloren/veloren!983
2020-05-13 08:13:05 +00:00
Acrimon
d47706fe4c Merge branch 'acrimon/derive-uuid-fix' into 'master'
Fix #556

Closes #556

See merge request veloren/veloren!982
2020-05-13 00:03:21 +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
0a6f9b860d Gather all characters stats in the system, build one big query, rather than per-character queries. 2020-05-13 09:14:08 +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
Acrimon
0993e9e146
Fix #556 2020-05-13 01:08:33 +02:00
Justin Shipsey
19a0ffb673 Merge branch 'slipped/animtweaks' into 'master'
Slipped/animtweaks

See merge request veloren/veloren!980
2020-05-12 02:42:26 +00:00
jshipsey
ceb771bb2c keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
jshipsey
137c700b80 fix swim bug 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
2abc78e35c Merge branch 'treeco/yeet-old-dungeons' into 'master'
Remove old-style dungeons

See merge request veloren/veloren!976
2020-05-11 18:36:18 +00: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
Treeco
6281ab865a Increased the spawn rate of towns and dungeons 2020-05-11 18:37:34 +01:00
Treeco
2797af0c87 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
Songtronix
0ee0949b8b Merge branch 'songtronix/fix-server-compose' into 'master'
fix: outdated volume path for server-cli

See merge request veloren/veloren!975
2020-05-11 11:50:36 +00:00
Songtronix
67df50708d fix: outdated volume path 2020-05-11 11:07:37 +02:00
Imbris
2b4de3730d Merge branch 'imbris/small-fixes' into 'master'
Fix leaning bug and dragging panic

Closes #534 and #547

See merge request veloren/veloren!974
2020-05-11 05:25:32 +00:00
Imbris
81227b917f fix leaning 2020-05-11 00:53:37 -04:00
Imbris
3450bfabfd Add orientation to debug text 2020-05-11 00:10:03 -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
24fa23fef4 Initial client implementation of tab completion 2020-05-10 19:16:01 -04:00
Justin Shipsey
78f3f2cc32 Merge branch 'snowram/dragon-animation' into 'master'
dragon

See merge request veloren/veloren!969
2020-05-10 18:39:29 +00:00
Dominik Broński
a8b15209a4 Merge branch 'CapsizeGlimmer/welcome_message' into 'master'
Update english welcome message

Closes #551

See merge request veloren/veloren!971
2020-05-10 11:32:02 +00:00
CapsizeGlimmer
8d3463e2f1 Update english welcome message 2020-05-09 22:54:15 -04:00
CapsizeGlimmer
58b0e9ef75 Move cursor to end when moving through chat history 2020-05-09 21:51:02 -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
5b48fe5661 delete unused jump file 2020-05-09 19:59:34 -04:00
Snowram
b8ed55113b Updated changelog 2020-05-10 01:41:35 +02:00
Snowram
4ba222abcd Fix dragon jaw Z fighting 2020-05-10 01:40:53 +02:00
jshipsey
41ff0bde69 rebase 2020-05-09 18:56:08 -04:00