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
6,878 Commits 151 Branches 18 Tags 2.1 GiB
b6ac4e46fb
Commit Graph

369 Commits

Author SHA1 Message Date
Imbris
db91ebe9b5 fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
d1b635efa4 Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
lausek
05cc6f222b avoid comparing to own entity when mounting; fix coding style 2020-07-15 15:31:42 +02:00
lausek
a3326b5744 fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Marcel
2414d5ae5e Merge branch 'gSpera/no_autowalk_after_die' into 'master' 
Stopping auto-walk after death: Fixes #607

Closes #607

See merge request veloren/veloren!1197
 2020-07-13 08:39:39 +00:00
Kai
8e523364ac Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00
Kai
6b771b8dca Add a clientside check to only allow freefly camera for admins 2020-07-11 13:59:47 -07:00
Kai
738fa34534 Add freefly camera mode and cycle camera mode keybind 2020-07-11 11:39:04 -07:00
Ben Wallis
6ca6e2d646 Removed rounding from ping delta and added weighted rolling average ping calculation 2020-07-11 15:39:31 +01:00
Giovanni Spera
4232148b83 Stopping auto-walk after death: Fixes #607 2020-07-07 20:56:44 +02:00
Joshua Barretto
d1cdb6ea55 Updated changelog 2020-07-07 01:11:37 +01:00
Joshua Barretto
e626f6255f Prevented pet damage 2020-07-07 01:01:39 +01:00
Joshua Barretto
f77d2f06c6 Fixed staff RMB, bug in ranged weapon code 2020-07-06 23:37:44 +01:00
Joshua Barretto
30619771af Improved block picking 2020-07-06 23:04:13 +01:00
Joshua Barretto
62b59de95a Fixed sprite select flickering 2020-07-06 22:41:21 +01:00
Joshua Barretto
8508b5177b Velocity-corrected bezier pathfinding control, swimming control 2020-07-05 09:38:15 -04:00
Monty Marz
89400264dc Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
Ben Wallis
dc1844b489 Moved sfx from common to voxygen 2020-06-28 18:16:22 +01:00
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
92127292d4 Added option to disable speech bubble icons. Aligned settings>gameplay menu again. 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
5ad212b7ed Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
289ef5d6b2 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
b08d717eac Rework chat processing 2020-06-27 16:29:03 -04:00
Joshua Barretto
b46e080ade Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
Kevin Glasson
af3af6c169 Convert voxygen to use tracing 
There are several noteable changes in this commit that mean that logging
will behave differently to how it did previously.

- There are now no separate filter levels for terminal and file output.
This is a feature that is lacking in `tracing` but is set to be resolved
by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY
include it.

- The default log level was previously `WARN` - it is now `INFO`.
 2020-06-21 23:17:25 +08:00
Kevin Glasson
19c2bf1181 Add hotbar state persistence. 
Persist the hotbar state to disk by writing it out to a `profile.ron`
situated next to the existing `settings.ron`. There are individual
profiles for every character on every server. On creation of a new
character the default hotbar state will be `[None; 10]` i.e. the hotbar
will be empty.

Resolves: https://gitlab.com/veloren/veloren/-/issues/577
 2020-06-19 08:00:21 +08:00
Justin Shipsey
2f896849d4 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
jshipsey
cd8f2c801e log-chat-messages 2020-06-13 15:21:58 -04:00
Joey Maher
458ac4af5e Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Joey Maher
25e74ee6e2 Toggle_lantern after dropping a Lantern slot item 2020-06-06 07:37:43 -05:00
Joey Maher
76f7f4fd98 Renaming and adding comments 2020-06-05 16:33:39 -05:00
Joey Maher
09541af551 Moving to a single crossbeam channel as a detail of Window, using strings instead of ClientEvent, and formatting 2020-06-05 15:53:15 -05:00
Joey Maher
8d90952074 Add channel to send messages up from methods like fetch_events to hud 2020-06-05 14:27:22 -05:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
Treeco
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +01:00
Joshua Barretto
5c3a08e450 Updated changelog and fmt 2020-05-19 14:41:08 +01:00
Joshua Barretto
05e6df1b65 Added overhead aiming camera 2020-05-19 14:26:53 +01:00
Joshua Barretto
2f47d09af4 Comment fixes and fmt 2020-05-19 00:35:58 +01:00
Joshua Barretto
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Treeco
a338ed3f24 Swapped block placement and destruction buttons 
Also capped placement range to match destruction range
 2020-05-15 17:39:44 +01:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Imbris
