Joshua Yanovski
3155c31e66
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 22:35:22 +02:00
Marcel Märtens
e618eeb386
Fix a isse that might occur when a participant is dropped while the remote wants to open a Stream and we get some bad time condition.
...
increase the slowlorris timeout. for some reason it seems to trigger alot more often since commit: `75c1d440` but i have no idea why.
My guess would be that the initial sync now sends way more data which slows down TCP to be > 10ms and trigger. Note: the fix might cause small lags when slow people try to connect to the server
2020-08-13 12:06:53 +02:00
Joshua Yanovski
862df3c997
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 05:52:56 +02:00
Joshua Barretto
75c1d44010
Merge branch 'zesterer/worldsim' into 'master'
...
World simulation, generation, and pathfinding improvements (including castles and caves)
See merge request veloren/veloren!1282
2020-08-12 21:40:56 +00:00
Joshua Barretto
e3cab272c3
Fixed floating sprites in towns, clippy fixes
2020-08-12 21:16:14 +01:00
Joshua Barretto
50a85853e3
Fmt and clippy lints fixes
2020-08-12 21:16:14 +01:00
Joshua Barretto
6992194ad4
Better surface swimming, no underwater sprites
2020-08-12 21:15:53 +01:00
Joshua Barretto
9bb10a6d00
Various improvements to castles, dungeons and more
2020-08-12 21:15:53 +01:00
Joshua Barretto
41229b4665
Added large caves, cave scatter, removed old caves
2020-08-12 21:15:53 +01:00
Joshua Barretto
1763693f5f
Added labour value to economy, castle improvements
2020-08-12 21:15:52 +01:00
Joshua Barretto
d6cdb0c433
Began adding castles
2020-08-12 21:15:52 +01:00
Joshua Barretto
1f4cec773b
Added make_block command
2020-08-12 21:15:52 +01:00
Joshua Barretto
f21a50e393
Added forts to towns, began better economy sim
2020-08-12 21:15:52 +01:00
Joshua Yanovski
f51dfdeb44
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-12 20:19:04 +02:00
Joshua Yanovski
0ed801d540
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-08-12 16:32:24 +02:00
Monty Marz
6789b7ae27
Add firework hues
2020-08-12 22:29:06 +08:00
scott-c
9aab296264
Add firework item
2020-08-12 22:25:28 +08:00
scott-c
cae84dd4c9
fix rebase
2020-08-08 20:53:07 +08:00
scott-c
a0107d5cda
fix rebase
2020-08-08 19:26:52 +08:00
scott-c
ba301696f4
change campfire cmd to spawn object instead of npc
2020-08-08 19:26:52 +08:00
Joshua Barretto
7c31baef6f
Added outcome system, sound effects
2020-08-08 19:26:48 +08:00
scott-c
1a263834e7
Add campfire command
2020-08-08 19:25:33 +08:00
scott-c
5ba4d26821
Update changelog
2020-08-08 19:25:29 +08:00
scott-c
4bc373a832
remove particle emitter component
2020-08-08 19:25:00 +08:00
scott-c
803677f0fb
Add particle velocity and ability particle emitter
2020-08-08 19:25:00 +08:00
scott-c
da5f4828a5
Add particle lifespan
2020-08-08 19:25:00 +08:00
scott-c
39b676cd8f
Add ParticleMgr
2020-08-08 19:24:55 +08:00
scott-c
42a10a6059
Add ParticleEmitter Component
2020-08-08 19:24:22 +08:00
Monty Marz
142b386628
address comments
2020-08-08 00:13:00 -04:00
Imbris
2608217e83
Make clippy happy, fmt even though it is set to fmt on save in my
...
editor...."
2020-08-08 01:16:35 +02:00
Imbris
a7df000a6f
Fireballs no longer damage group members
2020-08-08 01:16:35 +02:00
Imbris
af8560ea36
Remove pets from the group exp division calculation but still give them exp, fix bug with group code when pets are deleted
2020-08-08 01:16:35 +02:00
Imbris
390d289d35
Add timeout's to group invites, and configurable limit to group size
...
Fix a few group bugs, enable invite timeout and group limits in ui
2020-08-08 01:16:35 +02:00
Monty Marz
def68302c7
Fixed test world to run again
...
Update test_world.rs
2020-08-08 01:15:58 +02:00
Monty Marz
14b0d9a7fe
group leader colouring, offset fix when debug menu is open,
...
fixed social tab visuals
text width limit
group interaction wording, group window adjustments
2020-08-08 01:15:58 +02:00
Monty Marz
28a8f847cc
timeout visuals, various small fixes and two new items
2020-08-08 01:15:58 +02:00
Imbris
ecf6a84b2f
Don't give exp when killing self or group members
2020-08-08 01:15:58 +02:00
Imbris
03d9992b9f
Distribute exp evenly and make it easier to target entities
2020-08-08 01:14:19 +02:00
Imbris
3a22b3694d
New group UI functions
2020-08-08 01:14:19 +02:00
Imbris
d856c20225
Integrate groups with chat groups
2020-08-08 01:12:35 +02:00
Imbris
ef4b221706
Make entity targeting easier, add EXP sharing
2020-08-08 01:12:35 +02:00
Imbris
0a8f148559
Fixes and tweaks for groups
2020-08-08 01:12:35 +02:00
Monty Marz
d9e3937a82
Basic UI
...
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
10c3d01466
Add basic group functionality (no voxygen wiring yet)
2020-08-08 01:09:01 +02:00
Joshua Yanovski
3dc973e0be
Major speedups with SIMD.
2020-08-07 23:50:27 +02:00
Joshua Yanovski
77a8c7c267
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-07 06:47:10 +02:00
Joshua Yanovski
6d425f125e
Fix various migration issues.
2020-08-07 01:35:51 +02:00
Silentium2318
1c40218de9
More weapon and hit box tweaks
2020-08-06 09:43:47 -05:00
Joshua Yanovski
b44e442325
Miscellaneous performance improvements.
2020-08-06 13:40:35 +02:00
Imbris
c2f3e1b47f
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
...
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
