Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,861 Commits 151 Branches 18 Tags 2.1 GiB
44150f6540
Commit Graph

1609 Commits

Author SHA1 Message Date
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master' 
Update wgpu

See merge request veloren/veloren!4245
 2024-02-01 12:14:32 +00:00
Marcel Märtens
94df06ca19 remove outdated comment and make use of more constants 2024-02-01 12:17:19 +01:00
Marcel Märtens
db9eca031c use constants in dummy_scene 2024-02-01 12:05:11 +01:00
Isse
1d48bfff31 Revert atlas texture name 2024-02-01 12:05:11 +01:00
Treeco
7496aa5357 Added LOD objects for new forest types 2024-01-31 23:01:44 +00:00
João Capucho
d29d22dd0a update to wgpu 0.18 2024-01-30 00:52:49 +01:00
Isse
497cb13e50 always use players weather, and fix weather fr this time 2024-01-23 23:18:14 +01:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 2024-01-21 21:30:08 +00:00
Joshua Barretto
e231b8f9c1 Apply watcher properties more sensibly 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Joshua Barretto
777d03b361 Categorised more sprites 2024-01-20 10:36:34 +00:00
Joshua Barretto
e5aa8cd3b7 Fix warnings 2024-01-19 20:14:32 +00:00
Joshua Barretto
5260c82c4a Overhauled sprite representation to support many more sprites and attributes 2024-01-19 18:05:56 +00:00
Joshua Barretto
64debe2f0b Remove unnecessary conversion 2024-01-16 17:47:24 +00:00
Joshua Barretto
751df7801f Render airship sprites in char select 2024-01-15 22:51:54 +00:00
Joshua Barretto
d51b5c5bea Add airship to char select 2024-01-15 22:35:42 +00:00
Joshua Barretto
3420e7a227 Appease clippy 2024-01-15 19:07:19 +00:00
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00:00
Joshua Barretto
43d935a150 Render render LoD terrain on char select, remove old backdrop figure 2024-01-15 19:06:17 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05: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
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
dd8850770e remove variation debugging output 2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279 PRNG experiments 2023-12-15 17:27:15 +01:00
Isse
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05: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
Joshua Barretto
22b537a4e5 Fixed CI and incorrect vel 2023-10-21 14:58:13 +01:00
Joshua Barretto
ac7f6872db Fixed typo 2023-10-21 13:51:42 +01:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
879a28fbb6 Fixed warnings 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
jshipsey
1b8265803e comments addressed 2023-10-19 11:23:55 -04:00
jshipsey
cf425a09c8 setup 2023-10-19 00:14:12 -04:00
Joshua Barretto
bf92d0287b Skip animating figures outside of the frustum 2023-10-18 09:58:00 +01:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Justin Shipsey
0d5017932d Merge branch 'zesterer/backpack-fixes' into 'master' 
Added wielding for wallrunning

See merge request veloren/veloren!4133
 2023-10-16 20:00:06 +00:00
Isse
b862a7aa22 Merge branch 'isse/fix-div0' into 'master' 
Fix divide by zero in state::apply_terrain_changes_internal

See merge request veloren/veloren!4140
 2023-10-16 11:35:17 +00:00
Isse
3a61fb15b2 fix divide by zero in state::apply_terrain_changes_internal 2023-10-15 23:00:36 +02:00
Samuel Keiffer
e1767ab3ad Merge branch 'sam/bezier-beam' into 'master' 
Converted beam system from spherical shell wedges to quadratic beziers

See merge request veloren/veloren!4137
 2023-10-15 15:42:02 +00:00
Sam
ef5e37a64d Converted beam system from spherical shell wedges to quadratic beziers 2023-10-14 21:46:28 -04:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Joshua Barretto
e293de5bae Added wielding for wallrunning 2023-10-14 12:27:08 +01: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
1d33d7e4c4 Fixed lantern holding logic 2023-10-12 18:08:24 +01:00
Joshua Barretto
d5565c4a41 Added strafe-like rolling 2023-10-12 12:34:08 +01: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
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Isse
b11aac2b5b use look dir for spectator 2023-10-07 19:53:55 +02:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh" 
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
 2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
