Avi Weinstock
8a11a723fd
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
70a2027634
Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.
2021-04-11 22:08:41 -04:00
Avi Weinstock
6a3883b8f1
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
39d4d84f15
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
e1ca34d9e8
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
Marcel
5a76b0e4ec
Merge branch 'aweinstock/npcpotions' into 'master'
...
Give NPCs the ability to use potions.
See merge request veloren/veloren!2092
2021-04-11 23:47:30 +00:00
Avi Weinstock
5bf4048419
Give NPCs the ability to use potions.
2021-04-11 23:47:29 +00:00
Marcel
dc2428b38e
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
95c44a6794
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
439505c405
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
86e53dbb95
Update and fix zh_CN
2021-04-11 22:55:59 +00:00
Marcel
58bebc39d0
Merge branch 'danielduel/PL-local' into 'master'
...
Add/Extend PL locale
See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
Joshua Yanovski
b42ec9a4e5
Merge branch 'xMAC94x/deps' into 'master'
...
update deps
See merge request veloren/veloren!2095
2021-04-11 22:55:56 +00:00
Joshua Yanovski
01145f4a53
Merge branch 'vfoulon80/reorganize-assets' into 'master'
...
Reorganize and optimize assets
See merge request veloren/veloren!2099
2021-04-11 22:55:54 +00:00
BuildTools
fcdfd3e223
Add/modify Polish translations
2021-04-11 19:10:09 +02:00
Joshua Yanovski
7c526438bc
Merge branch 'sharp/fix-silly-bug' into 'master'
...
Fix players being able to pick up other players.
See merge request veloren/veloren!2104
2021-04-11 16:34:06 +00:00
Vincent Foulon
eb04bc7335
add new loader + move some images
2021-04-11 16:35:25 +02:00
Snowram
61fe82d4af
Lossless compression of UI assets
2021-04-11 16:35:25 +02:00
Vincent Foulon
36c3b08190
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
c29f75372e
remove unused images
2021-04-11 16:35:23 +02:00
Vincent Foulon
ff6c6da674
optimized all images
2021-04-11 16:35:23 +02:00
Vincent Foulon
c613e0022c
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Joshua Yanovski
1c38230494
Fix players being able to pick up other players.
2021-04-11 15:52:55 +02:00
Monty Marz
7dfb344e26
Merge branch 'pfau/map-things' into 'master'
...
UI fixes and more
See merge request veloren/veloren!2100
2021-04-11 03:49:47 +00:00
Monty Marz
04d540c565
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
32be6c5f8f
Merge branch 'sharp/sprites-in-background' into 'master'
...
Mesh sprites in background.
See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
Marcel
e0af7d8d87
Merge branch 'UMR1352/fix#1059' into 'master'
...
fix issue #1059 : Debug items should disappear when dropped
Closes #1059
See merge request veloren/veloren!2088
2021-04-10 17:41:43 +00:00
Marcel
8594b4ea84
Merge branch 'mdx97/default-names' into 'master'
...
Use username as default character name in multiplayer character creation.
See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
mdx97
b360143b42
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Joshua Yanovski
94ebf99115
Mesh sprites in the background.
...
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case. It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.
To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites. Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
Marcel
4c2bf6673a
Merge branch 'ccm7676/lang_bug_fix' into 'master'
...
fixed the Select a Language text on languages where it was broken
See merge request veloren/veloren!2089
2021-04-10 15:47:28 +00:00
Marcel
aa63982e69
Merge branch 'juliancoffee/uk_UA-localizaion' into 'master'
...
Update localization files for Ukrainian
See merge request veloren/veloren!2090
2021-04-10 14:54:13 +00:00
Illia Denysenko
f9d06f48d9
Update localization files for Ukrainian
2021-04-10 14:54:12 +00:00
Marcel
7c9ecca2c5
Merge branch 'MigraineX/update-es-ES' into 'master'
...
Updated the Spanish (ES) translation
See merge request veloren/veloren!2094
2021-04-10 14:20:40 +00:00
Marcel Märtens
7d8c85ff07
update deps
2021-04-10 15:53:00 +02:00
MigraineX
ccafd14390
Updated the Spanish (ES) translation
2021-04-10 14:31:57 +02:00
Joshua Yanovski
23af36999b
Merge branch 'sharp/remove-panics' into 'master'
...
Remove panics and unwraps, part 1.
See merge request veloren/veloren!2087
2021-04-10 10:10:01 +00:00
Joshua Yanovski
909f2c4680
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Carl Marino
5de52fc116
fixed the Select a Language text on languages where it was broken
2021-04-09 18:39:53 +02:00
Enrico Marconi
b9c01d990f
fix issue #1059 : Debug items should disappear when dropped
2021-04-09 13:46:43 +02:00
Marcel
589afd4db7
Merge branch 'xMAC94x/logspam' into 'master'
...
remove spamming of the logs
See merge request veloren/veloren!2086
2021-04-09 01:06:23 +00:00
Marcel
f13246c373
Merge branch 'xMAC94x/network_atomic' into 'master'
...
change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have...
See merge request veloren/veloren!2083
2021-04-08 22:39:19 +00:00
Marcel Märtens
1b38cfbd2d
remove spamming of the logs
2021-04-08 23:55:13 +02:00
Imbris
fd30663156
Merge branch 'vfoulon80/behavior-component' into 'master'
...
New Component: Behavior
See merge request veloren/veloren!2033
2021-04-08 19:16:28 +00:00
Vincent Foulon
5809116afa
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
Vincent Foulon
7c4da6e501
Address comments
2021-04-08 18:33:00 +02:00
Joshua Barretto
f84bae482f
Merge branch 'desttinghim/rtsim-path-following' into 'master'
...
RtSim pathfinding improvements
See merge request veloren/veloren!2013
2021-04-08 13:39:06 +00:00
Louis Pearson
b80bc61eb8
Document Travel enum
2021-04-08 05:40:56 -06:00
Louis Pearson
a7c1a97dda
Use distance_squared to speed up calculations
2021-04-08 05:10:22 -06:00
Louis Pearson
3bcdd06c87
Fix travellers stuck in town
...
There was an off by one error in the code that negates the progress
along paths that are reversed.
2021-04-08 05:10:04 -06:00
