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
14,005 Commits 151 Branches 18 Tags 2.1 GiB
r0.15
Commit Graph

4349 Commits

Author SHA1 Message Date
Tao In Way
f18297ec75 taoist/charms 2023-05-19 03:07:44 +00:00
Joshua Barretto
a0ffeb7252 Clippy fixes 2023-05-17 00:23:14 +01:00
Joshua Barretto
8e9314d32b Fixed mount offsets for more quarupeds 2023-05-16 21:57:18 +01:00
Joshua Barretto
306c3e1423 Fixed masses, mount offsets and mountability for quad_low 2023-05-16 21:48:09 +01:00
Joshua Barretto
3238863c26 Good bird_large mount offsets 2023-05-16 21:10:53 +01:00
Joshua Barretto
cfdf184c4c Fix non-humanoid pathfinding and movement in water 2023-05-16 20:48:50 +01:00
Joshua Barretto
52b5967914 Fix pet idle movement, add a way to configure agent behaviour through manifests 2023-05-16 18:51:46 +01:00
Joshua Barretto
e7ea614607 Fixed CI 2023-05-14 22:27:47 +01:00
Joshua Barretto
140927cbe7 Clean up day coefficient code 2023-05-14 22:10:37 +01:00
Sam
20a8788eee Rebase fixes and changelog 2023-05-13 09:38:10 -04:00
flo666
9a6ab28c3d adlet elder tweaks 2023-05-13 09:32:24 -04:00
taoist.way
b7c5c22070 mob creature tweaks 2023-05-13 09:32:23 -04:00
flo666
f66cc47554 - adlet melee tweaks 
- fix adlet elder shoot combomelee
- adjust trap projectile mass
 2023-05-13 09:32:23 -04:00
flo666
f13c3774c0 fix Trap projectile 2023-05-13 09:32:22 -04:00
flo666
7e6e8c97a3 Roshwalr scale up & hitbox adjust 2023-05-13 09:32:20 -04:00
flo666
17e4af3c48 BlockKind::ArtSnow 
replace BlockKind::Snow with BlockKind::Misc
 2023-05-13 09:32:19 -04:00
flo666
25ef582f1a - sprites IceCrystal, GlowIceCrystal for yetipit 
- rough creature balance
 2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9 add models: bone_door, bone_keyhole, bone_key 2023-05-13 09:31:29 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
Sam
71d7a3b780 Ice creature AIs 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
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
flo666
c8bb0050ad adlet npc work 2023-05-13 09:30:53 -04:00
Sam
680d987e11 Adlet hunter AI 2023-05-13 09:30:51 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
jshipsey
da3c2369e5 initial setup 2023-05-13 09:30:13 -04:00
Joshua Barretto
ec5e3fe716 Avoid re-fetching system data on every link persist 2023-05-13 12:31:19 +01: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
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Isse
9fa4c7217e more info on todo comment and allow clippy lint 2023-05-10 15:22:35 +02:00
Isse
1617c180ef small changes 2023-05-09 19:55:52 +02:00
Isse
bcc8c55b5e change 'force from mount' to 'force from volume' in commands 2023-05-09 19:43:10 +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
7dde25df39 fix rebase oopsie 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
a6665ed988 some comments 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
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
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
458acce5ac set vel to zero when sprite mounted 2023-05-09 19:43:09 +02:00
Isse
6ddfd631d6 don't sit through walls 2023-05-09 19:43:09 +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
377787e3c8 avoid: 
```
PHI nodes not grouped at top of basic block!
  %246 = phi <4 x float> [ <float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00>, %114 ], [ %241, <badref> ], !dbg !961029
label %243
in function _ZN14veloren_common4comp9inventory4item7modular11ModularBase4kind17h0950571ff74739d8E
LLVM ERROR: Broken function found, compilation aborted!
```
 2023-05-08 18:58:54 +02:00
