Timo Koesters
a06511e413
Merge branch 'payload1/energy-component' into 'master'
...
payload1/energy component
Closes #405
See merge request veloren/veloren!719
2020-01-12 21:41:34 +00:00
Gilbert Röhrbein
28060e7b6e
fixing #405 - Energy as its own component
2020-01-12 22:25:04 +01:00
Monty Marz
9c65c43713
Merge branch 'pfau/map-transp-hotfix' into 'master'
...
Hotfix for map flickering while turning
See merge request veloren/veloren!720
2020-01-12 19:01:02 +00:00
Monty Marz
f6dfb74b3e
fix
...
slightly lower trigger velocity
slighty more transp map image
2020-01-12 19:01:02 +00:00
Songtronix
8e355f79a3
Merge branch 'shandley/sfx-land-on-ground' into 'master'
...
Play the Run SFX when a character lands after jumping or falling
See merge request veloren/veloren!717
2020-01-12 16:35:20 +00:00
S Handley
00c1493548
Play the Run SFX when a character lands after jumping or falling
...
This is a small detail but makes a noticable difference.
2020-01-12 16:35:20 +00:00
Acrimon
3405d42ef1
Merge branch 'qutrin/ez-optimisation' into 'master'
...
Improvement: Replace all '..=b' with '..b + 1'
See merge request veloren/veloren!718
2020-01-12 15:05:45 +00:00
Piotr Korgól
e1adf40856
Improvement: Replace all '..=b' with '..b + 1'
2020-01-12 15:46:53 +01:00
Monty Marz
7c63f27ecd
Merge branch 'pfau/sct-hotfix' into 'master'
...
fixed number shadow for "0" damage appearing on level up
See merge request veloren/veloren!716
2020-01-11 20:47:47 +00:00
Pfauenauge90
e0fc3ce425
fixed number shadow for "0" damage appearing on level up
2020-01-11 21:31:57 +01:00
Imbris
2b4d4aa480
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
d72aeccf50
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
c6f64564a8
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
a3f893d877
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
70eb2eed33
remove: discord rich presence
2020-01-10 17:01:50 +01:00
Monty Marz
c910d60e06
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
851d7858e6
Scrolling Combat Text (SCT)
2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
127f8fb72b
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
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