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
10,206 Commits 151 Branches 18 Tags 2.1 GiB
a5e64af199
Commit Graph

3298 Commits

Author SHA1 Message Date
Oolnokk
45486aa9c2 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
Samuel Keiffer
2ee11de6c7 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Sam
d834a01e35 Addressed review feedback. 2021-10-31 16:39:47 -04:00
jshipsey
124cb5d305 good hat rendering 2021-10-30 23:42:16 -04:00
jshipsey
4fd276890e switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
7580b7cf9e support for hollow voxels ty zesterer 2021-10-30 23:42:14 -04:00
Sam
83d8ea869b Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Sam
9095c207d8 All aspects of an attack now scale with the modifier. 2021-10-29 17:37:12 -04:00
Sam
f7db48a5ec Fixed buff applied. 2021-10-29 17:37:10 -04:00
Sam
bddba87c4e Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
3bfff6cf18 Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
Sam
3f92f0ea8b Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure. 2021-10-27 17:02:36 -04:00
Sam
e70230819d Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
d089a5d239 text and alignment WIP 2021-10-27 17:02:35 -04:00
Sam
b4b6eeb0d1 Added function that returns the output of salvaging an item when result just needs to be checked. 2021-10-27 17:02:32 -04:00
Sam
26dfd961a8 Fixed item path of leather items under hide folder. 2021-10-27 17:02:32 -04:00
Monty Marz
c7b6c7c3b4 bench 2021-10-27 17:02:31 -04:00
Sam
b924ae9f54 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
404ff2918e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
cb5630b69c Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
db0c636e16 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Sam
7989b66922 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Sam
0261e8b5cf Haha, nerfs go brr 2021-10-26 18:44:45 -04:00
Joshua Barretto
687b24d28d Merge branch 'demonic/shrubs' into 'master' 
Added new Spots, Shrubs and Ships.

See merge request veloren/veloren!2953
 2021-10-26 10:06:14 +00:00
DemonicOnPc
54c5a45004 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -04:00
Kemper
c0f9b19928 Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
Justin Shipsey
80908f969a Merge branch 'kemper/sand-shark-hitbox' into 'master' 
Better sand shark hitbox

See merge request veloren/veloren!2956
 2021-10-24 22:03:08 +00:00
Kemper
beb2cad73a Adjust sand shark hitbox 2021-10-24 21:04:46 +00:00
DemonicOnPc
86bf9d43cb Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -04:00
ubruntu
a41fc4cba7 Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Bryant Deters
3f48604db5 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
7adbc2f7b5 Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
Joshua Barretto
2da9f7994f Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
Sam
72dc5960d6 Correctly took dot product, switched to square root of dot product 2021-10-15 22:41:53 -04:00
Sam
c7381d13cd Removed angle between with dot product in handle_orientation. 2021-10-15 17:26:10 -04:00
socksonme
092720346e Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Imbris
fc97e72bf4 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
4183fb2551 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00
Imbris
1ad6b5adb4 Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well) 2021-10-15 03:20:40 -04:00
Imbris
4ea6842932 Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans 2021-10-15 01:38:56 -04:00
Imbris
0b115af398 Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion 2021-10-15 01:23:00 -04:00
Imbris
7b35f14043 Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new) 2021-10-15 01:23:00 -04:00
Imbris
33af9a8bbd Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between 2021-10-15 01:23:00 -04:00
Imbris
4330a8c24b Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir 2021-10-15 01:23:00 -04:00
Henry Corse
54411e5a7f Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Sam
6df744b0ff Fix block energy cost being multiplied by 10 and also slightly reduce it. 2021-10-13 10:02:28 -04:00
Imbris
2b5bc54b6a Merge branch 'imbris/opt-phys-2.0' into 'master' 
Make terrain physics faster with internal iteration

See merge request veloren/veloren!2915
 2021-10-11 14:52:46 +00:00
juliancoffee
a4f882a8d6 Fix Traveller names 
- Previously RtSim were created with automatic name for body generated
  from EntityConfig, not from RtSim body. Now RtSim body is set for
  EntityConfig.
 2021-10-11 15:06:43 +03:00
Samuel Keiffer
68e7d37ffd Merge branch 'sam/wiki-all-entities' into 'master' 
Csv export entity drops tool now has ability to export all entities at once.

See merge request veloren/veloren!2910
 2021-10-10 16:56:46 +00:00
Sam
8791f994dc Now stores a column for entity path to more easily allow searching for what drops a particular item in the future 
Fixed excel perceiving certain csv entries as a date
 2021-10-10 12:37:16 -04:00