Marcel Märtens
95bca5418a update toolchain to nightly-2023-04-20 2023-05-08 18:58:54 +02:00
Sam
faff715c4f Simultaneous melee hits now show separately in SCT 2023-05-07 20:43:52 -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
Marcel Märtens
6a8f10bf41 fix master fmt 2023-05-05 18:26:14 +02:00
Marcel Märtens
cd7d889c13 get rid of oldtime in chrono 2023-05-05 18:25:49 +02:00
Isse
eed613a50f change other value parsers 2023-05-05 15:05:57 +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
d90ea8c1da get rid of structop and update clippy in common test, now only criterion is left with version 2 2023-05-05 09:46:46 +02:00
Joshua Barretto
b6d8182382 Merge branch 'zesterer/item-merging' into 'master' 
Zesterer/item merging

See merge request veloren/veloren!3912
 2023-05-05 00:03:22 +00:00
Joshua Barretto
8d9625d6ee Addressed comments 2023-05-04 23:18:40 +01:00
Joshua Barretto
ee971e4056 Added item merging 2023-05-04 22:12:25 +01:00
Marcel Märtens
27620e665b we need a new version of refinery that needs a new version of rusqlite, so update both 2023-05-04 20:53:00 +02:00
Marcel
ce4beff7fe Merge branch 'xMAC94x/update_deps' into 'master' 
update veloren deps

See merge request veloren/veloren!3911
 2023-05-04 18:28:59 +00:00
Imbris
60dbcf86f9 Merge branch 'imbris/server-start-faster' into 'master' 
Improve server startup times, in particular, finding paths between sites.

See merge request veloren/veloren!3888
 2023-05-04 18:06:38 +00: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
Joshua Barretto
2ff0118df0 More rtsim monsters 2023-05-04 10:13:02 +01:00
Joshua Barretto
0f92f38967 Started adding wandering rtsim monsters 2023-05-01 18:29:32 +01:00
Imbris
29f0f0d83f Rename cheapest_score for clarity and add documentation to fields of NodeEntry 2023-04-24 22:43:40 -04:00
Isse
ab4076518f Add multiloot 2023-04-23 19:17:39 +00:00
Imbris
cd02b3a172 Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list 2023-04-22 11:37:52 -04:00
Imbris
d18100c87a Add a max cost parameter to the astar algorithm so that it will terminate as exausted if this limit is reached. This is used to optimize site pathfinding by exiting early from finding a novel path if we know it won't be used. 2023-04-21 23:16:24 -04:00
Imbris
ed94c1c1b6 Fix existing bug with all site route costs be computed as 0 2023-04-20 22:22:21 -04:00
Imbris
c82e6cfc77 Cleanup, fmt, appease clippy 2023-04-20 21:53:59 -04:00
Imbris
c6f5e8dac2 Add more profiling spans to Server startup related things in order to 
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
 2023-04-20 21:53:59 -04:00
Imbris
92a42ced18 Apply experimental astar2 changes to the original impl 2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41 Remove astar node clustering related code 2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5 Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations 2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100 mess (server startup time related experimentation, in particular with 
pathfinding between sites)
 2023-04-20 21:53:59 -04:00
Sam
4f991190d3 Removed 3rd to_owned call 2023-04-19 18:43:43 -04:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Sam
63bf8f3ac7 Responded to review comments and fixed tests 2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b Addressed review 2023-04-19 18:34:17 -04:00
Sam
c1a64e1d69 Recently unequipped items are now tracked and durability loss on death is applied to them 2023-04-19 18:34:16 -04:00
Imbris
f525be9b3b Update tracy-client to 0.15.2, also use tracy_client through the 
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
 2023-04-18 21:28:15 -04:00
Sam
9d503d1e1f Debug items no longer have durability 2023-04-14 18:25:24 -04:00
Sam
553aa690b4 Added repair equipment command 2023-04-14 18:09:23 -04:00
Isse
3548b464da orient airships correctly on load 2023-04-14 11:25:59 +02:00
Isse
2208a3037e improve flying goto 2023-04-14 11:23:17 +02:00
Isse
d1f6e6bef6 somewhat fix airships 2023-04-14 11:22:10 +02:00
Joshua Barretto
504ea158d2 Merge branch 'zesterer/towns' into 'master' 
Improvements to towns and NPCs

See merge request veloren/veloren!3867
 2023-04-13 21:03:02 +00:00