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
7,279 Commits 151 Branches 18 Tags
Commit Graph

1358 Commits

Author SHA1 Message Date
Marcel Märtens
7f17d6cfd1 network scheduler and rawmsg cleanup 2021-03-26 08:57:42 +01:00
Avi Weinstock
6d30f17add Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Marcel
f01114f47a Merge branch 'aweinstock/agent-retargetting' into 'master' 
In `agent::Sys`, perform target selection periodically to avoid agents going...

See merge request veloren/veloren!1985
 2021-03-24 22:22:04 +00:00
Avi Weinstock
7aaa22cc8b Address MR 1987 review comments. 2021-03-24 16:09:12 -04:00
Avi Weinstock
67dedf409a Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs. 2021-03-24 15:42:37 -04:00
Avi Weinstock
35e729d919 In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly. 2021-03-23 23:00:05 -04:00
Avi Weinstock
8f42c5a34b Fix expect-panic on failed UID lookups in inventory_manip. 2021-03-23 19:04:21 -04:00
Avi Weinstock
657f6d6185 Remove level from create_ship and CreateShip. 2021-03-23 10:44:42 +01:00
Avi Weinstock
e389c3597f Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships. 2021-03-23 10:44:37 +01:00
Avi Weinstock
503f9c087b Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky). 2021-03-23 10:44:32 +01:00
Avi Weinstock
57cbf8ce90 Enable RtSim airships. 2021-03-23 10:44:22 +01:00
Marcel
68e50132d0 Merge branch 'aweinstock/fix-agenttrade-acceptspam' into 'master' 
Make merchants not virtually spamclick accept.

See merge request veloren/veloren!1976
 2021-03-23 09:39:40 +00:00
Avi Weinstock
8eb9e68592 Make merchants not virtually spamclick accept. 2021-03-22 22:53:53 -04:00
heydabop
bc75323bb1 Fix #962 - kick old client and add new client on duplicate login 2021-03-22 19:15:24 -05:00
Marcel Märtens
8838bddefe update toolchain to nightly-2021-03-22 2021-03-22 16:41:04 +01:00
Marcel
242cf042ad Merge branch 'sharp/texture-atlases' into 'master' 
Enable allocation of new textures on atlas allocation failure.

See merge request veloren/veloren!1949
 2021-03-22 04:35:41 +00:00
Samuel Keiffer
d495459a12 Merge branch 'sam/combat-fixes' into 'master' 
Fixes gaining combo by shooting loot bag

See merge request veloren/veloren!1953
 2021-03-22 02:01:22 +00:00
Joshua Barretto
17548c3ddb Merge branch 'zesterer/pick' into 'master' 
Pickaxe

See merge request veloren/veloren!1959
 2021-03-22 00:19:42 +00:00
Joshua Barretto
abdba70178 Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
0f201c5e09 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Marcel
88c156a3ac Merge branch 'vfoulon80/climbing-skill' into 'master' 
Add climbing speed and cost

See merge request veloren/veloren!1950
 2021-03-21 18:35:44 +00:00
Joshua Barretto
4b7f69f850 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
3aad8818fa Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
50af548636 Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Avi Weinstock
49bf730c91 Update fall damage calculations. 2021-03-20 18:46:34 -04:00
Vincent Foulon
e35099fd84 address comments 2021-03-20 22:56:54 +01:00
Sam
e18c22a197 Fixed gaining combo by shooting loot bags 2021-03-20 16:26:10 -04:00
Vincent Foulon
902029e977 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Joshua Yanovski
d3be50b4f5 Enable allocation of new textures on atlas allocation failure. 
This solves the problem of not being able to set the view distance too
high, especially in pathological cases like giant trees.  For
simplicity, we just freeze any atlas where allocation failed and start
allocating to a new texture and atlas, letting reference counting
destroy the old one when there are no more references to it.  Because of
the spatial locality of chunk allocations, chunks allocated together
will virtually always have similar lifetimes, so the odds of this
causing significant fragmentation are very low, meaning this simple
solution should not do much worse than a much fancier one.
 2021-03-20 16:21:41 +01:00
Marcel Märtens
fcb00df6b8 Change the version number to 0.9 2021-03-20 13:07:09 +01:00
Marcel
3061630b61 Merge branch 'christof/trading_fix2' into 'master' 
fix merchant getting stuck in non-existant trade when declining after accepting

See merge request veloren/veloren!1941
 2021-03-19 09:29:45 +00:00
Christof Petig
102b016b2e fix merchant getting stuck in non-existant trade when declining after accepting 2021-03-19 00:43:23 +01:00
Avi Weinstock
e71d09b68d Fix agent flight by enabling flight mode at the start of each tick of the agent system. 2021-03-18 18:54:23 -04:00
Joshua Barretto
b514f4fe92 Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage 2021-03-17 21:31:07 +00:00
Marcel
3a66189bbc Merge branch 'james/fix-npc-chat-spam' into 'master' 
Correct npc chat spam

See merge request veloren/veloren!1921
 2021-03-16 23:22:48 +00:00
James Melkonian
cec5dee242 merchants no longer run away while trading 
(this time without refactoring)
 2021-03-16 23:22:48 +00:00
Marcel
4d02f8f426 Merge branch 'ubruntu/issue983' into 'master' 
scan_fmt -> 0.2.6

Closes #983

See merge request veloren/veloren!1911
 2021-03-16 22:23:23 +00:00
Sam
11a43f232e NPCs no longer target players inside safezones (and consider them to be defeated) 
Warding aura no longer sometimes bypasses safezone invulnerability
 2021-03-16 15:17:08 -04:00
Marcel
1621f805f8 Merge branch 'xMAC94x/slowjob' into 'master' 
instead of using tokio::Threadpool for CPU bound long running tasks, use rayon, but drip feed and limit the tasks

See merge request veloren/veloren!1912
 2021-03-16 15:28:28 +00:00
Joshua Barretto
f5fe264bd9 Prevent component inserts being immediately invalidated 2021-03-16 14:24:23 +00:00
Marcel Märtens
0f405626e8 create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it 2021-03-16 13:31:04 +01:00
Joshua Barretto
6dd091d02d Fixed missed component insert bug 2021-03-16 12:19:42 +00:00
Joshua Barretto
f520fcb8c2 Optimised entity sync code, increased animation throttling distance 2021-03-16 02:49:33 +00:00
Joshua Barretto
ee3d9443a1 Increased network throttling for reduced network bandwidth 2021-03-16 02:40:56 +00:00
James Melkonian
aef24832b3 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Bryant Deters
6c55b8cbb3 scan_fmt -> 0.2.6 2021-03-15 17:48:21 -05:00
Marcel
6bd2adab2b Merge branch 'sam/explosion-fix' into 'master' 
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
 2021-03-15 22:26:28 +00:00
Sam
cea87d2e9a Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Sam
fa498cc6cc Explosions now take into account hitbox of entity. 2021-03-14 23:45:55 -04:00
Avi Weinstock
140b958193 Address Imbris's MR 1888 comments, and add changelog entry. 
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
 2021-03-14 23:21:46 -04:00