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
AdamWhitehurst
563e50b67d
Move utils file
2020-01-09 08:23:20 -08:00
AdamWhitehurst
de36e75264
Fix imports, update matches
2020-01-08 11:31:42 -08: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
AdamWhitehurst
5527d83a0e
Update mod imports
2020-01-08 08:56:36 -08:00
Adam Whitehurst
8cdf06e3e2
Swim pulsing
2020-01-08 05:17:36 -08: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
Adam Whitehurst
8648641362
Grooming
2020-01-07 07:49:08 -08: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
Adam Whitehurst
dc33f6ad6a
Ruin them again (the comments)
2020-01-05 15:28:20 -08:00
Adam Whitehurst
4e18ffe6c2
RUIN the comments
2020-01-05 15:26:04 -08:00
Adam Whitehurst
5bba0a96fc
Fix refs
2020-01-05 15:21:37 -08:00
Adam Whitehurst
542f06eef4
Add new() to states
2020-01-05 15:17:22 -08:00
Adam Whitehurst
4e5cf63452
Clean Up Systems
2020-01-05 14:55:27 -08:00
Adam Whitehurst
8bf35a197b
Update weapon .ron
2020-01-05 11:26:22 -08:00
Adam Whitehurst
8fe5cec947
Clean up, make state handlers options
2020-01-05 10:19:09 -08:00
Adam Whitehurst
2f3ccbc5d6
Update Comments
2020-01-03 12:46:41 -08: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
Adam Whitehurst
2635c405fe
Ability comps and sys
2020-01-01 09:16:29 -08:00
