Commit Graph

15304 Commits

Author SHA1 Message Date
Otto Richter
48da79f6a4 Update translation files (Weblate) 2024-03-06 14:42:58 +00:00
crabman
a49c5edde8 Merge branch 'crabman/item-merging' into 'master'
Dynamic item merging

See merge request veloren/veloren!4126
2024-03-05 22:41:47 +00:00
Illia Denysenko
2b570c4161 Merge branch 'crabman/inline-loot-table' into 'master'
add InlineLootTable to LootSpec

See merge request veloren/veloren!4363
2024-03-05 22:37:02 +00:00
crabman
feecd6ea2b
Dynamic merging of dropped items 2024-03-05 20:59:32 +00:00
crabman
78f08dae9f Merge branch 'crabman/mio-update' into 'master'
upgrade to mio 0.8.11 to fix RUSTSEC-2024-0019

See merge request veloren/veloren!4364
2024-03-05 16:28:42 +00:00
crabman
82052f4517
add InlineLootTable to LootSpec 2024-03-05 15:36:29 +00:00
crabman
b8e95a7968
upgrade to mio 0.8.11 to fix RUSTSEC-2024-0019 2024-03-05 15:28:46 +00:00
crabman
69ade26498 Merge branch 'crabman/beam-tgt-dist-fix' into 'master'
Use correct target distance for ray cast in beam system

See merge request veloren/veloren!4361
2024-03-04 18:21:12 +00:00
crabman
eae7f06165
Use correct target distance for ray cast in beam system 2024-03-04 17:32:23 +00:00
flo
2d658e67d4 Merge branch 'cursekeeper_tweaks' into 'master'
cursekeeper_tweaks

See merge request veloren/veloren!4356
2024-03-03 17:50:46 +00:00
flo
327c195374 cursekeeper_tweaks 2024-03-03 17:50:46 +00:00
Illia Denysenko
7016ebfff3 Merge branch 'juliancoffee/broom_particles' into 'master'
Better Admin Broom look & feel

See merge request veloren/veloren!4358
2024-03-03 15:51:28 +00:00
juliancoffee
a2119e3d00 Better Admin Broom look & feel
+ Own animation
+ Add look_dir orientation
+ Boost particles only stay for 0.25 secs
+ Boost particles use ParticleMode::PortalFizz
2024-03-03 17:09:55 +02:00
Illia Denysenko
ef5a9663ba Merge branch 'juliancoffee/gliding-travelers' into 'master'
Better Gliding for NPCs

See merge request veloren/veloren!4348
2024-03-02 23:27:16 +00:00
juliancoffee
3eee002fa3 Made behaviour during GlideWield more clean 2024-03-02 22:51:47 +02:00
Illia Denysenko
998561f9b2 Merge branch 'fvasco-command-transform-invalid-presence' into 'master'
Italian translation

See merge request veloren/veloren!4352
2024-03-02 14:04:56 +00:00
Francesco Vasco
c6ae981d2b Italian translation 2024-03-02 10:59:00 +01:00
juliancoffee
29ca171256 Spread out /make_npc starting velocities 2024-03-01 21:59:08 +02:00
juliancoffee
60d47326bd Implement reliable gliding AI
- Wield glider when falling, but do nothing else
- Safe auto glide when in gliding state
- Agent unwield glider if on ground
2024-03-01 21:59:08 +02:00
juliancoffee
e861aae836 Add gliders to travelers 2024-03-01 21:28:09 +02:00
Illia Denysenko
958cf048f4 Merge branch 'juliancoffee/gliding-wind-fix' into 'master'
Fix client-side gliding

See merge request veloren/veloren!4349
2024-03-01 19:26:25 +00:00
juliancoffee
f9e8276a94 Add a note about setting local wind client-side 2024-03-01 19:36:23 +02:00
juliancoffee
67a4d30f81 Fix ridge lift
- Fix formula for steepness
- Reduce ridge lift coefficient to 1.0 (from 2.0 previously)
2024-03-01 19:19:19 +02:00
juliancoffee
a06e79b089 Fix client-side wind simulation
- Apply local wind on the client WeatherGrid
- Set air_vel to zero if not simulating
2024-03-01 19:19:19 +02:00
Imbris
5c517e88c9 Merge branch 'synis/chat-tweaks' into 'master'
Synis/chat tweaks

See merge request veloren/veloren!4289
2024-03-01 16:42:10 +00:00
Syniis
392599e586 Addressed review comments and added persistence 2024-03-01 04:10:38 +01:00
Syniis
0a38c68337 Changelog entry 2024-03-01 04:10:36 +01:00
Syniis
c3e533d7f1 Cleaner logic, fixed bug preventing chat from being scrolled 2024-03-01 04:09:59 +01:00
Syniis
4caebcf4a3 Revert some changes and fix scrolling bug 2024-03-01 04:09:59 +01:00
Syniis
debbaea83c Store a backlog of messages sent while the chat is hidden 2024-03-01 04:09:59 +01:00
Syniis
b775399235 Respect scale 2024-03-01 04:09:59 +01:00
Syniis
aa35ed9e93 Ability to open chat while hidden 2024-03-01 04:09:59 +01:00
Syniis
1cb0b6a84e Chat tab message notification and disable chat tab fade-out 2024-03-01 04:09:59 +01:00
Syniis
4d638540e0 Better text wrapping and proper out of bounds checks 2024-03-01 04:09:59 +01:00
Syniis
5b78e4eee4 Don't let chat move offscreen 2024-03-01 04:09:59 +01:00
Syniis
4d1d2e58da Added Draggable area widget 2024-03-01 04:09:59 +01:00
Syniis
dfffb658f4 Allow moving chat window 2024-03-01 04:09:59 +01:00
Syniis
eec1b57a5c Basic resize functionality 2024-03-01 04:09:58 +01:00
Illia Denysenko
e9a04db92c Merge branch 'walpo/update-en-translation' into 'master'
Update English translation

See merge request veloren/veloren!4339
2024-02-29 23:45:09 +00:00
Javier Pérez
156c6c768c refactor: replace integer literal with variable 2024-03-01 00:05:45 +01:00
Javier Pérez
27b2709ccb refactor: make selector consistent 2024-02-29 23:58:59 +01:00
Javier Pérez
5ceedc8448 fix(misc.ftl): separate key from equals sign 2024-02-29 23:43:22 +01:00
Javier Pérez
cbbdf95212 feat(subtitles.ftl): add fluent key 2024-02-29 23:42:10 +01:00
Illia Denysenko
6bf48eb156 Merge branch 'juliancoffee/i18n-chat-comments' into 'master'
Fix group-comments

See merge request veloren/veloren!4347
2024-02-29 21:54:13 +00:00
Javier Pérez
2ef9cae614 revert: change 'stamina' to 'energy' 2024-02-29 20:41:25 +01:00
crabman
bcd23e6f2a Merge branch 'juliancoffee/fix-sahagin-hakulaq' into 'master'
Sahagin's Hakulaq hotfix

See merge request veloren/veloren!4346
2024-02-29 16:25:24 +00:00
juliancoffee
ddbe1dc0c1 Fix group-comments 2024-02-29 16:05:07 +02:00
juliancoffee
106a3b634e Reduce Sahagin's Hakulaq number to 1-2 2024-02-29 15:53:16 +02:00
Illia Denysenko
0af21e54af Merge branch 'weblate-translation' into 'master'
Fix translation conflicts

See merge request veloren/veloren!4345
2024-02-29 12:10:08 +00:00
Otto Richter
0f7142f82e Fix translation conflicts 2024-02-29 12:10:07 +00:00