jshipsey
|
da3c2369e5
|
initial setup
|
2023-05-13 09:30:13 -04:00 |
|
Joshua Barretto
|
eb7d712093
|
Merge branch 'zesterer/in-soviet-russia-pet-mount-you' into 'master'
Allow pet birds to sit on the player's shoulder
See merge request veloren/veloren!3930
|
2023-05-13 12:14:21 +00:00 |
|
Joshua Barretto
|
451e586aac
|
Made mounting biped_large work, for the hell of it
|
2023-05-12 22:11:06 +01:00 |
|
Joshua Barretto
|
2aca9db4ac
|
Prevent mounted pets stealing targetting, allowed sitting on chairs with a pet on your shoulder
|
2023-05-12 21:18:32 +01:00 |
|
Joshua Barretto
|
9e9889eed6
|
Allowed bird pets to mount their owners when nearby
|
2023-05-12 21:03:44 +01:00 |
|
Joshua Barretto
|
4253833aaf
|
Add photorealistic experimental shader
|
2023-05-12 14:02:23 +01:00 |
|
Joshua Barretto
|
1924c67033
|
Adjusted night ambience
|
2023-05-12 13:47:01 +01:00 |
|
Marcel Märtens
|
3a19669d53
|
use workspace dependencies to make our life easier maintaining them :)
|
2023-05-10 18:16:25 +02:00 |
|
Isse
|
1617c180ef
|
small changes
|
2023-05-09 19:55:52 +02:00 |
|
Isse
|
6219b52f87
|
rename Vox trait to FilledVox, and change is_empty to is_filled
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
1d60d72c01
|
format line
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
87b2f0fd26
|
don't apply move state velocity if volume riding, don't mount sprites on interact
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
a0ed18c3db
|
add doc comments
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
61ecd2c178
|
various small fixes
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
f6f332af6a
|
send full matrix to shader
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
b4c3868dd4
|
different translation key for mounting Helm
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
a6665ed988
|
some comments
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
2e2e5680bc
|
use spacial grid for interactables
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
78dc394c48
|
use sitting animation by default when sprite mounted
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
192356f6c5
|
use interpolated pos and ori
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
facea64a58
|
remove todo!
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
57551c479c
|
force of mount in teleporting commands
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
e39790e9e4
|
make sprites work on multiple ships at once
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
134d0f0c04
|
varius fixes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
b3a70627e5
|
fix volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
a35a1a34c4
|
more sprites on airships
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
6674cce2cc
|
intercat with sprites on ships
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
7fbe2cd5ec
|
particles on volume
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
d292234c47
|
lod for sprites on volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
fcb7011cde
|
sprites on volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
6ddfd631d6
|
don't sit through walls
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
7eba16a2d7
|
use mount key
|
2023-05-09 19:43:08 +02:00 |
|
Isse
|
2928eb8d15
|
sit on sprites
|
2023-05-09 19:43:08 +02:00 |
|
Joshua Barretto
|
1cc221f653
|
Merge branch 'zesterer/rtsim-tweaks' into 'master'
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
|
2023-05-09 14:51:15 +00:00 |
|
Marcel Märtens
|
95bca5418a
|
update toolchain to nightly-2023-04-20
|
2023-05-08 18:58:54 +02:00 |
|
Sam
|
d5fc65ce83
|
Fix ci test
|
2023-05-07 21:50:59 -04:00 |
|
Sam
|
a38f336c9e
|
Added dual wielding sword contextual abilities.
|
2023-05-07 20:43:51 -04:00 |
|
Sam
|
0ecf4fbe87
|
Dual wielding weapons of the same kind added as a context
|
2023-05-07 20:43:51 -04:00 |
|
Sam
|
9cedf854de
|
Abilities can now be activated from multiple contexts
|
2023-05-07 20:43:50 -04:00 |
|
Imbris
|
95a38ff8f6
|
Merge branch 'imbris/revert-some' into 'master'
Revert some of the updates to make windows cross compile directx work
See merge request veloren/veloren!3918
|
2023-05-06 05:12:20 +00:00 |
|
Imbris
|
af0d0f3ea4
|
Second attempt (success)
|
2023-05-06 00:30:54 -04:00 |
|
Marcel Märtens
|
cd7d889c13
|
get rid of oldtime in chrono
|
2023-05-05 18:25:49 +02:00 |
|
Marcel
|
223ae7ee98
|
Merge branch 'xMAC94x/update_deps' into 'master'
update further dependencies
See merge request veloren/veloren!3913
|
2023-05-05 08:42:43 +00:00 |
|
Marcel Märtens
|
4be1e82ba9
|
update further dependencies
|
2023-05-04 23:42:05 +02:00 |
|
Joshua Barretto
|
ee971e4056
|
Added item merging
|
2023-05-04 22:12:25 +01:00 |
|
Joshua Barretto
|
a5b1e41d8b
|
Make NPC interaction go via rtsim
|
2023-05-04 11:23:46 +01:00 |
|
Marcel Märtens
|
054f4f9453
|
update veloren deps
|
2023-05-04 11:58:43 +02:00 |
|
Isse
|
44bf8f19f1
|
combine into one filter_map
|
2023-05-03 16:29:56 +02:00 |
|
Isse
|
922ba9ed5c
|
add note about using threshold for subtitle duration
|
2023-05-03 16:15:28 +02:00 |
|
Isse
|
77b7d1a49e
|
localize after distance filter
|
2023-05-03 16:10:14 +02:00 |
|