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

2728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mckol
cc8d66c52f Added the link to airshipper-git AUR package to the README 2019-12-31 17:09:29 +00:00
Monty Marz
c2b3ce72f6 Merge branch 'pfau/assets' into 'master' 
Animated UI elements (map, healthbars...), Asset updates

See merge request veloren/veloren!697
 2019-12-30 12:16:36 +00:00
Monty Marz
c4599d4de1 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
Imbris
a7f4c358ad Merge branch 'imbris/player-list' into 'master' 
Show players out of range on the player list, fix another overflow causing bug

See merge request veloren/veloren!691
 2019-12-30 02:17:16 +00:00
Imbris
18aa4936b6 fix(player list): Show players not in range on the player list 
fix(overflow): Stops including block updates that fail (since chunks
don't exist on the client) in `TerrainUpdates` (which would trigger
meshing of those nonexistent chunks). Furthermore, removes
remeshing of chunks with block updates if those chunks don't have all their
neighbours (since those wouldn't be meshed in the first place).
 2019-12-29 20:51:05 -05:00
Acrimon
bcdb81b137 Merge branch 'dylankile/hierarchical-pathfinding' into 'master' 
hierarchical pathfinding

See merge request veloren/veloren!686
 2019-12-29 20:58:21 +00:00
Dylan Kile
2df4ba6252 hierarchical pathfinding 2019-12-29 20:58:21 +00:00
Forest Anderson
90f6b75fce Merge branch 'angelonfira/changelog' into 'master' 
Added changelog

See merge request veloren/veloren!694
 2019-12-29 12:28:00 +00:00
Forest Anderson
cdd66d19df Added changelog 2019-12-29 12:28:00 +00:00
Imbris
6a7d34efb5 Merge branch 'imbris/sync' into 'master' 
Fix sync issues

Closes #359 and #377

See merge request veloren/veloren!675
 2019-12-21 04:26:38 +00:00
Imbris
b0d1db9c04 Fix flight turning 2019-12-20 22:51:35 -05:00
Imbris
a16588a719 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
0d763ab8ef Cutout unnecessary Resource syncing machinery and Tracker trait 2019-12-20 22:51:35 -05:00
Imbris
010fe45754 cleanup 2019-12-20 22:48:14 -05:00
Imbris
77c8248d88 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
9bcc8aa74f Stop syncing health change timer updates 2019-12-20 22:48:14 -05:00
Imbris
0d6a8b949f Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
b2ef1b2a00 Stop syncing Projectile component to the client 2019-12-20 22:48:14 -05:00
Imbris
e2e642f5a5 Actually send deletion messages 2019-12-20 22:48:14 -05:00
Imbris
237532f7b1 Move sync code into common submodule 2019-12-20 22:37:12 -05:00
Imbris
470e52fbd0 Stop global syncing of entity creation 2019-12-20 22:37:12 -05:00
Songtronix
b4aebb1f29 Merge branch 'songtronix/improve-logging' into 'master' 
improve logging

See merge request veloren/veloren!663
 2019-12-20 15:14:23 +00:00
Songtronix
f3a68a269b change(log): only print out log file errors, no panic 2019-12-20 15:59:50 +01:00
Songtronix
156c5a4b92 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
a0be385fb8 feat(env): configurable verbosity of log file via VOXYGEN_FILE_LOG environment variable 2019-12-20 15:45:30 +01:00
Songtronix
631b00417d 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
d34c9d0a81 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
7eea6c5699 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
9615d0c95b 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
a4ffb57c25 Fix fall->climb, tweak jump and glide 2019-12-15 17:44:19 +00:00
Songtronix
c324727355 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
06a119ff95 fix(readme): broken download links 2019-12-14 07:56:44 +01:00
Monty Marz
66bf56e2b3 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
3621a177ce Fix bow-shot frequency 2019-12-12 20:13:45 +00:00
Marcel
ffa98040e0 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
7d16b7d6a2 please ci toolchain 2019-12-11 15:13:46 +01:00
Marcel Märtens
21e41ac735 update toolchain to nightly-2019-12-11 2019-12-11 14:43:22 +01:00
Imbris
901abff892 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
31382a560f Add advanced path finding to new 'Traveler' enemy using A* algorithm 2019-12-11 05:28:45 +00:00
Imbris
90c8a46c79 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
f83c91b71c (fix) Set the music and sfx volumes immediately after initialising the 
audio frontend.

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

See merge request veloren/veloren!679
 2019-12-09 14:45:10 +00:00
Adam Whitehurst
6700a03678 Update controller 2019-12-09 14:45:10 +00:00
Acrimon
9af255473e 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
846ad2ac64 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
a6657a63c1 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
bcd658044f Update footsteps SFX 2019-12-08 10:03:40 +00:00
Acrimon
47d1acfb99 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
57155044fc Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Acrimon
3c259e41ec 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