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

2744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
S Handley
4fcd9e2e0f Prevent NPCs from spawnign underwater 
This should be set until there are underwater NPC types.
 2020-01-08 12:48:00 +00:00
Imbris
4b0edec8ba Merge branch 'piercelbrooks/mac_msgbox_panic_hook_crash_fix' into 'master' 
fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )

Closes #426

See merge request veloren/veloren!706
 2020-01-07 05:45:43 +00:00
Pierce Brooks
71fd686a39 fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow ) 2020-01-07 05:45:43 +00:00
Monty Marz
bb5011399e Merge branch 'pfau/fix-trees' into 'master' 
Save the trees!

See merge request veloren/veloren!707
 2020-01-06 14:21:04 +00:00
Pfauenauge90
82db12611c fixed the trees being cut off 2020-01-06 15:07:08 +01:00
Imbris
3c9e84bc0c Merge branch 'imbris/char-screen-transition' into 'master' 
Fix issues regarding going back to the character selection screen

Closes #386

See merge request veloren/veloren!700
 2020-01-02 19:40:21 +00:00
Joshua Barretto
3d497001a2 Merge branch 'zesterer/better-rollin' into 'master' 
Made rolling less slippy, added tilt

See merge request veloren/veloren!699
 2020-01-02 18:35:27 +00:00
Imbris
49a7d96de7 Fix typos, don't insert Controller if it doesn't already exist in the 
mount system so that Controller components are not added to entities
client side
 2020-01-02 05:34:27 -05:00
Imbris
a3464b0dbc Merge branch 'shandley/character-exp-sfx' into 'master' 
Update SFX structure to add experience / levelling SFX

See merge request veloren/veloren!693
 2020-01-01 02:55:48 +00:00
S Handley
205c617c04 Refactor and Rename for clarity 
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
 2020-01-01 02:55:48 +00:00
Imbris
93c0f5e0ef Fix issue where controller events aren't processed while mounted. Fix non humanoids being able to climb and glide. 2019-12-31 16:41:45 -05:00
Imbris
a77512a714 Fix formatting, Update CHANGELOG, turn overflow checks on for dev 
profile
 2019-12-31 16:38:13 -05:00
Imbris
1fc93bc021 Small connection error handling improvement 2019-12-31 16:38:13 -05:00
Imbris
804e559e3a 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
Songtronix
d68cc6e71a Merge branch 'add-airshipper-aur-to-readme' into 'master' 
Added the link to airshipper-git AUR package to the README

See merge request veloren/veloren!701
 2019-12-31 19:15:20 +00:00
Mckol
cc8d66c52f Added the link to airshipper-git AUR package to the README 2019-12-31 17:09:29 +00:00
Joshua Barretto
245d9c3341 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +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