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
12,492 Commits 151 Branches 18 Tags 2.1 GiB
cead27989b
Commit Graph

629 Commits

Author SHA1 Message Date
Marcel
afda04e1eb Merge branch 'command_access' into 'master' 
Removal of /home

See merge request veloren/veloren!3171
 2022-02-02 08:50:23 +00:00
Youssef Fahmy
fdfd2c99ff Removal of /home 2022-02-02 08:50:23 +00:00
InfRandomness
54b69e37a5 Implement giant trees in site2 2022-02-02 02:33:37 +00:00
James Melkonian
44865d99ff Fix guards menacing instead of defending villagers 2022-01-30 13:14:24 -08:00
Joshua Barretto
39863e8727 Remove colour banding 2022-01-27 00:29:03 +00:00
infrandomness
1a1acfae2c
Fix RUSTSEC-2022-0006 2022-01-26 22:08:38 +01:00
InfRandomness
52c92ba0d4 Give names to site2 sites 2022-01-26 11:42:35 +00:00
James Melkonian
2671f824d0 Prohibit accidental cliff diving by NPCs 2022-01-25 16:25:40 +00:00
Justin Shipsey
54d5a06a0d Merge branch 'unvariant/lantern_bug' into 'master' 
Fixes #1406 - Lantern light does not change when dragging it from inventory

Closes #1406

See merge request veloren/veloren!3107
 2022-01-25 02:59:29 +00:00
InfRandomness
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
Joshua Barretto
d18174e0d1 Revert "Merge branch 'infrandomness/remove_alpha' into 'master'" 
This reverts merge request !3128
 2022-01-24 00:52:03 +00:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
Joshua Barretto
c7717c165e Updated changelog 2022-01-19 20:08:11 -05:00
Samuel Keiffer
7052aad11b Merge branch 'snowram/arthropods' into 'master' 
Snowram/arthropods

See merge request veloren/veloren!3071
 2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8 Remove bomb pile item 2022-01-19 19:31:43 +00:00
James Melkonian
ac6f53922f Move agent code into separate files 2022-01-18 03:02:43 +00:00
Joshua Barretto
1a0c5c1773 Updated changelog 2022-01-17 22:22:45 +00:00
Joshua Barretto
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master' 
Mount Everest

See merge request veloren/veloren!3101
 2022-01-17 13:21:38 +00:00
ninefox
fc012b4989 Lantern color will now change when swapping lanterns while lantern is activated 2022-01-16 16:24:31 -08:00
terrarier2111
5da2850624 Fix loot forcing 2022-01-16 21:12:59 +00:00
Joshua Barretto
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
aaa33c6834 Fixed display of some stats in dary and changelog entry. 2022-01-15 21:49:29 -05:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory. 
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
 2022-01-14 19:14:24 +01:00
Sam
a882cb6af4 Changelog 2022-01-12 22:21:55 -05:00
unvariant
71d2be5f76 support removing key bindings 2022-01-07 20:30:30 +00:00
voxal
39e3d5c163 Move changelog entry to bottom 2022-01-05 20:07:05 -08:00
voxal
0b4446ad81 Add changes to changelog 2022-01-05 20:06:43 -08:00
DaforLynx
13e87375d6 River sounds and more 2022-01-03 22:40:31 +00:00
DoctorKompot
4ecdd8002d updated changelog 2021-12-27 03:01:30 +02:00
DoctorKompot
22b19e40e9 updated changelog, fixed lantern colors 2021-12-27 03:01:28 +02:00
Imbris
d137ffba63 Update changelog 2021-12-25 19:24:12 -05:00
holychowders
b40d94dd53 Re-allow and improve fleeing. 2021-12-07 20:18:03 -06:00
Avi Weinstock
cb4c3eb34e Bodies of water no longer contain black chunks on the voxel minimap. 
The heuristic for pruning dungeon ceilings depended on detecting an
air-to-not-air edge, which was not present for chunks whose topmost
layer was water. Sampling 1 layer of the `above` block introduces such
an edge, allowing the water surface to be detected.
 2021-11-29 14:39:56 -05:00
