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,755 Commits 151 Branches 18 Tags 2.1 GiB
851d7858e6
Commit Graph

2755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Acrimon
4e7c955490 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
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
Acrimon
2dfba6aacc 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
5b65b16594 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
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan
24013f1a32 Use treeculler crate 2020-01-07 19:40:06 +03:00
Yusuf Bera Ertan
0b67dad4a5 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
31d18b3381 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
c19c222a90 Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan
fd9cc76786 Reimplement #210 2020-01-07 18:40:45 +03:00
Imbris
2710e6133d 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
43febb5bf3 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
f77bb63f0b 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
38d44cc87f fixed the trees being cut off 2020-01-06 15:07:08 +01:00
Imbris
4fa05150a2 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
423e741cb6 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
f52aef224e 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
7313ec69cb 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
2644e29484 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
1acf08390a 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
c9caf14877 Fix formatting, Update CHANGELOG, turn overflow checks on for dev 
profile
 2019-12-31 16:38:13 -05:00
Imbris
06ea29bd4c Small connection error handling improvement 2019-12-31 16:38:13 -05: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
Songtronix
89fd9e2853 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
d55ea709f6 Added the link to airshipper-git AUR package to the README 2019-12-31 17:09:29 +00:00
Joshua Barretto
cfbf69ae89 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +00:00
Monty Marz
2a618467cd 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
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
Imbris
cec303a3c6 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
ec3e075020 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
722024ed7f 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
badd3113d5 hierarchical pathfinding 2019-12-29 20:58:21 +00:00
Forest Anderson
95e9710243 Merge branch 'angelonfira/changelog' into 'master' 
Added changelog

See merge request veloren/veloren!694
 2019-12-29 12:28:00 +00:00
Forest Anderson
c60367e1be Added changelog 2019-12-29 12:28:00 +00:00
Imbris
ddfa2b4600 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
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