Commit Graph

3068 Commits

Author SHA1 Message Date
Imbris
6524ea31d1 Fix flight turning 2019-12-20 22:51:35 -05:00
Imbris
934c5d6846 Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc 2019-12-20 22:51:35 -05:00
Imbris
b2752d2419 Cutout unnecessary Resource syncing machinery and Tracker trait 2019-12-20 22:51:35 -05:00
Imbris
5813f626d1 cleanup 2019-12-20 22:48:14 -05:00
Imbris
bfaa18e010 Fix NaN in agent sys, stop pushback from turning player around, account for Scale in melee attack hit detection 2019-12-20 22:48:14 -05:00
Imbris
8f7323f41b Stop syncing health change timer updates 2019-12-20 22:48:14 -05:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
c3ac251fa8 Stop syncing Projectile component to the client 2019-12-20 22:48:14 -05:00
Imbris
e49cafafbf Actually send deletion messages 2019-12-20 22:48:14 -05:00
Imbris
71cce03f29 Move sync code into common submodule 2019-12-20 22:37:12 -05:00
Imbris
609e0f23bf Stop global syncing of entity creation 2019-12-20 22:37:12 -05:00
Songtronix
b1e8c915d9 Merge branch 'songtronix/improve-logging' into 'master'
improve logging

See merge request veloren/veloren!663
2019-12-20 15:14:23 +00:00
Songtronix
f070c139e9 change(log): only print out log file errors, no panic 2019-12-20 15:59:50 +01:00
Songtronix
b03e4ac261 feat(log): configurable creation of log file
additionally allows to ignore any errors with the log file

furthermore prints out full log file path to the user incase of a panic
2019-12-20 15:45:30 +01:00
Songtronix
9141cc07d0 feat(env): configurable verbosity of log file via VOXYGEN_FILE_LOG environment variable 2019-12-20 15:45:30 +01:00
Songtronix
0d919a9dc6 improve(log): adjust verbosity of some logging
fix: settings do not log due to logging being initialized to late
2019-12-20 15:45:30 +01:00
Imbris
6e64924556 Merge branch 'shandley/sfx-and-title-music-updates' into 'master'
Update title music and temporarily remove attack sfx

See merge request veloren/veloren!689
2019-12-20 04:04:05 +00:00
S Handley
8c5320d20f Update title music and temporarily remove attack sfx
- Updated title music with a version provided by aeronic which fades out
more gracefully
- Removed attack SFX as it was included in the movement processing, but
will return later as part of a similar chunk of code which processes
combat sfx independent of movement.
2019-12-20 04:04:05 +00:00
Imbris
226826e026 Merge branch 'character-tweaks' into 'master'
Fix fall->climb, tweak jump and glide

See merge request veloren/veloren!687
2019-12-15 17:44:19 +00:00
Adam Whitehurst
4ead941c82 Fix fall->climb, tweak jump and glide 2019-12-15 17:44:19 +00:00
Songtronix
8cc2e62b28 Merge branch 'songtronix/fix-readme-links' into 'master'
fix broken download links in Readme

See merge request veloren/veloren!688
2019-12-14 07:09:30 +00:00
Songtronix
7c39b2af75 fix(readme): broken download links 2019-12-14 07:56:44 +01:00
Monty Marz
2eb32c8d55 Merge branch 'pfau/fix_bow' into 'master'
Fix bow-shot frequency

See merge request veloren/veloren!685
2019-12-12 20:13:45 +00:00
Monty Marz
1e1990758b Fix bow-shot frequency 2019-12-12 20:13:45 +00:00
Marcel
bb350bbdff Merge branch 'xmac94x/update-toolchain' into 'master'
update toolchain to `nightly-2019-12-11`

See merge request veloren/veloren!682
2019-12-11 14:20:21 +00:00
Marcel Märtens
72d8f95e8c please ci toolchain 2019-12-11 15:13:46 +01:00
Marcel Märtens
c84335fa26 update toolchain to nightly-2019-12-11 2019-12-11 14:43:22 +01:00
Imbris
318adecb0d Merge branch 'cfrantz1/veloren-astar-pathfinding-no-fork' into 'master'
Add advanced path finding to new 'Traveler' enemy using A* algorithm