3450bfabfd Add orientation to debug text 2020-05-11 00:10:03 -04:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Joshua Barretto
37301706d4 Reduced size of terrain sprite vertices 2020-04-25 21:44:23 +01:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Treeco
dd08def18f Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Imbris
f81f91162d Basic hotbar functionality 2020-04-12 18:41:07 +02:00
Imbris
c1c09dce1b Enable unequipping as well as equipping to specific slots 2020-04-12 18:41:06 +02:00
Pfauenauge90
2263b9be95 starter chest, removed unused key commands 2020-04-12 18:41:02 +02:00
Imbris
968c064874 Restore slot interaction functionality 2020-04-12 18:40:52 +02:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Imbris
97148cb6bb Merge branch 'master' into 'combat' 
# Conflicts:
#   CHANGELOG.md
 2020-04-01 20:42:27 +00:00
Marli Frost
3806f08eb0
feat: configure audio output using an enum 2020-03-31 22:29:30 +01:00
Imbris
ba3fa16c33 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
37ec191021 update controller tick fn 2020-03-25 01:38:25 -04:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Adam Whitehurst
819c2767bc * move swap loadout to handle_swap_loadout util fn 
* impl From<JoinData> for StateUpdate
 2020-03-21 14:16:26 -07:00
Adam Whitehurst
3ae2b8de2e Remove excess code 2020-03-21 10:32:32 -07:00
Adam Whitehurst
180ec89060 add SwapLoadout 2020-03-21 10:26:38 -07:00
timokoesters
44ec09a8e7 Go to idle state when picking items up 2020-03-20 20:23:04 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
Shane Handley
4e5d200b70 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Shane Handley
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Acrimon
406767ae31 Merge branch 'capucho/voxygen-logout-timeout' into 'master' 
FIX #513 logout timeout

See merge request veloren/veloren!837
 2020-03-10 22:12:29 +00:00
Mckol
c3f1afdf2b Merge branch 'controller' into 'master' 
Controller support

Closes #20

See merge request veloren/veloren!750
 2020-03-10 21:00:13 +00:00
Mckol
8838682f0b Added Controller support 2020-03-10 21:00:13 +00:00
S Handley
b2312a0487 Check that a targeted collectible is within a certain pickup range of the character before highlighting it 2020-03-10 20:50:04 +00:00
Capucho
16e4214a52 Switch states instead of popping 2020-03-10 20:34:50 +00:00
Capucho
9d805a745e Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d8ba63ffdc Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
Imbris
4a0c474be1 Remove Client dependency from Scene types and audio managers, add an 
example for using voxygen as a library to renderer images of characters
 2020-03-05 23:12:51 -05:00
Capucho
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
a97b694dfe Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
2fa902270e fix: block 2020-02-24 18:10:42 +01:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
S Handley
b739623579 Split the audio channels into SFX and music channels. This makes the 
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
 2020-02-15 21:30:44 +00:00
Imbris
f8283116a8 Fix highlighting non-collectibles 2020-02-06 17:06:49 -05:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
S Handley
b7ce91fead Move music under audio 
Also add some blank time after each track so that we get some silence
between tracks.
 2020-02-03 11:55:32 +00:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Rémy PHELIPOT
f60a68d96d Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00
Imbris
e5d841e62f Adds fullscreen and window size settings and coverage based pixel art 
scaling
 2020-01-24 23:14:59 -05:00
timokoesters
7b558b4542 refactor: combine actionstate and movestate 2020-01-21 23:54:59 +01:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen 
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
 2020-01-20 21:07:25 +01:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
