Commit Graph

7163 Commits

Author SHA1 Message Date
Vincent Foulon
2e76966868 move climbing skill adjustment into climb module 2021-03-21 00:22:04 +01:00
Vincent Foulon
e35099fd84 address comments 2021-03-20 22:56:54 +01:00
Vincent Foulon
4f3c203ae1 add changelog entry 2021-03-20 17:18:32 +01:00
Vincent Foulon
902029e977 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Marcel
d05113ecab Merge branch 'xMAC94x/release_numbers' into 'master'
Change the version number to 0.9

See merge request veloren/veloren!1948
2021-03-20 12:48:05 +00:00
Marcel Märtens
fcb00df6b8 Change the version number to 0.9 2021-03-20 13:07:09 +01:00
Marcel
8ff9787523 Merge branch 'aweinstock/fix-playerentity-20210319' into 'master'
Set PlayerEntity in `Client::clean_state`. This fixes several issues where...

See merge request veloren/veloren!1945
2021-03-20 11:06:42 +00:00
Avi Weinstock
5d2db1cb36 Address MR 1945 review comments. 2021-03-19 19:53:17 -04:00
Avi Weinstock
318ae962fd Set PlayerEntity in Client::clean_state. This fixes several issues where interpolation would kick in after changing characters, causing the player to be locked in place or shoot into the sky on respawn or teleport. 2021-03-19 19:02:39 -04:00
Marcel
660fabc2e2 Merge branch 'sam/parallelize-beam' into 'master'
Parallelized beam

See merge request veloren/veloren!1944
2021-03-19 20:18:37 +00:00
Samuel Keiffer
c96b191e6f Parallelized beam 2021-03-19 20:18:36 +00:00
Marcel
a3b29f431a Merge branch 'snowram/hair-fix' into 'master'
Fix a missing dwarf hairstyle

See merge request veloren/veloren!1943
2021-03-19 14:11:16 +00:00
Snowram
49f0d41eb8 Fix a missing dwarf hairstyle 2021-03-19 12:45:08 +01:00
Marcel
ad75224694 Merge branch 'imbris/phys' into 'master'
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations

See merge request veloren/veloren!1942
2021-03-19 11:12:32 +00:00
Marcel
3061630b61 Merge branch 'christof/trading_fix2' into 'master'
fix merchant getting stuck in non-existant trade when declining after accepting

See merge request veloren/veloren!1941
2021-03-19 09:29:45 +00:00
Imbris
af56fb272b More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations 2021-03-18 21:20:22 -04:00
Marcel
b4126dcf9c Merge branch 'agentflight-fix-20210318' into 'master'
Fix agent flight by enabling flight mode at the start of each tick of the...

See merge request veloren/veloren!1940
2021-03-18 23:48:27 +00:00
Christof Petig
102b016b2e fix merchant getting stuck in non-existant trade when declining after accepting 2021-03-19 00:43:23 +01:00
Avi Weinstock
e71d09b68d Fix agent flight by enabling flight mode at the start of each tick of the agent system. 2021-03-18 18:54:23 -04:00
Marcel
fec0c345d7 Merge branch 'sarrakitty/glowy-fixes' into 'master'
tweaking glow and shine

See merge request veloren/veloren!1926
2021-03-18 22:34:20 +00:00
Snowram
0dabf089f2 Various visual fixes 2021-03-18 22:53:06 +01:00
Sarra
6ab109221e cleaning up some tools 2021-03-18 22:52:50 +01:00
Sarra
fc5d448e12 tweaking glow and shine 2021-03-18 22:52:40 +01:00
Marcel
269f246acc Merge branch 'imbris/speeeeeeeeeeeeeed' into 'master'
Combine 5 things into 1

See merge request veloren/veloren!1938
2021-03-18 15:51:54 +00:00
Marcel Märtens
94410ddedd cleanup faster physics calc 2021-03-18 15:22:28 +01:00
Imbris
03f02f5829 Combine 5 things into 1 2021-03-18 14:26:32 +01:00
Marcel
99d5254662 Merge branch 'vfoulon80/loading-animations' into 'master'
Remove unwraps when asset loading fails