Imbris
9c398cb06d djust for changes in specs safety refactor 2023-09-24 23:46:59 -04:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles 2023-08-27 19:40:49 +02:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event 2023-08-19 11:44:58 +02:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666) 2023-08-17 22:47:35 +02:00
Maxicarlos08
bb2034ca92
portal particles 2023-08-15 12:24:48 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
Sam
1cc99c9c4a Fixes to animations and making ability that the animation system thinks is being used more correct 2023-07-29 19:03:56 -04:00
Sam
ff15780c22 Maelstrom 2023-07-29 18:53:48 -04:00
Sam
80ab9c26ec Initial setup 2023-07-29 18:53:38 -04:00
Monty Marz
102945b9e7 Dungeon rework initial patch 2023-07-09 20:03:09 +00:00
Imbris
c60f994c7f Some random changes and a fmt 2023-06-04 12:58:16 -04:00
Imbris
4094887997 Rename UidAllocator to IdMaps everywhere, also rename lookup_entity to 
uid_entity.

Also made more progress on changes in common/src/uid.rs

(does not compile so don't know if all rebase quirks resolved)
 2023-06-04 12:58:16 -04:00
Imbris
3277d18265 Rename retrieve_entity_internal to lookup_entity 2023-06-04 12:58:16 -04:00
Imbris
ea725fffde Cleanup UidAllocator and Uid a bit: 
* Remove unnecessary Marker/MarkAllocator trait implementations.
* Delete excess functions
* Change some methods to take Uid instead of u64
 2023-06-04 12:58:15 -04:00
Samuel Keiffer
6071fe0adb Merge branch 'quadruped_low_anim_fix' into 'master' 
quadruped_low anim fix

See merge request veloren/veloren!3957
 2023-06-03 14:03:49 +00:00
flo
0657df80a1 quadruped_low anim fix 2023-06-03 14:03:48 +00:00
flo
16d58c6b4e plant creatures 2023-06-03 13:59:52 +00:00
Joshua Barretto
e71eee0cd2 Merge branch 'zesterer/damage-fixes' into 'master' 
Make items vanish after 5 minutes

See merge request veloren/veloren!3963
 2023-06-01 14:49:00 +00:00
Joshua Barretto
ec3a7d1898 Make items vanish after 5 minutes 2023-06-01 14:51:19 +01:00
Isse
174dac9206 Remove print 2023-06-01 13:12:03 +00:00
Joshua Barretto
465a62a072 Correct for orientation movement on voxel entities 2023-05-25 00:25:28 +01:00
Joshua Barretto
96bf86dae0 Rebalanced masses, dimensions, swim thrusts, and made various improvements to water movement that help with gameplay and pathfinding. Also fixed swimming animations for many creatures. 2023-05-25 00:25:25 +01:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
Joshua Barretto
2219797142 Merge branch 'zesterer/shader-block-kinds' into 'master' 
Added support for block kinds in shaders

See merge request veloren/veloren!3932
 2023-05-21 17:19:51 +00:00
Joshua Barretto
f5b24a5953 Removed redundant hit code 2023-05-19 16:54:14 +01:00
Joshua Barretto
c73848b932 Fixed minor issues with walls, better particles 2023-05-19 14:25:49 +01:00
Joshua Barretto
c94d6c502a Added one-way wall sprites 2023-05-19 13:24:45 +01:00
Joshua Barretto
a634da2d07 Addressed review comments 2023-05-17 22:22:54 +01:00
Joshua Barretto
8e03f87881 Addressed review comments 2023-05-16 10:08:25 +01:00
Joshua Barretto
aeb72bcf22 Added support for block kinds in shaders 2023-05-15 17:31:21 +01:00
flo666
9a6ab28c3d adlet elder tweaks 2023-05-13 09:32:24 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
flo666
c46ea4ae91 -add quadruped_medium/combomelee 
-frostfang ability_set
 2023-05-13 09:30:55 -04:00