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
13,178 Commits 151 Branches 18 Tags 2.1 GiB
d5c169682e
Commit Graph

13178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sophia Waggoner
d5c169682e Update changelog. 2023-03-21 22:00:15 -07:00
Sophia Waggoner
4a3d1bbb86 Ultimately use setting in day cycle updates. 
(First functional commit.)
 2023-03-21 21:32:05 -07:00
Sophia Waggoner
7e4ea483e0 Add a ServerConstants to Client and Server structs and sync on register. 2023-03-21 20:28:08 -07:00
Sophia Waggoner
b649774316 Add ServerConstants and its module to common 2023-03-21 17:29:51 -07:00
Sophia Waggoner
ea23d066c6 Add (currently dummy) setting for day length and validation for that setting. 2023-03-20 21:58:57 -07:00
Isse
c8d0b337bb Merge branch 'fix_ngoubou_jaw' into 'master' 
fix_ngoubou_jaw

See merge request veloren/veloren!3834
 2023-03-20 22:24:13 +00:00
flo666
897d1e5fe5 fix_ngoubou_jaw 2023-03-20 22:07:23 +01:00
Joshua Barretto
d6fdc2637b Merge branch 'zesterer/monotonic-time' into 'master' 
Don't allow time to go backward

See merge request veloren/veloren!3833
 2023-03-18 11:06:31 +00:00
Joshua Barretto
1f80b3ce47 Don't allow time to go backward 2023-03-18 10:02:11 +00:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70 Address review on 3817 2023-03-17 20:17:46 -04:00
Christof Petig
a66888c3de Merge branch 'christof/ron_based_spots' into 'master' 
enable spot addition via ron file

See merge request veloren/veloren!3824
 2023-03-18 00:16:56 +00:00
Christof Petig
0e73bd23ed significant code simplification proposed by zesterer 2023-03-17 22:43:19 +01:00
Christof Petig
b555d619fb prefer imbris syntax proposal, documentation and changelog 2023-03-17 22:35:47 +01:00
Christof Petig
1f976f9f1c follow clippy's advice 2023-03-17 22:35:47 +01:00
Christof Petig
28da420c82 enable spot addition via ron file 2023-03-17 22:35:47 +01:00
Christof Petig
1e93648081 Merge branch 'fix_husk_brute_singlestrike' into 'master' 
fix_husk_brute_singlestrike

See merge request veloren/veloren!3832
 2023-03-15 23:02:18 +00:00
flo666
472ef6b823 fix_husk_brute_singlestrike 2023-03-15 20:32:22 +01:00
Marcel
4a72979de1 Merge branch 'DuckLuck/update-hud-pickup-msg_for_pt-BR' into 'master' 
Add "You" selector for hud-loot-pickup-msg in pt-BR translation

See merge request veloren/veloren!3831
 2023-03-15 11:48:02 +00:00
Pexxxzz
04398dba49 Add "You" selector for hud-loot-pickup-msg 2023-03-14 21:22:07 -04:00
Imbris
9e212935e5 Merge branch 'imbris/time-local-event-handling' into 'master' 
Add metrics for timing subsections of State::tick

See merge request veloren/veloren!3825
 2023-03-14 14:52:57 +00:00
Imbris
87bf44241b Add metrics for timing subsections of State::tick 2023-03-14 01:03:05 -04:00
Imbris
ebffe9317c Merge branch 'catb0t/zoom-defaultbind' into 'master' 
Remove default binding for Camera Zoom Lock

See merge request veloren/veloren!3823
 2023-03-13 06:15:49 +00:00
cat stevens (catb0t)
e99d2e7ca3 Remove default binding for Camera Zoom Lock 2023-03-13 06:15:49 +00:00
Isse
452d4b2121 Merge branch 'move-models-to-voxel' into 'master' 
Move key and lockpick models to voxel folder

See merge request veloren/veloren!3826
 2023-03-13 00:36:15 +00:00
Isse
29d9c9dcae move key and lockpick models to voxel folder 2023-03-13 00:54:29 +01:00
Ben Wallis
45c8934b79 Merge branch 'xvar/queue-char-deletes' into 'master' 
Changed character deletion to go via batch update

See merge request veloren/veloren!3562
 2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Samuel Keiffer
8febcf6b3d Merge branch 'sam/buffs' into 'master' 
Auras and buffs no longer need to tick every tick

See merge request veloren/veloren!3814
 2023-03-12 22:06:48 +00:00
Sam
42388976d7 Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments. 2023-03-12 16:37:02 -04:00
Isse
fd34e48d15 Merge branch 'floppy_bird_medium_scale' into 'master' 
bird_medium_scale

See merge request veloren/veloren!3820
 2023-03-12 18:08:21 +00:00
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +00:00
Marcel
607220b3d7 Merge branch 'DuckLuck/translations_updates_pt-BR' into 'master' 
Update translation for pt_BR

See merge request veloren/veloren!3821
 2023-03-12 07:52:22 +00:00
Imbris
6b8e22d6cc Improvements and fixes for interacting/collecting 
* Inert entities like arrows no longer block interactions like picking
  up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
  as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
  instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
  since we were using this enum for two different things.
 2023-03-11 21:17:27 -05:00
Pexxxzz
1d9eb08a95 Update translation 
Add new translations;
Remove 1 unused translation;
Create quest.ftl and they translations.
 2023-03-11 20:08:32 -04:00
Marcel
2ad53aaa36 Merge branch 'vasco/zoom' into 'master' 
Italian translations

See merge request veloren/veloren!3813
 2023-03-11 23:57:45 +00:00
Marcel
bac621e6ca Merge branch 'Rovetown/update-de_DE' into 'master' 
Updated the German translation for the ability.ftl

See merge request veloren/veloren!3819
 2023-03-11 23:41:54 +00:00
Marcel
7c8fc7191b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3811
 2023-03-11 22:41:39 +00:00
Jonathan Berglin
cdcc605464 Update swedish translations 2023-03-11 22:41:38 +00:00
Sam
4c79936c07 Added wrapper type to durations related to buffs and auras. 2023-03-11 16:47:11 -05:00
Sam
663db06844 Made auras no longer need to be mutably accessed every tick. 2023-03-11 16:45:12 -05:00
Sam
8a6a60d5bb Buffs from auras no longer need to be mutably accessed every tick in aura system to prevent applying a buff every tick and ensure duration only starts after leaving aura 2023-03-11 16:45:12 -05:00
Sam
9efac9957d Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component. 2023-03-11 16:45:11 -05:00
Sam
b1b41e95f6 Queueable buffs now work with buffs without using a timer, tests too 2023-03-11 16:45:11 -05:00
Sam
e60080c293 Syncing Time from server to client now works 2023-03-11 16:45:10 -05:00
Sam
89aa934c3c Initial work 2023-03-11 16:45:10 -05:00
Rovetown
26b88537da Updated the German translation for the ability.ftl 2023-03-11 22:41:44 +01:00
Imbris
19b5ed3487 Appease clippy 2023-03-11 11:06:08 -05:00
Imbris
619f62cb63 Use try_set for door destruction to avoid accidentally overwriting any 
other changes that already occured that tick.

Also get terrain/block change resources from the ecs once to avoid the
overhead of fetching them from the ecs (and aquiring/releasing runtime
borrow).
 2023-03-11 10:24:45 -05:00
Imbris
3ad9297623 Ensure outcome event bus is cleared on the client since those are unused, and add a TODO about either using them or not generating them 2023-03-11 10:24:45 -05:00