See merge request veloren/veloren!680
2019-12-11 05:28:45 +00:00
Forest Anderson
d8fc7cb667 Add advanced path finding to new 'Traveler' enemy using A* algorithm 2019-12-11 05:28:45 +00:00
Imbris
0529716fa5 Merge branch 'shandley/fix-music-volume-startup' into 'master'
Set the music and sfx volumes during startup

Closes #373

See merge request veloren/veloren!667
2019-12-10 14:02:51 +00:00
S Handley
da2d36ed76 (fix) Set the music and sfx volumes immediately after initialising the
audio frontend.

Fixes #373
2019-12-10 14:02:51 +00:00
Acrimon
7cb177bb44 Merge branch 'update-controller' into 'master'
Update controller

See merge request veloren/veloren!679
2019-12-09 14:45:10 +00:00
Adam Whitehurst
20575e0aab Update controller 2019-12-09 14:45:10 +00:00
Acrimon
47b480eac6 Merge branch 'shandley/fix-glider-close-sfx' into 'master'
Fix the glider_close sfx event

See merge request veloren/veloren!678
2019-12-09 09:50:14 +00:00
S Handley
56f9c5d35f Fix the glider_close sfx event
This was failing to trigger since we now have a MovementState::Fall, but
the sfx mapper was still trying to work this out itself based on
velocity. We no longer need to track velocity as a result and can use
the MovementState.

Also silenced warnings resulting from unused vars when running tests.
2019-12-09 09:50:14 +00:00
Songtronix
35b4098b16 Merge branch 'shandley/footsteps-grass' into 'master'
Update footsteps SFX

Closes #374

See merge request veloren/veloren!676
2019-12-08 10:03:40 +00:00
S Handley
11dd6b8090 Update footsteps SFX 2019-12-08 10:03:40 +00:00
Acrimon
3e2fe36a8c Merge branch 'treeco/invert-mouse-setting' into 'master'
Added mouse inversion setting

Closes #376

See merge request veloren/veloren!677
2019-12-06 23:24:55 +00:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Acrimon
ea6374b1e4 Merge branch 'refactor-controller-movement-states' into 'master'
Refactor controller movement states

See merge request veloren/veloren!672
2019-12-03 06:30:09 +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
Forest Anderson
1da30875c0 Merge branch 'revert-a2cfc4ba' into 'master'
Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"

See merge request veloren/veloren!674
2019-12-01 22:26:16 +00:00
Forest Anderson
f840e49e72 Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"
This reverts merge request !650
2019-12-01 22:12:26 +00:00
Forest Anderson
a2cfc4bae8 Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'
Added audio compression job for CI

See merge request veloren/veloren!650
2019-12-01 21:16:55 +00:00
Forest Anderson
14eebd930d Added audio compression job for CI 2019-12-01 21:16:55 +00:00
Marcel
c0ae12452e Merge branch 'treeco/fp-view-height' into 'master'
Made the first person camera follow race heights, plus minor zoom changes

See merge request veloren/veloren!673
2019-12-01 20:56:33 +00:00
Treeco
7c17c45f47 made first person camera follow race heights, minor zoom chances 2019-12-01 19:05:28 +00:00
Marcel
a6ef802f9c Merge branch 'inputs-enhancements' into 'master'
Inputs enhancements

See merge request veloren/veloren!671
2019-11-29 15:20:35 +00:00
Adam Whitehurst
4e574cb29a Inputs enhancements 2019-11-29 15:20:35 +00:00
Monty Marz
b7a084cbb8 Merge branch 'pfau/assets' into 'master'
Set overflow checks to 'false' for release builds in order to bandaid fix recent master error

See merge request veloren/veloren!670
2019-11-28 13:32:38 +00:00