Froggy
|
7c66fff767
|
Froggy/armor offset fixes
|
2023-12-25 12:14:24 +00:00 |
|
Christof Petig
|
5af8c4687e
|
Merge branch 'christof/christmas23' into 'master'
Christmas theme revival
See merge request veloren/veloren!4209
|
2023-12-20 17:02:01 +00:00 |
|
Froggy
|
8cfd65ff76
|
fixed armor offsets to enable mix'n'match armor
|
2023-12-20 12:05:58 +00:00 |
|
Froggy
|
01ac73b73e
|
fixed headwear offsets and some vox files
|
2023-12-18 20:42:52 +11:00 |
|
flo
|
ecde64a30f
|
Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master'
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
See merge request veloren/veloren!4212
|
2023-12-17 22:49:56 +00:00 |
|
do-no-van
|
b5eaa58728
|
fix typo and armor offsets
|
2023-12-17 22:44:43 +00:00 |
|
flo
|
0a42a51810
|
Merge branch 'poise_resilience_buffs' into 'master'
poise_resilience_buffs_for_dagon_and_wyverns
See merge request veloren/veloren!4207
|
2023-12-17 20:12:13 +00:00 |
|
flo
|
6f5e385d2a
|
poise_resilience_buffs_for_dagon_and_wyverns
|
2023-12-17 20:12:13 +00:00 |
|
JCoxeye
|
00434f55c9
|
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
|
2023-12-17 12:41:27 -05:00 |
|
Uniior
|
737b5761f6
|
Crate and Barrel sprites
|
2023-12-17 16:17:14 +00:00 |
|
flo
|
569ab5c5ed
|
crustacean-skeleton and crab
|
2023-12-16 13:47:55 +00:00 |
|
Christof Petig
|
4b7f3d07d2
|
add hirdrasil ornament variants and fix clippy
|
2023-12-16 12:10:17 +01:00 |
|
Christof Petig
|
9b485456eb
|
Calendar based gear for villagers
|
2023-12-14 16:31:48 +01:00 |
|
Isse
|
ba02d083da
|
Merge branch 'isse/walk-toggle' into 'master'
Roleplay stuff
See merge request veloren/veloren!4171
|
2023-12-12 19:59:58 +00:00 |
|
Neras
|
10513091e0
|
added 10 armor stat for cobalt and bloodstone sets
|
2023-12-08 14:40:42 +00:00 |
|
Isse
|
b60ebd4131
|
don't show red text when walking
|
2023-12-07 20:08:03 +01:00 |
|
Isse
|
63e500d3d8
|
laying and steering animation
|
2023-12-07 20:08:02 +01:00 |
|
Isse
|
5320f83462
|
configurable walking speed
|
2023-12-07 20:08:02 +01:00 |
|
HEIEnthusiast
|
933c897450
|
Renamed to potion of agility, burning potion to combustion
|
2023-12-05 14:15:54 -04:00 |
|
HEIEnthusiast
|
99b5571fd8
|
Renamed swiftness to retreating, changed model
|
2023-12-05 13:09:14 -04:00 |
|
HEIEnthusiast
|
76b2d7d0e0
|
Recipe change
|
2023-11-29 06:56:35 -04:00 |
|
HEIEnthusiast
|
4659a66cfe
|
Further tweaks
|
2023-11-29 06:43:46 -04:00 |
|
HEIEnthusiast
|
cc013d7b77
|
Changing values
|
2023-11-29 06:25:20 -04:00 |
|
HEIEnthusiast
|
a01d7485e4
|
Small speed tweak
|
2023-11-28 11:43:12 -04:00 |
|
HEIEnthusiast
|
5001c4a262
|
Added swiftness debuffs
|
2023-11-28 11:41:29 -04:00 |
|
HEIEnthusiast
|
db71625226
|
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
|
2023-11-28 10:07:00 -04:00 |
|
HEIEnthusiast
|
568d12cdd0
|
Swiftness potion changes
|
2023-11-28 10:03:07 -04:00 |
|
Michał
|
14120232a0
|
Phoenix overhaul
|
2023-11-28 11:13:18 +00:00 |
|
maxicarlos08
|
c7ee737fef
|
Add hit_timing to BasicMelee
|
2023-11-27 21:28:12 +01:00 |
|
HEIEnthusiast
|
bb2adfb2e5
|
Removed strength and regeneration potions
|
2023-11-27 15:16:44 -04:00 |
|
HEIEnthusiast
|
783cfdc719
|
Merge branch 'master' into More-potions
|
2023-11-27 07:00:48 -04:00 |
|
HEIEnthusiast
|
4d87a9ab44
|
General potion modifications
|
2023-11-27 06:57:42 -04:00 |
|
HEIEnthusiast
|
59c3162c49
|
Merge branch 'master' of https://gitlab.com/veloren/dev/veloren
12 commits behind master fix
|
2023-11-27 06:32:18 -04:00 |
|
HEIEnthusiast
|
ac4101e70d
|
Changed textures, added strength pot
|
2023-11-27 06:25:58 -04:00 |
|
Isse
|
69e827dfda
|
Merge branch 'isse/very-cool-commands' into 'master'
Target any entity with commands, and a few new commands.
See merge request veloren/veloren!4192
|
2023-11-26 15:13:45 +00:00 |
|
HEIEnthusiast
|
0bb74f9efe
|
Added swiftness and regeneration potions
|
2023-11-26 10:54:02 -04:00 |
|
flo
|
756ac0eefe
|
troll_caves_and_camps_into_sites
|
2023-11-24 07:53:15 +00:00 |
|
Isse
|
5a3e6316a5
|
fix tethering
|
2023-11-23 01:01:31 +01:00 |
|
Sam
|
4e0e94b5c6
|
Removed spin melee character state
|
2023-11-16 19:17:38 -05:00 |
|
Maxicarlos08
|
17904d9387
|
crit_power -> precise_power
|
2023-11-14 18:07:01 -05:00 |
|
Maxicarlos08
|
1d1b51fa51
|
Adjust precision power
|
2023-11-14 18:07:01 -05:00 |
|
Sam
|
d3b3bca621
|
Added precision
|
2023-11-14 18:06:59 -05:00 |
|
Sam
|
62464dbe11
|
Removed crit chance stat
|
2023-11-14 18:06:58 -05:00 |
|
Samuel Keiffer
|
9b878586bf
|
Merge branch 'poperigby/fire-potion' into 'master'
Add Burning Potion that applies the Burning effect to the user
See merge request veloren/veloren!4174
|
2023-11-14 02:00:52 +00:00 |
|
PopeRigby
|
688fd67c33
|
Add Burning Potion that applies the Burning effect to the user
|
2023-11-14 02:00:50 +00:00 |
|
Samuel Keiffer
|
fdb28ec2dd
|
Merge branch 'sam/buff-maps' into 'master'
Changed buffs from using hash maps to an enum map and a slot map.
See merge request veloren/veloren!4182
|
2023-11-14 01:49:49 +00:00 |
|
Sam
|
3f19c61426
|
Changed buffs from using hash maps to an enum map and a slot map.
|
2023-11-12 12:37:28 -05:00 |
|
Maxicarlos08
|
7382f70f1e
|
Re-enable buff stacking for short buffs
|
2023-11-12 17:17:20 +01:00 |
|
Isse
|
db1480b564
|
put ice_reflections under REFLECTION_MODE_HIGH
|
2023-11-10 12:53:09 +01:00 |
|
Christof Petig
|
424006e000
|
Merge branch 'site_rock_circle' into 'master'
site_rock_circle
See merge request veloren/veloren!4175
|
2023-11-10 00:31:04 +00:00 |
|
flo
|
9d52110a49
|
site_rock_circle
|
2023-11-10 00:31:03 +00:00 |
|
Christof Petig
|
0ddd40336a
|
Merge branch 'zesterer/worldgen' into 'master'
Various worldgen improvements
See merge request veloren/veloren!4152
|
2023-11-10 00:15:29 +00:00 |
|
Sorann753
|
a63debe1b7
|
Fixed French Translation
|
2023-11-09 19:41:05 +00:00 |
|
Joshua Barretto
|
84e59c52fb
|
Made portal fizz better convey access
|
2023-11-08 23:19:02 +01:00 |
|
Joshua Barretto
|
83dc22dfbf
|
Made ice reflective
|
2023-11-08 23:19:00 +01:00 |
|
Joshua Barretto
|
05863eb1ef
|
Better mesa layer colours
|
2023-11-08 23:17:34 +01:00 |
|
Uniior
|
1d8a23c30e
|
Starter glider.
|
2023-11-04 22:09:00 +00:00 |
|
Isse
|
7a8e363df1
|
better way to show glitter
|
2023-11-02 15:22:32 +01:00 |
|
Isse
|
48d95e7699
|
SnowGlitter experimental shader
|
2023-11-02 12:53:34 +01:00 |
|
flo
|
e88d61eb44
|
npc_spawn_fixes
|
2023-11-01 18:39:24 +00:00 |
|
Maxicarlos08
|
5f547d62d3
|
Remove halloween dullahans
|
2023-10-24 18:34:02 +02:00 |
|
Isse
|
f98e4331a1
|
Fix LoD reflections for nvidea + vulkan
|
2023-10-23 19:48:30 +00:00 |
|
Joshua Barretto
|
7589774967
|
Renamed tether renderer to rope, fixed tether lengths
|
2023-10-21 13:51:42 +01:00 |
|
Joshua Barretto
|
a5ec81a2ab
|
Better tether pattern, account for mass
|
2023-10-21 13:51:41 +01:00 |
|
Joshua Barretto
|
deca7ae258
|
Finished adding tether graphics
|
2023-10-21 13:51:40 +01:00 |
|
Joshua Barretto
|
9a72d52c48
|
Began adding tether visuals
|
2023-10-21 13:49:04 +01:00 |
|
Joshua Barretto
|
5a41d7e33e
|
Added cart, notion of rolling resistance (hacky)
|
2023-10-21 13:49:04 +01:00 |
|
Justin Shipsey
|
c422616f70
|
Merge branch 'slipped/lavanoise' into 'master'
lava noise
See merge request veloren/veloren!4147
|
2023-10-20 18:11:24 +00:00 |
|
Joshua Barretto
|
cfc5a5c0f0
|
Stop dullahan spawning in the overworld
|
2023-10-19 18:24:54 +01:00 |
|
jshipsey
|
cf425a09c8
|
setup
|
2023-10-19 00:14:12 -04:00 |
|
Joshua Barretto
|
e81516a154
|
Log shader warnings
|
2023-10-18 21:50:40 +01:00 |
|
Joshua Barretto
|
cea7636e29
|
Reverted bad shader changes
|
2023-10-18 21:20:15 +01:00 |
|
Joshua Barretto
|
321cc030ad
|
Better LoD giant trees
|
2023-10-18 09:58:00 +01:00 |
|
Joshua Barretto
|
ba763f2da5
|
Make no terrain pop the default
|
2023-10-18 09:58:00 +01:00 |
|
Joshua Barretto
|
6a82fcf703
|
Added block noise to LoD objects
|
2023-10-18 09:58:00 +01:00 |
|
Joshua Barretto
|
8036ffa374
|
Removed unnecessary shader code
|
2023-10-18 09:58:00 +01:00 |
|
Joshua Barretto
|
c07d7a212b
|
Better LoD effects, performance improvements
|
2023-10-18 09:58:00 +01:00 |
|
Joshua Barretto
|
4d6c3a00f3
|
Testing better LoD voxelisation techniques
|
2023-10-18 09:57:59 +01:00 |
|
Isse
|
b6c234b26e
|
fix puddle details
|
2023-10-15 00:48:37 +02:00 |
|
Raul Wagner Costa
|
46cf1f1914
|
Linearize light colors on the CPU
|
2023-10-14 18:10:35 +00:00 |
|
Isse
|
d620206f37
|
fix reflection mode low
|
2023-10-14 09:52:46 +02:00 |
|
Joshua Barretto
|
32b0b33abe
|
Merge branch 'zesterer/backpack-fixes' into 'master'
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
See merge request veloren/veloren!4131
|
2023-10-13 22:21:53 +00:00 |
|
Isse
|
e0c67c470b
|
Merge branch 'isse/small-fixes' into 'master'
Client local time, used for fluid shaders
See merge request veloren/veloren!4128
|
2023-10-13 12:17:51 +00:00 |
|
Isse
|
56175c2730
|
rename client_time to local_time
|
2023-10-13 13:17:52 +02:00 |
|
Joshua Barretto
|
9dd5cd24d1
|
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
|
2023-10-13 11:57:49 +01:00 |
|
Joshua Barretto
|
0f2d4c261a
|
Merge branch 'zesterer/better-anims' into 'master'
Improving some animations
See merge request veloren/veloren!4127
|
2023-10-12 20:18:11 +00:00 |
|
Joshua Barretto
|
0b1ffb6695
|
Fixed footstep timings
|
2023-10-12 20:31:10 +01:00 |
|
Isse
|
3e19c847f1
|
use client local time for water
|
2023-10-12 01:46:43 +02:00 |
|
Isse
|
72db9b61b3
|
client local time
|
2023-10-12 01:46:12 +02:00 |
|
Isse
|
472b996c8e
|
Merge branch 'isse/shader-fp-fixes' into 'master'
Shader floating point fixes
See merge request veloren/veloren!4120
|
2023-10-11 23:04:33 +00:00 |
|
Isse
|
a1afd5c62f
|
fix signs in particle-vert.glsl
|
2023-10-11 20:46:44 +02:00 |
|
Isse
|
d12f0acd1c
|
fix uses of time of day, which are scaled wrong
|
2023-10-11 20:39:17 +02:00 |
|
Isse
|
65e6eb4e38
|
add comments explaining the elements of time_of_day and tick in shaders
|
2023-10-11 20:29:37 +02:00 |
|
maxicarlos08
|
8a5f237e9c
|
Frost gigas tweaks
|
2023-10-08 11:35:01 +00:00 |
|
Uniior
|
cd91943ebf
|
Revamps for some object/sprite models
|
2023-10-07 18:49:06 +00:00 |
|
Isse
|
7d37646dac
|
renames and comments
|
2023-10-07 19:53:55 +02:00 |
|
Isse
|
2eae780e71
|
vectorize wave functions
|
2023-10-07 19:53:55 +02:00 |
|
Isse
|
bc436e2c9f
|
make particles only use 1 float for inst time again
|
2023-10-07 19:53:55 +02:00 |
|
Isse
|
a152e4dfb4
|
time-proof usages of tick
|
2023-10-07 19:53:55 +02:00 |
|
Isse
|
6d4be9bd01
|
time proof time of day in shaders
|
2023-10-07 19:53:55 +02:00 |
|