Commit Graph

15666 Commits

Author SHA1 Message Date
crabman
2beed7fd79 Merge branch 'uniior/cacti2' into 'master'
Revised cacti sprites

See merge request veloren/veloren!4384
2024-03-20 14:03:27 +00:00
Uniior
92e5bad450 Revised cacti sprites 2024-03-20 14:03:27 +00:00
Illia Denysenko
d1eed88aee Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4386
2024-03-20 12:05:44 +00:00
Otto Richter
ac5ccb671a Update translation files (Weblate) 2024-03-20 12:05:44 +00:00
Marcel Märtens
1ed2895a49 cargo upgrade all 2024-03-20 09:39:13 +01:00
Marcel Märtens
941b204681 update some dependencies manually 2024-03-20 09:36:58 +01:00
Marcel
b0011ee494 Merge branch 'walpo/update-changelog' into 'master'
Correct changelog format and spelling

See merge request veloren/veloren!4377
2024-03-19 22:21:40 +00:00
Javier Pérez
104c172e3e Correct changelog format and spelling 2024-03-19 22:21:39 +00:00
Marcel
da01818c87 Merge branch 'xMAC94x/ui' into 'master'
add webui for veloren-server with working players

See merge request veloren/veloren!4375
2024-03-18 23:50:56 +00:00
crabman
6a76028472 Merge branch 'loot-table-balance' into 'master'
Loot table balance

See merge request veloren/veloren!4373
2024-03-18 21:11:49 +00:00
Isse
f46b8631b5 Merge branch 'pillar-removal' into 'master'
Remove pillars from Sahagin and Myrmidon dungeons

See merge request veloren/veloren!4378
2024-03-18 18:10:26 +00:00
Marcel Märtens
9e2fdb1c88 add comments to warn devs of security impacts 2024-03-18 13:37:50 +01:00
crabman
016fb0bc9b
Removed normalized ProbabilityFile tests
These tests no longer make sense, as multiple different items can now
drop in one roll and the probabilities can't be normalized.

These tests did not fail previously because they only checked one
specific loot table, which hasn't been touched until now.
2024-03-18 11:54:33 +00:00
Hrom
78cd928069 carapace drakes 2024-03-18 12:48:30 +01:00
Hrom
ab842beb96 deadwood fix 2024-03-18 11:48:30 +01:00
Hrom
4b15f7bff3 address review comments 2024-03-18 11:48:30 +01:00
Hrom
4f022d05c0 fix typo 2024-03-18 11:48:30 +01:00
Hrom
3c61eebdb5 remove ngoubous from arches 2024-03-18 11:48:30 +01:00
Hrom
9e197a2b2d add all function to most creatures loot tables 2024-03-18 11:48:30 +01:00
Hrom
142a711d64 quads and theropods 2024-03-18 11:48:30 +01:00
Hrom
33cdf9b14c bipeds 2024-03-18 11:48:30 +01:00
Hrom
7d0c3b5d04 arthropod 2024-03-18 11:48:30 +01:00
Marcel Märtens
dc419e28c0 Disallow /ui when any Forwarded header is detected 2024-03-17 13:41:56 +01:00
Marcel Märtens
a35cc5b9c0 move msg handling to a loop to allow to handle multiple requests per tick 2024-03-17 12:58:30 +01:00
Marcel Märtens
0507ef58ed rename "world" to "global" not to cause confusion 2024-03-17 12:10:46 +01:00
Marcel Märtens
13fe329ef0 extract javascript, css and html in seperate files 2024-03-17 12:10:45 +01:00
Marcel Märtens
09f44646c5 provide a way to send messages 2024-03-17 12:10:45 +01:00
Marcel Märtens
794fd41df0 add webui for veloren-server with working players 2024-03-17 12:10:45 +01:00
Isse
88a585c13f Merge branch 'isse/plugin-spots' into 'master'
Register plugins before worldgen and support spots in plugins

See merge request veloren/veloren!4341
2024-03-14 22:40:55 +00:00
Isse
1891584477 add to changelog 2024-03-14 21:59:47 +01:00
Isse
5abc8e3a1d fix voxygen disabling plugins on server even if plugins are on 2024-03-14 21:57:50 +01:00
Isse
daa78a75ac register plugins before worldgen and support spots in plugins 2024-03-14 21:57:50 +01:00
Christof Petig
24c511b5a4 Merge branch 'christof/plugin_network' into 'master'
Load missing plugins from the server

See merge request veloren/veloren!4256
2024-03-14 20:35:41 +00:00
uniior
6c606646ae Comment 2024-03-14 16:15:54 -03:00
uniior
277b884194 Remove pillars from Sahagin and Myrmidon dungeons 2024-03-14 16:05:12 -03:00
Christof Petig
f21d76000f fix clippy 2024-03-14 00:46:19 +01:00
Christof Petig
f0194e6d9b more elaborate error handling 2024-03-14 00:46:18 +01:00
Christof Petig
166653b355 report plugin errors to the user 2024-03-14 00:46:18 +01:00
Christof Petig
8dd4729965 make missing plugins a set 2024-03-14 00:46:18 +01:00
Isse
eccdc18eb7 fix ci-clippy2 2024-03-14 00:46:18 +01:00
Isse
ed25ea98ce store plugin data in memory 2024-03-14 00:46:18 +01:00
Christof Petig
029f3e2a1f remove merge artifact 2024-03-14 00:46:18 +01:00
Christof Petig
12e9b491a4 fix clippy in non-plugin feature 2024-03-14 00:46:18 +01:00
Christof Petig
3e0ca7d6d4 Load missing plugins from the server
individual commits combined here:
send active plugins
compute plugin sha hash
single position for defining Hash type
request plugins from the server
Server sending the plugin to the client
store received plugin in file and use it
handle plugin data at the right place
pass config_dir to client init
load local plugins
operational plugin caching
simplify the interface
clippy suggestions
remove artifacts
fix compilation of test world
ChangeLog entry
code quality fixes
improve readability
adapt to multiple systems
2024-03-14 00:46:18 +01:00
Isse
030c2f5219 Merge branch 'new-npc-dialogs' into 'master'
More Specific NPC Dialogs

See merge request veloren/veloren!4111
2024-03-13 22:32:02 +00:00
Thomas S
9a922016ea More Specific NPC Dialogs 2024-03-13 22:32:02 +00:00
Illia Denysenko
1a433f0ba4 Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4376
2024-03-13 17:09:59 +00:00
Otto Richter
91938a0b51 Update translation files (Weblate) 2024-03-13 17:09:58 +00:00
Ben Wallis
d70086a239 Merge branch 'xvar/character-index' into 'master'
Added database index to character.player_uuid column

See merge request veloren/veloren!4369
2024-03-12 11:44:42 +00:00
Illia Denysenko
da6b0f43be Merge branch 'fvasco-buff-poisoned' into 'master'
Italian translation

See merge request veloren/veloren!4371
2024-03-09 15:09:41 +00:00