2763 Commits

Author SHA1 Message Date
Pfauenauge90
972d0c5dd7 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Imbris
c26bb6a174 Merge branch 'yusdacra/tweaks' into 'master'
Fixes minor issues with frustum culling

See merge request veloren/veloren!712
2020-01-11 16:36:51 +00:00
Imbris
460a05c31a Merge branch 'shandley/bugfix-stats-audio-event' into 'master'
(fix) Remove emission of an audio event from stats sys

See merge request veloren/veloren!714
2020-01-11 04:49:43 +00:00
Shane Handley
1c9094af4f Remove emission of an audio event from stats sys
This was accidentally left in by me during some testing of server
emission of SFX events to all clients. There was no effect on gameplay since we dont
emit a sound for this event yet, but it should not be here.

The audio event is correctly handled elsewhere by each client.
2020-01-11 13:08:33 +09:00
Songtronix
2c12fb5a21 Merge branch 'songtronix/improve-discord' into 'master'
remove discord rich presence

See merge request veloren/veloren!695
2020-01-10 16:15:27 +00:00
Songtronix
e4fe286f34 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
59df649fe6 Merge branch 'pfau/assets' into 'master'
Scrolling Combat Text (SCT)

See merge request veloren/veloren!711
2020-01-10 00:33:38 +00:00
Monty Marz
178ad9479a Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
e3828a07b4 Fix lpindex not being updated for culled objects, and don't
recalculate frustum for every entity
2020-01-09 22:22:06 +03:00
Acrimon
f2ac3a5a49 Merge branch 'yusdacra/tweaks' into 'master'
Improvements to frustum culling and some changes

Closes #210

See merge request veloren/veloren!708
2020-01-08 17:43:40 +00:00
Yusuf Bera Ertan
44d9e7c590 Cargo fmt 2020-01-08 20:09:54 +03:00
Acrimon
b831786cf5 Merge branch 'shandley/no-npc-spawn-underwater' into 'master'
Prevent NPCs from spawning underwater

See merge request veloren/veloren!709
2020-01-08 12:48:00 +00:00
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
Yusuf Bera Ertan
a6b979104e Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan
f5bdc4d697 Use treeculler crate 2020-01-07 19:40:06 +03:00
Yusuf Bera Ertan
5338281323 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
cc61925486 Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum 2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan
820b4ea7fc Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
cb1b6c4c29 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan
81eaaae398 Reimplement #210 2020-01-07 18:40:45 +03: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