James Melkonian
ab99126a7b Floor merchant cost percentages and display as whole numbers 2021-11-25 01:32:20 +00:00
Imbris
3bf0ac1971 Switch to new CI image set with aarch64 support and update changelog 2021-11-23 21:27:23 -05:00
UncomfySilence
7c560cc6b9 + CHANGELOG.md message "Dungeons have somewhat proper scaling. The higher the dungeon the harder it gets, Cultist staying unchanged while Mino is now at its level." 2021-11-18 19:53:21 +01:00
Monty Marz
ec07dbb05e Merchant Outfit 2021-11-18 16:31:12 +00:00
Ben Wallis
022c1417b6 EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies). 
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.

EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
 2021-11-13 20:46:45 +00:00
Joshua Barretto
657ac45288 Updated changelog 2021-11-13 17:13:09 +00:00
jshipsey
913a2725e8 changelog 2021-10-31 01:19:21 -04:00
Sam
aad2384622 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
ee2a7d625c Changelog 2021-10-27 17:02:36 -04:00
Kemper
034041fd4f Aim fireballs at feet 
AI aims fireballs at the target’s feet, for a slight improvement
in splash damage.
 2021-10-27 19:50:50 +00:00
Sam
c68618f20b Changelog 2021-10-26 22:49:21 -04:00
Kemper
b0b90744cf Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
ubruntu
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Imbris
4b2842da2f 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
Isidor Nielsen
f0864a7b0a use "input:____" for searching by recipe input 2021-10-10 15:44:43 +00:00
Imbris
4f6eb286e6 Remove dead commented code, updated changelog, commented profiling spans 
(but left in for easy reuse later), fix clippy complaint
 2021-10-10 03:09:03 -04:00
Enrique AM
277273ff14 Update CHANGELOG.md 2021-10-08 19:37:46 +02:00
Imbris
66076db7bb Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
ubruntu
0e2808a8fd Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
96e23ae2d4 Handle oceans and steep rivers gracefully, update changelog 2021-10-05 00:02:32 +01:00
Imbris
f867991198 Merge branch 'imbris/credits' into 'master' 
Add credits screen

Closes #1296

See merge request veloren/veloren!2872
 2021-10-03 04:26:58 +00:00
Imbris
ee42eaa515 Make gitlab hightlight syntax for ron files (using rust syntax highlighting). Update changelog for credits addition. Fix clippy large variant issue. 2021-09-30 03:01:24 -04:00
Sylvain Migaud
9b41568881 Place date at the begining of the log file name 2021-09-30 06:09:30 +00:00
Sam
c62162c2d3 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Bafon
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
Imbris
5217b5090c Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass 2021-09-22 21:58:36 -04:00
Marcel
d5b4c5549b Merge branch 'bafon/crafting-station-icons' into 'master' 
Add crafting station icon to crafting menu sidebar

See merge request veloren/veloren!2848
 2021-09-22 13:54:33 +00:00
Bafon
0375b973db Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Joshua Barretto
a76496c339 Use previous position caches for airship collision detection 2021-09-17 22:34:28 +01:00
Monty Marz
0dfddb21b1 Merge branch 'bafon/always-show-bars-setting' into 'master' 
Add setting to always show energy bars

See merge request veloren/veloren!2836
 2021-09-15 12:04:44 +00:00
Bafon
b910c1dd9c Add setting to always show energy bars 2021-09-15 12:04:44 +00:00
Bafon
eecab6e9ec Fix HUD map mouse events 
Fixes dragging, scrolling, and setting the location marker when hovering player marker, location marker, group member markers, site icons, and peaks.
 2021-09-14 23:42:04 +02:00
Sam
9e9fba7704 Balanced frequency of dungeons. 2021-09-11 18:59:04 -04:00
Marcel Märtens
7913e6a9ba Change the version number to 0.11 2021-09-10 20:19:17 +02:00
Monty Marz
a23433b402 Bloom settings 2021-09-08 09:50:37 +00:00
Sam
7b0c096a22 Changelog 2021-09-04 12:43:24 -04:00
juliancoffee
6c1ecc9766 Add support for override asset folder 
- ASSETS_OVERRIDE environment variable with asset path which has higher
  priority.
 2021-09-02 20:24:23 +03:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Sam