AdamWhitehurst
de36e75264 Fix imports, update matches 2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
Imbris
ede05c47b0 fix(char screen induced ghosts): 
Adds removing extra components and deleting entities clientside when
going back to the character screen. Also, simplifies ClientState by
removing the Dead variant and removing ClientMsg::StateRequest in favor
of more specific ClientMsg variants.
 2019-12-31 16:38:13 -05:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
AdamWhitehurst
8e0317e03d refactor states to handle update logic 2019-12-26 06:43:59 -08:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Adam Whitehurst
92d99af53c feat: weapon-type dependent wield and attack durations 
also some controller.rs cleanup
 2019-12-03 06:30:08 +00:00
Adam Whitehurst
4e574cb29a Inputs enhancements 2019-11-29 15:20:35 +00:00
timokoesters
b6552556e7 fix: show error on client failure again 2019-11-07 09:42:03 +09:00
Shane Handley
15c725bfde
Address code review points: 
- Clarify caffeine fueled comment
- Be better at comparing Instant's, and catch the 0 seconds case to say
Goodbye to the user
- Switch println for 'info!'
 2019-11-06 21:34:18 +01:00
Shane Handley
69b008e0e6
Fix issue with the timeout error showing when there is an intentional logout from the game. 2019-11-06 21:34:17 +01:00
timokoesters
c733c95718
improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
timokoesters
21f126acd4
feat: show errors in main menu when client fails 
Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`
 2019-11-06 21:34:15 +01:00
Shane Handley
3b24af76ab
Formatting 2019-11-06 21:34:15 +01:00
Shane Handley
ef6f8b509a
Eeek, remove logging. 2019-11-06 21:34:14 +01:00
Shane Handley
fe9ad3fa19
Network timeout updates 
- Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire.

- Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.
 2019-11-06 21:34:14 +01:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
stevedagiraffe
8680e92548 Added ability to toggle zoom inversion in settings 
Displayed as checkbox under the Gameplay tab.
 2019-10-02 23:09:05 +10:00
Imbris
a3daa6065a Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Joshua Barretto
bdf74cf151 Fixed typo 2019-09-26 14:03:41 +01:00
Joshua Barretto
59e6febb41 Fixed build placement bug, changed climb to LControl 2019-09-26 12:03:39 +01:00
Joshua Barretto
bef4f11536 Added sprite selection 2019-09-26 11:43:03 +01:00
Joshua Barretto
dff67e1c41 Added block collection, improved controls for it 2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1 Added apple and mushroom collection 2019-09-26 00:15:07 +01:00
Shane Handley
8cf6546dec Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
Louis Pearson
059d968499 Cargo fmt 2019-09-06 04:38:02 -06:00
Louis Pearson
ad3bd0b2ce Add footstep sounds, implement crude footstep sounding 
Sounds are played every tick, which is not good.
 2019-09-05 03:08:09 -06:00
Louis Pearson
447cfec19f Add support for fading sounds 2019-09-05 03:08:09 -06:00
Louis Pearson
9dc1f8f549 Revamp AudioFrontend 
audio::base had a lot of unnescessary abstractions and constructs.
The current code simplifies the API in a way that makes sense and
that will allow sound effects and fading to be added in an incremental
way.
 2019-09-05 03:08:09 -06:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
timokoesters
15978d216b
Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
timokoesters
bd8e71c5aa
Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
timokoesters
6e1c78e5d5
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
timokoesters
6b4dfcc533
Allow mapping the same key to multile actions (LMB = attack + respawn) 2019-08-27 14:03:40 +02:00
timokoesters
186db16707
Rename attack, block to main, alt 2019-08-27 14:03:39 +02:00
timokoesters
84d0f61596
Make pipeline succeed 2019-08-26 14:05:17 +02:00
timokoesters
e90f95bc75
Look in the direction of the camera 2019-08-26 13:12:38 +02:00
timokoesters
e7c61c30cc
Block when pressing right click while looking at the attacker 2019-08-26 13:12:37 +02:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Dominik Broński
f644b6ab89 Revert "Merge branch 'imbris/upgrade_specs' into 'master'" 
This reverts merge request !375
 2019-08-01 23:32:33 +00:00
Imbris
5f56657f6c Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00