See merge request veloren/veloren!1939
2021-03-18 12:56:17 +00:00
Vincent Foulon
e1502bb732 Remove unwraps when asset loading fails 2021-03-18 12:56:17 +00:00
Marcel
09ad5f984a Merge branch 'zesterer/worldgen-tweaks' into 'master'
Reduced frequency of bee hives

See merge request veloren/veloren!1936
2021-03-18 08:27:32 +00:00
Imbris
2072d00c7b Merge branch 'imbris/voxel-collider-broadphase' into 'master'
Spatial grid for voxel colliders as well as a basic bounding sphere test

See merge request veloren/veloren!1927
2021-03-18 07:03:04 +00:00
Marcel
76fee3aa54 Merge branch 'sam/fix-dash' into 'master'
Fixed dash

See merge request veloren/veloren!1933
2021-03-18 03:09:46 +00:00
Marcel
e7ad2bf2d9 Merge branch 'vfoulon80/loading-animations' into 'master'
Add new random loading animations

See merge request veloren/veloren!1931
2021-03-18 02:28:34 +00:00
Joshua Barretto
dc40803f1f Merge branch 'zesterer/network-tweaks' into 'master'
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage

See merge request veloren/veloren!1935
2021-03-18 01:47:29 +00:00
Joshua Barretto
55bab83f5d Merge branch 'sam/remove-combat-last-pos' into 'master'
Shockwaves and beams no longer use last position in calculating if they hit.

See merge request veloren/veloren!1934
2021-03-18 01:07:18 +00:00
Sam
440ccdfdd2 Fixed dash 2021-03-17 20:13:12 -04:00
Joshua Barretto
6d2a2fa918 Merge branch 'DaforLynx/aura-sfx' into 'master'
Adds sfx for Sceptre aura

See merge request veloren/veloren!1932
2021-03-17 23:54:50 +00:00
DaforLynx
53362d02ed Adds sfx for Sceptre aura 2021-03-17 23:54:49 +00:00
Vincent Foulon
b5a9481a33 allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Joshua Barretto
16fd382010 Reduced frequency of bee hives 2021-03-17 21:43:08 +00:00
Joshua Barretto
b514f4fe92 Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage 2021-03-17 21:31:07 +00:00
Sam
42c700bd2a Shockwaves and beams no longer use last position in calculating if they hit. 2021-03-17 17:24:39 -04:00
Vincent Foulon
0b884c7099 Add new random loading animations 2021-03-17 18:15:25 +01:00
Marcel
55fa5839f9 Merge branch 'xMAC94x/harden-threads' into 'master'
add a check that at least 1 thread works for slowJobPool and for every configuration

See merge request veloren/veloren!1930
2021-03-17 14:24:48 +00:00
Marcel Märtens
65352d771d add a check that at least 1 thread works for slowJobPool and for every configuration 2021-03-17 14:36:58 +01:00
Marcel
07f2cdc64e Merge branch 'tormeh/add-monologue-strings' into 'master'
Add monologue strings.

See merge request veloren/veloren!1925
2021-03-17 08:45:27 +00:00
Marcel
482555453c Merge branch 'xMAC94x/fix_slowjob' into 'master'
slowjob: allow at least 1 job of every type

See merge request veloren/veloren!1929
2021-03-17 08:08:12 +00:00
Marcel Märtens
0c97984a9e slowjob: allow at least 1 job of every type 2021-03-17 08:26:43 +01:00
Imbris
1792068e4e Remove extra instrumentation and the old voxel collider loop 2021-03-16 23:42:13 -04:00
Imbris
d3f30fbfdb Spatial grid for voxel colliders as well as a basic bounding sphere test
before doing any actual expensive voxel collision checking
2021-03-16 23:32:03 -04:00
Marcel
20f24896db Merge branch 'vfoulon80/fr-skills' into 'master'
[FR] translate skills.ron + missing keys

See merge request veloren/veloren!1901
2021-03-17 01:25:12 +00:00