Marcel Märtens
|
5f41aefacb
|
update toolchain to 2024-05-14
|
2024-05-18 00:58:54 +02:00 |
|
Marcel
|
e63b42645f
|
Merge branch 'xMAC/smol-fixes' into 'master'
backporting lints from newer toolchain, activating world in server/agent
See merge request veloren/veloren!4462
|
2024-05-17 08:36:03 +00:00 |
|
Marcel Märtens
|
b770665fb9
|
new toolchain lints helped us to find issues, backporting the bugfixes here.
NOTE: we havent had world enabled in server/agent, this MR now enables this, might have some (hopefully positive) effects on our agent code
|
2024-05-16 10:40:15 +02:00 |
|
crabman
|
b2d7a9291a
|
Merge branch 'curious-potion-naming' into 'master'
Curious potion naming fix (Issue #1896)
Closes #1896
See merge request veloren/veloren!4195
|
2024-05-15 12:12:16 +00:00 |
|
Samuel Keiffer
|
dcce436483
|
Merge branch 'james/rock-snapper' into 'master'
Better Rocksnapper Abilities and Moveset
See merge request veloren/veloren!4454
|
2024-05-15 02:37:33 +00:00 |
|
James Melkonian
|
dc50f67103
|
Reorder rocksnapper abilities
|
2024-05-14 18:23:38 -07:00 |
|
James Melkonian
|
64eac74258
|
Fix i18n test
|
2024-05-14 18:23:37 -07:00 |
|
James Melkonian
|
505788abdf
|
Change rocksnapper action counters to timers
|
2024-05-14 18:22:20 -07:00 |
|
James Melkonian
|
25ad114072
|
Rocksnapper AI and animation tweaks
|
2024-05-14 18:22:20 -07:00 |
|
James Melkonian
|
7a23314e3b
|
bowser spin animation
|
2024-05-14 18:22:20 -07:00 |
|
Youser Nayme
|
4f69ee7bfd
|
Updated translation files
|
2024-05-13 02:05:17 -04:00 |
|
flo
|
5e9cbdf754
|
Merge branch 'new_cultist' into 'master'
new_cultist
See merge request veloren/veloren!4447
|
2024-05-12 18:33:11 +00:00 |
|
flo
|
76628057b5
|
new_cultist
|
2024-05-12 18:33:11 +00:00 |
|
HEIEnthusiast
|
608195d17c
|
Fixed issue #1896 curious potion
|
2024-05-11 22:49:45 -04:00 |
|
crabman
|
7555189b3e
|
Merge branch 'ehp-tweaks' into 'master'
Various tweaks to entities' EHP
See merge request veloren/veloren!4422
|
2024-05-09 22:03:02 +00:00 |
|
Uniior
|
d7d2e69d7d
|
Various tweaks to entities' EHP
|
2024-05-09 22:03:01 +00:00 |
|
Marcel
|
999b09f9d4
|
Merge branch 'xMAC/example_query_client' into 'master'
example query client
See merge request veloren/veloren!4456
|
2024-05-09 17:23:55 +00:00 |
|
crabman
|
e8a89b52bc
|
register server info system
|
2024-05-09 14:19:57 +00:00 |
|
Marcel Märtens
|
23003b48df
|
Add a query client example
|
2024-05-09 15:36:38 +02:00 |
|
flo
|
18533cd0c9
|
Merge branch 'mesa_furniture' into 'master'
mesa_furniture
See merge request veloren/veloren!4449
|
2024-05-09 13:35:19 +00:00 |
|
flo
|
2752786f2f
|
mesa_furniture
|
2024-05-09 13:35:18 +00:00 |
|
flo
|
dd50bd73a3
|
Merge branch 'horblegorble/changelog-tweak-orich-vox' into 'master'
added orichalcum armour changes to changelog
See merge request veloren/veloren!4455
|
2024-05-09 10:09:30 +00:00 |
|
horblegorble
|
ce4ea88079
|
added orichalcum armour changes to changelog
|
2024-05-09 19:23:29 +10:00 |
|
crabman
|
b47aa6aeab
|
Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)
See merge request veloren/veloren!4453
|
2024-05-09 06:11:37 +00:00 |
|
Otto Richter
|
7323ca0fe9
|
Update translation files (Weblate)
|
2024-05-09 06:11:37 +00:00 |
|
flo
|
9e98d473e6
|
Merge branch 'fix_ori_helmet_orc_offset' into 'master'
fix_ori_helmet_orc_offset
See merge request veloren/veloren!4448
|
2024-05-03 21:08:24 +00:00 |
|
flo
|
7de25badab
|
fix_ori_helmet_orc_offset
|
2024-05-03 21:08:24 +00:00 |
|
crabman
|
809695880e
|
Merge branch 'crabman/server_query' into 'master'
Query server
See merge request veloren/veloren!4440
|
2024-05-02 18:51:37 +00:00 |
|
crabman
|
24e0600e58
|
changelog entry
|
2024-05-02 17:59:17 +00:00 |
|
crabman
|
fea309c4ad
|
Add port 14006 to docker-compose (server info queries)
|
2024-05-02 17:59:16 +00:00 |
|
crabman
|
6430091512
|
Remove ping and add request size test
|
2024-05-02 17:59:16 +00:00 |
|
crabman
|
78fd92fae5
|
better protocol versioning
|
2024-05-02 07:47:01 +00:00 |
|
crabman
|
e07b9b4c3a
|
Bump h2 and rustls patch version
Fixes RUSTSEC-2024-0336 and RUSTSEC-2024-0332
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
4455c777ce
|
address review comments
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
4c0cadabcf
|
query server ratelimiting
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
8efe53ab45
|
protect against spoofed addressess
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
419ee88cc2
|
add extra padding for future version information and remove pings
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
800480b082
|
export metrics
|
2024-05-02 07:00:02 +00:00 |
|
crabman
|
83d4c775e2
|
connect query server to gameserver
|
2024-05-02 07:00:01 +00:00 |
|
crabman
|
93ad288193
|
query server crate
|
2024-05-02 07:00:01 +00:00 |
|
crabman
|
0b9c2621f7
|
Merge branch 'crab/forgemaster-room-hotfix' into 'master'
fix error in the forgemaster boss room model
See merge request veloren/veloren!4446
|
2024-05-02 06:56:53 +00:00 |
|
Gemu Peachems
|
982806ba76
|
fix error in the forgemaster boss room model
|
2024-05-02 06:40:04 +00:00 |
|
crabman
|
06b6c60112
|
Merge branch 'horblegorble/changelog-edits' into 'master'
order and wording edits to new entries; add entry for orichalcum ingots
See merge request veloren/veloren!4443
|
2024-05-02 06:37:10 +00:00 |
|
horblegorble
|
3488d15f0c
|
order and wording edits to new entries; add entry for orichalcum ingots
|
2024-05-02 06:37:09 +00:00 |
|
Isse
|
d934419742
|
Merge branch 'isse/fix-tree-crowding' into 'master'
Use column sample for tree for crowding value
See merge request veloren/veloren!4445
|
2024-05-01 23:31:34 +00:00 |
|
Isse
|
7cb8d12829
|
use column sample for tree for crowding value
|
2024-05-02 00:34:56 +02:00 |
|
crabman
|
fabc0dc37c
|
Merge branch 'orichalcum-tweaks' into 'master'
giving stats to orichalcum helmet and balancing orichalcum recipes
See merge request veloren/veloren!4444
|
2024-05-01 21:08:38 +00:00 |
|
nectical
|
f717fa7352
|
giving stats to orichalcum helmet and balancing orichalcum recipes
|
2024-05-01 21:11:35 +01:00 |
|
Isse
|
11c34e1628
|
Merge branch 'isse/i18n-crafting-search' into 'master'
Allow searching in both selected language and fallback langauage in crafting
See merge request veloren/veloren!4442
|
2024-04-29 12:17:22 +00:00 |
|
Isse
|
6c0da4beeb
|
allow searching in both selected language and fallback langauage in crafting
|
2024-04-29 13:33:11 +02:00 |
|