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
8,152 Commits 151 Branches 18 Tags 2.1 GiB
7fe0db2261
Commit Graph

2639 Commits

Author SHA1 Message Date
Samuel Keiffer
fb940ad27a Merge branch 'sam/minotaur' into 'master' 
Overhauled Minotaur

See merge request veloren/veloren!2193
 2021-05-04 16:26:08 +00:00
Imbris
217502d516 Merge branch 'duelsik/wiring-sticky-trigger' into 'master' 
(Wiring) Change Sticky to be handled by physics (but with disabled force on it)

See merge request veloren/veloren!2241
 2021-05-04 16:15:19 +00:00
Daniel Mizerski
f1681f465f (Wiring) Change Sticky to be handled by physics (but with disabled force on it) 2021-05-04 17:33:42 +02:00
Sam
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
7ac1488181 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
Sam
811f1fadb2 Replaced action_timer with action_state so there are additional fields. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
juliancoffee
b81981f805 Draft implementation 2021-05-03 22:07:09 +03:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
Samuel Keiffer
610c529c42 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
efa4f9fe0a Experiment with const fn lanczos lookup tables, enable weighted average interpolation for now. 2021-05-03 00:09:44 -04:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
b15913560b Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c199d12f2d Address MR 2207 review comments. 
- Add metrics for which branch of the compression heuristic was taken.
- Reduce the threshold for the heuristic.
- Deduplicate code for dealing with lazy messages.
- Make jpeg dependency only scoped to the compression benchmark.
- Remove commented code.
 2021-05-03 00:09:24 -04:00
Avi Weinstock
30cae40b82 Add a bandwidth-based heuristic for chunk compression. 2021-05-03 00:09:24 -04:00
Avi Weinstock
cdc2eccda8 Improve quadpng by adding WidePacking, which makes a wider image, which is faster due to PNG compressing by row. Heuristically switch between quadpng and deflate based on chunk height to reduce variance. 2021-05-03 00:09:24 -04:00
Avi Weinstock
dffc7db8f5 Add matplotlib graph generation to the compression benchmarks. 2021-05-03 00:09:24 -04:00
Avi Weinstock
0f4315c98b Remove a use of inline_tweak and use TallPacking instead of GridLtrPacking in common_net::msg::server. 2021-05-03 00:09:24 -04:00
Mckol
c913b9b858 Added Lanczos interpolation for QuadPng 
Should support arbitrary scales (N).
Does support arbitrary Lanczos a parameters (currently 2)
and sample sizes (currently 5x5).
 2021-05-03 00:09:24 -04:00
Avi Weinstock
fe0f331a19 Add 5x5 manhattan blur effect to quadpng, and omit interpolation at chunk borders. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c2fd5e807d Experiment with 256-color palette "tripng" encoding, and Lanczos interpolation for "quadpng". 2021-05-03 00:09:24 -04:00
Avi Weinstock
a220cc569e Add resolution downscaling to QuadPng's color channel, and use half-resolution QuadPng ingame. 2021-05-03 00:09:24 -04:00
Avi Weinstock
f81539cb00 Get PngPngPngJpeg terrain working in the actual game. 2021-05-03 00:09:24 -04:00
Avi Weinstock
a9a943c19a Move compression helpers to common_net::msg::compression and experiment with more image formats at more site kinds. 2021-05-03 00:09:24 -04:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Daniel Mizerski
7faa0d3cd9 Add fundamentals for wiring system. 2021-05-02 22:38:44 +02:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Ludvig Böklin
d7ef414f59 Fix glider pitching down when trying to take off 2021-05-01 15:35:26 +02:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
708cb12086 Fixed tests. 2021-05-01 09:25:55 -04:00
Sam
d3d4ee8bb0 Formatting stuffs. 2021-05-01 09:25:53 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Ludvig Böklin
cc7f0f3ac2 Fix ori 2021-04-30 17:37:51 +02:00
DaforLynx
7334cce426 Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Samuel Keiffer
e177aebd9e Merge branch 'lboklin/lower-zero-lift-drag' into 'master' 
Lower zero-lift drag

See merge request veloren/veloren!2223
 2021-04-29 19:11:12 +00:00
