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

1609 Commits

Author SHA1 Message Date
Samuel Keiffer
a3ee98cfb9 Merge branch 'aweinstock/agent-pid' into 'master' 
Implement PID controllers and use them to stabilize Agent airship flight.

See merge request veloren/veloren!2356
 2021-06-02 23:15:08 +00:00
Marcel
35980f82a6 Merge branch 'revert-c6e200a3' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2318
 2021-06-02 14:27:13 +00:00
Imbris
5caf8b6b55 Re-disable incremental just for common-systems, small fix in plugin 
crate, more new clippy fixes
 2021-05-31 20:44:57 -04:00
Imbris
5985584c5c Update toolchain 2021-05-31 20:44:57 -04:00
Avi Weinstock
7aac77288b Address MR 2356 comments. 2021-05-30 13:36:25 -04:00
Avi Weinstock
be35da9e57 Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Sam
cb50b5940a Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
60880b8fff Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Sam
875f1efc61 Fixed bow AI 2021-05-26 20:53:29 -05:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
Jonathan Berglin
5c8fc8da83 Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
Avi Weinstock
62de40239a Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Ludvig Böklin
d7fa4e093d Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
Sam
62e21e5961 Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
b6570d3151 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
0bc059513e Made new skills for reworked bow. 
Created migration to reset bow skills.
 2021-05-22 12:33:21 -05:00
Samuel Keiffer
083f67dbb2 Merge branch 'sam/extra-equip-slots' into 'master' 
Added Extra Loadout Slots

See merge request veloren/veloren!2295
 2021-05-21 20:28:53 +00:00
Marcel Märtens
c19c592586 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
Marcel
be56cd2a87 Revert "Merge branch 'sharp/revert-quinn' into 'master'" 
This reverts merge request !2315
 2021-05-21 10:41:16 +02:00
James Melkonian
bc7b453b5b Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
James Melkonian
8e9e550ce0 Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Joshua Yanovski
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'" 
This reverts commit 04d8ddf25ed6b1ae8dd97846c5c4b9af4ab399b8, reversing
changes made to 9dcf7a9d26f7d60020c5707fea3ed8ac5596d3dc.
 2021-05-17 08:32:12 -07:00
Marcel
48208b711d Merge branch 'xMAC94x/quic_enablement' into 'master' 
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
 2021-05-17 12:02:55 +00:00
Sam
6f00d556ad Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
holychowders
21867f8a85 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
Marcel
8218fdd329 Revert "Merge branch 'snowram/hacky-mount' into 'master'" 
This reverts merge request !2219
 2021-05-14 13:43:20 +00:00
Snowram
a01add2e2c Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
James Melkonian
cdbf023645 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
Joshua Yanovski
e457c3547d Don't remesh chunk vertex data on sprite update. 
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
 2021-05-11 12:58:15 -07:00
James Melkonian
fb2cd3fd45 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
Sam
cefa9d1ff3 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
Sam
510c1980da Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
0cc94c41ee Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
a7495801d9 AI tweaks. 2021-05-10 18:53:49 -05:00
Snowram
6cb67b85da Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
f39d5e34bf Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
1f73bad862 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
57e4966e98 Golem AI 2021-05-10 18:53:43 -05:00
Marcel Märtens
869a922b2d Add Quin support, as this is not yet very much tested it needs to be activated in the settings of SERVER and CLIENT. 
Server:
 provide a certificate file and key file via the settings. When provided it will then listen on TCP and QUIC, if not provided it will be TCP only.
 The certificate must be known by the client, so you might get problems with self-signed certificates.
 ```ron
 quic_files: Some((
     cert: "/home/user/veloren_cert.pem",
     key: "/home/user/veloren_key.key",
 )),
 ```

Client:
 activate the voxygen settin `use_quic: true` to try to connect to the quic backend of a server.
 2021-05-10 12:59:13 +02:00
Joshua Yanovski
2015f34985 Merge branch 'sharp/modtools' into 'master' 
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
 2021-05-10 04:54:06 +00:00
Joshua Yanovski
3f8d2f95be Added non-admin moderators and timed bans. 
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
 2021-05-09 21:19:16 -07:00
Avi Weinstock
f7bc0cd429 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Avi Weinstock
6ac0f6fdd9 Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
Avi Weinstock
7103467d1a Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
Illia Denysenko
ac1b01c636 /skill_preset command 2021-05-08 15:47:09 +00:00
Samuel Keiffer
67eff3d351 Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00:00
Avi Weinstock
ff83cf752b Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
James Melkonian
d849bf7d29 Move weapon tactics to functions and take target body into attack radius consideration 2021-05-06 21:17:05 +00:00
Daniel Mizerski
e740b4a2a9 (Wiring) Logic - make wiring turing complete 2021-05-06 19:53:12 +02:00