48e23dba49
combat: reverted tweak on shockwave and changed loot table
2022-11-13 22:45:05 +01:00
6e18683d98
combat: tweak on shockwave
2022-11-13 22:24:01 +01:00
7113befe88
removed useless check
2022-11-13 22:21:32 +01:00
71e59e4b81
combat: tweaks and modified shockwave animation
2022-11-13 22:04:00 +01:00
24aac2d92f
Merge branch 'floppy_savannahpit_merchants' into 'master'
...
add merchants to savannah pits
See merge request veloren/veloren!3690
2022-11-13 19:14:27 +00:00
6d8f2c8c7b
add merchants to savannah pits
2022-11-13 19:14:26 +00:00
4784b61656
Small fixes
2022-11-13 14:03:37 -05:00
a64236f50f
quadruped_medium shockwave animation WIP
2022-11-13 19:41:18 +01:00
19fb2e6416
fixed format
2022-11-13 11:45:03 +01:00
8aa4f782f4
added a space
2022-11-13 11:27:17 +01:00
1173c8257f
Merge branch 'holychowders/agent_awareness2' into 'master'
...
Rework internal representation of agent awareness
See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
95fd092e26
Fix awareness changes.
2022-11-12 12:12:32 -06:00
aa2fabcd45
Merge branch 'mossdrake' into 'master'
...
Moss Drake
See merge request veloren/veloren!3693
2022-11-12 13:00:44 +00:00
0351bf1d63
Moss Drake
2022-11-12 13:00:42 +00:00
420e824a3e
Merge branch 'train-track-shadows' into 'master'
...
Train track shadows
See merge request veloren/veloren!3688
2022-11-12 13:00:24 +00:00
ed25a84c72
combat: tweaked roshwalr melee detection and range
2022-11-12 13:51:27 +01:00
a820eee289
Merge branch 'floppy-bat-wing-tweaks' into 'master'
...
tweak bat wing animation
See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
df70381a7c
tweak bat wing animation
2022-11-12 10:18:10 +00:00
13980861f8
combat: tweaked roshwalr AI
2022-11-11 16:37:58 +01:00
7a75b72aa3
Merge branch 'KingPEPSALT/improve_time_command' into 'master'
...
FIX #1622 , /time command will not allow time going backwards as rtsim cannot...
See merge request veloren/veloren!3570
2022-11-11 10:30:44 +00:00
8f4863be28
combat: balance tweaks on roshwalr
2022-11-11 10:22:23 +01:00
e72719ddf1
Hitboxes no longer cast shadows.
2022-11-10 18:26:11 -05:00
c252f84bdf
Merge branch 'pfau/instruments_crafting' into 'master'
...
Musical Instruments part 2
See merge request veloren/veloren!3667
2022-11-10 20:59:53 +00:00
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
f6e2c6885c
Cargo fmt
2022-11-10 17:19:43 +01:00
5294603431
changed {:?}s to {}s in format strings
2022-11-10 17:18:59 +01:00
f22a9d030d
CHANGE: moved time of day interpolation logic out of Client and into Scene for semantics and accessing the settings logically
2022-11-10 17:16:48 +01:00
775025ac63
CHANGE, client time lerp would cause flashing lights for large discrepancies, it now no longer lerps if the flashing lights setting is not on
2022-11-10 17:16:45 +01:00
3e580138df
FIX #1622 , /time command will not allow time going backwards as rtsim cannot handle time regression, time given in seconds is treated as if it were seconds ahead of the next midnight
2022-11-10 17:06:53 +01:00
f1b77e27fe
combat: lowered flee_health on roshwalr
2022-11-10 16:57:29 +01:00
e1e78a914f
combat: added angle condition on shockwave
2022-11-10 14:24:06 +01:00
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +01:00
0e476cd3df
Merge branch 'lunareclipse/update-personal-information' into 'master'
...
Updated some of my personal info
See merge request veloren/veloren!3691
2022-11-09 00:33:52 +00:00
32abb59132
Updated some of my personal info
2022-11-08 23:06:32 +01:00
97f3fa56d3
Merge branch 'DaforLynx/event-music' into 'master'
...
Event music can use more than one event at a time. Added test for soundtracks.
See merge request veloren/veloren!3686
2022-11-07 22:39:25 +00:00
b2b14e7ab4
Event music can use more than one event at a time. Added test for soundtracks.
2022-11-07 22:39:25 +00:00
18657fdb66
Render train tracks to the shadow map.
2022-11-06 20:54:58 -05:00
db251273ed
Apply shadow map shadows to train tracks.
2022-11-06 18:09:07 -05:00
571b07d54a
Remove dt and multiplication by 30.
2022-11-06 13:10:17 -06:00
72bffe0df8
Merge branch 'train-tracks' into 'master'
...
Train tracks
See merge request veloren/veloren!3679
2022-11-05 22:56:07 +00:00
aa846ddb31
Merge branch 'door-fixes' into 'master'
...
Doors now animate opening when entities are near them.
See merge request veloren/veloren!3683
2022-11-05 18:38:53 +00:00
f5c1293e9f
Address review comments for MR 3679:
...
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
b64ca9e698
Tweaked door opening, many entities push grass
2022-11-02 14:44:18 +00:00
ff5acf18d7
Doors now animate opening when entities are near them.
2022-11-01 19:29:51 -04:00
836d4e4427
Merge branch 'bats' into 'master'
...
bats
See merge request veloren/veloren!3681
2022-11-01 15:01:18 +00:00
da65485228
bats
2022-11-01 15:01:18 +00:00
abd2e0832f
Update swedish translations
2022-11-01 11:05:51 +01:00
2242f7245d
Avoid placing site2 houses on paths (this affects worldgen even with train tracks disabled, since the paths are already there).
2022-10-31 14:55:13 -04:00
f83afcd5a8
Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.
2022-10-29 14:50:52 -04:00
372ffe45d7
Add command for debugging ways.
2022-10-29 14:32:48 -04:00