13fa154e55 Changelog and added arm length (body radius) to sprite pickup range. 2021-08-31 13:37:53 -04:00
Joshua Barretto
6f15233448 Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed 2021-08-31 13:31:52 +01:00
Joshua Barretto
b646aae2a4 Removed unused tree assets 2021-08-31 10:15:52 +01:00
Ben Wallis
9e35f5ec33 Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town. 2021-08-20 09:00:55 +01:00
Daniil Nemtsev
a5ec81844f Add WGPU adapter selection using WGPU_ADAPTER 2021-08-13 12:39:44 +00:00
Joshua Barretto
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
Tavo Annus
e834711293 Fix character being too close in menu 2021-08-10 14:00:34 +02:00
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Ludvig Böklin
ebf489984c Improve gliding 
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
 2021-08-09 10:06:16 +01:00
Ludvig Böklin
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients 
Increase glider zero-lift drag
 2021-08-09 10:06:15 +01:00
Samuel Keiffer
92b32b4c36 Merge branch 'ygor/fix-axe-energy-reward' into 'master' 
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
 2021-08-05 00:38:41 +00:00
juliancoffee
229e7b9cec Add CHANGELOG note about battle_mode setting 2021-08-03 16:43:54 +03:00
Ygor Souza
1b5c3883a4 Allow axe combo to reward energy without skillpoint 
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
 2021-08-03 07:10:03 +02:00
Imbris
427930081a Add custom error message when there are no compatible graphics backends available 2021-08-03 00:00:30 -04:00
Ludvig Böklin
400734cc0a Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
c5c8ae4d30 Replace stamina -> energy in english localization strings 2021-07-31 01:35:28 -04:00
Imbris
091dae07a4 Merge branch 'imbris/admin-cmd' into 'master' 
Make admin adding/removing command arguments positional again

See merge request veloren/veloren!2700
 2021-07-30 06:05:29 +00:00
Imbris
172bddf731 Make admin add/remove command arguments positional again 2021-07-30 01:25:38 -04:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Ben Wallis
01ca6911a9 * Pets are now saved on logout and spawned with the player on login 
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
 2021-07-28 22:36:41 +00:00
Marcel Märtens
4328a45066 fixed map to zoom and drag correctly, fixed #1111 2021-07-27 01:15:06 +02:00
DanTheOne
18b5c1c35a Add shortcut to toggle chat 2021-07-26 02:42:35 +02:00
Joshua Barretto
0cb524d8d6 Properly fixed command parsing 2021-07-23 17:33:31 +01:00
Avi Weinstock
7555be0e25 Spawn players aboveground when using /site or when their waypoint is underground. 2021-07-15 17:54:29 -04:00
Monty Marz
e379aacf8c char selection frames, adjustments 2021-07-13 13:31:01 +02:00
Marcel Märtens
5f780aa0ee add biome and site info to F3 debug menu 2021-07-12 18:44:54 +02:00
Knightress Paladin
d0bb7004ab Added check to prevent sceptre AI from canceling its own ward 2021-07-07 20:01:00 -07:00
Monty Marz
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
AldanTanneo
3804c3d032 Implemented trading stackable items with a full inventory 2021-07-05 10:34:03 +00:00
juliancoffee
47aa371965 Update CHANGELOG with food rework 2021-07-05 10:57:11 +03:00
juliancoffee
303f03dd3a Adjust Yeti difficulty 
Frost breath:
    - ori_rate reduced from 0.6 to 0.1
    - time of breath increased from 1 second to 2 seconds
    - buildup increased from 0.4 to 0.8
    - make it more gentle, with less damage per tick, but faster tick rate
    (50 * 1 to 10 * 5)
    - make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to
    apply debuff.
    - make him use it when closer range (10 and not 15)
Ice spikes:
    - increase recovery_duration from 0.3 to 1.0
    - make him slower while doing ice spikes, make ice spikes move
    slower
    - make him use it when closer range (15 and not 20)
Snowball:
    - increase recover_duration from 0.4 to 0.9