Justin Shipsey
baf749c03e Merge branch 'lboklin/object-masses' into 'master' 
Define more accurate masses for objects

See merge request veloren/veloren!2220
 2021-04-29 19:04:48 +00:00
Ludvig Böklin
c4444a908a Lower zero-lift drag 2021-04-29 19:22:09 +02:00
Synis
4e4818ca9e Query spatial grid for beam and aura system 
fmt
 2021-04-29 14:23:02 +02:00
Ludvig Böklin
6b52ea89b4 Add more specific masses to objects 2021-04-29 11:46:03 +02:00
Ben Wallis
b0aca9a348 Merge branch 'xvar/item-serialization' into 'master' 
Changed Item serialization to not send ItemDef struct across the network

See merge request veloren/veloren!2215
 2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667 Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef 2021-04-28 21:00:25 +01:00
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Ludvig Böklin
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
jshipsey
f845f2bd11 fix glide wield 2021-04-26 23:17:04 -04:00
Sam
1a7779beb3 Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
jshipsey
a0a75b1921 comments 2021-04-25 22:02:32 -04:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
jshipsey
c01fd86f44 ori fixes 2021-04-25 22:02:30 -04:00
Joshua Barretto
c6d1963f10 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!2201
 2021-04-25 23:03:23 +00:00
Joshua Barretto
94b6fa6da3 Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
Joshua Barretto
3af4793762 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
Marcel
35584d0344 Merge branch 'xMAC94x/reduce_deps' into 'master' 
remove some unused deps Yuri found

See merge request veloren/veloren!2197
 2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
6848851dc3 Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided. 2021-04-25 13:09:10 -04:00
Sam
372eff2a02 Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
d2d8d43410 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
Sam
288a6f3a82 Blocking now works if no weapon is equipped in main hand. 
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
 2021-04-25 13:09:02 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Sam
0170a38ebc Removed unwraps in buffs 2021-04-25 12:01:21 -04:00
Snowram
c16ec43938 Body specific beam offsets 2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ygor Souza
71b8426592 Add basic distance check to shockwave hit test 
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.

This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
 2021-04-24 03:09:45 +02:00
Ygor Souza
e59f1e8d28 Skip physics pass for arrows stuck on surfaces 
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
 2021-04-22 23:03:04 +02:00
Marcel
e14f8b9745 Merge branch 'aweinstock/deflate-terrain' into 'master' 
Compress terrain chunks with deflate. Includes a benchmark showing that this...

See merge request veloren/veloren!2166
 2021-04-22 17:12:53 +00:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Dominik Broński
1d25016459 Merge branch 'lboklin/arrow-turret-drag-fix' into 'master' 
Fix ArrowTurret drag coefficient

See merge request veloren/veloren!2175
 2021-04-21 20:17:44 +00:00
Imbris
51c0f8733c Quick physics perf fix 2021-04-21 14:03:23 -04:00
Imbris
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'" 
This reverts merge request !2172
 2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223 Merge branch 'zesterer/lanterns' into 'master' 
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
 2021-04-21 16:40:20 +00:00
Ludvig Böklin
37713cb4ad Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
Imbris
68539a751b Merge branch 'revert-b10718c5' into 'master' 
Revert "Merge branch 'imbris/agent-opt' into 'master'"

See merge request veloren/veloren!2172
 2021-04-21 15:06:35 +00:00
Imbris
699a5493ec Merge branch 'lboklin/simplify-buoyancy' into 'master' 
Simplify buoyancy for performance reasons

See merge request veloren/veloren!2171
 2021-04-21 15:06:31 +00:00
Joshua Barretto
ed7cc12213 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Ludvig Böklin
a1744182b3 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
Ludvig Böklin
6e364665cb Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
Imbris
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'" 
This reverts merge request !2024
 2021-04-21 14:10:06 +00:00
Avi Weinstock
308ad4d81e Cleanup errors introduced in rebase. 2021-04-20 23:34:17 -04:00
Avi Weinstock
15e32e5655 Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream. 2021-04-20 23:24:24 -04:00
Avi Weinstock
6d9de520f3 Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4. 2021-04-20 23:23:53 -04:00