Strike:
    - increase buildup_duration fron 0.6 to 0.8
    - increase recover_duration from 0.5 to 1.0
    - increase knockback from 40.0 to 70.0
 2021-07-04 03:44:17 +03:00
Avi Weinstock
110aa17642 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
Joshua Barretto
cf01dd7df7 Improved consistency of default controls 2021-06-30 13:39:37 +01:00
juliancoffee
46772c67e3 Remove post-armor crit damage 2021-06-30 03:16:04 +03:00
Sam
381c7121c6 Changelog 2021-06-29 05:59:02 -05:00
Snowram
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
juliancoffee
12b5d655cf Split Material and Dismantle crafting tabs 2021-06-26 21:37:13 +03:00
Scott Williams
8d0a1ad7b4 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Sam
645cc60dc0 Balance tweaks. 2021-06-23 22:38:37 -05:00
juliancoffee
ced180bbc9 changelog 2021-06-22 20:52:44 +03:00
Joshua Barretto
e930ff6779 Sanitise controller inputs 2021-06-21 21:13:49 +01:00
Joshua Barretto
b84708ca75 Added chat toggle 2021-06-21 20:16:03 +01:00
Samuel Keiffer
e7f54d6306 Merge branch 'juliancoffee/clay_golem_tweak' into 'master' 
clay golem tweak

See merge request veloren/veloren!2478
 2021-06-19 14:49:11 +00:00
juliancoffee
41b6d80635 Add CHANGELOG 2021-06-19 10:47:45 +03:00
Samuel Keiffer
2abd23ec64 Merge branch 'juliancoffee/not_explodable_sprites' into 'master' 
Proof of concept non-explodable sprites

See merge request veloren/veloren!2475
 2021-06-19 01:10:20 +00:00
Joshua Barretto
46dfc119fb Merge branch 'aweinstock/tighten_e2t' into 'master' 
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.

See merge request veloren/veloren!2460
 2021-06-18 16:27:20 +00:00
juliancoffee
8b44f7ed34 Add non-exploadable crafting stations to CHANGELOG 2021-06-18 13:10:27 +03:00
Joshua Barretto
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Imbris
9d9c0a045d Merge branch 'imbris/release-tweak' into 'master' 
Add debug line tables and avoid building unwinding landing pads in release builds

See merge request veloren/veloren!2446
 2021-06-16 02:17:49 +00:00
Avi Weinstock
5e6363dbcc Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels. 2021-06-15 21:29:29 -04:00
Imbris
e5f23eb41a Add debug line tables and avoid building unwinding landing pads in release builds 2021-06-15 21:14:49 -04:00
asumface
8568dfb38e
Bump rodio to 0.14 2021-06-14 22:04:23 +02:00
Marcel
1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Avi Weinstock
104de523b7 Move changelog entry for mining to 0.10 section. 2021-06-13 14:35:44 -04:00
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
Avi Weinstock
d02ff2db20 Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Scott Williams
2a161abd0a NPC Hitbox Adjustments 2021-06-09 08:08:41 +00:00
jshipsey
670845e6f5 changelog 2021-06-07 11:06:39 +02:00
hqurve
39fc48ac17 Widened recipe list in crafting menu and added quality indicators to names in the list 2021-06-06 15:55:11 +00:00
Samuel Keiffer
85b8d4e7c0 Merge branch 'sam/yeti' into 'master' 
Yeti Rework

See merge request veloren/veloren!2359
 2021-06-05 23:15:20 +00:00
Sam
acf7ad27f1 Balance tweaks. 2021-06-05 17:15:04 -05:00
Ben Wallis
1a93e3d84f Added 60 FPS framerate cap for title/menu screens 2021-06-05 14:13:53 +01:00
Sam
eaf87a53bb Final tweaks. 2021-06-03 21:39:47 -05:00
Imbris
d6e5827b8b Update changelog 2021-06-03 14:23:28 -04:00
Samuel Keiffer
d235e98efe 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
Avi Weinstock
cbe7521259 Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry. 2021-06-02 00:39:04 -04:00
Avi Weinstock
8b20175b6e Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Avi Weinstock
d38db15411 Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Avi Weinstock
4d7828ec94 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00