Imbris
|
518e4e3a5d
|
Merge branch 'TheThirdSpartan/chat-fixes' into 'master'
fixed empty chat messages for cli clients
See merge request veloren/veloren!1376
|
2020-09-10 05:10:53 +00:00 |
|
Imbris
|
c3ae641fbb
|
Merge branch 'imbris/tracy' into 'master'
Add more tracing instrumentation and tracy support
See merge request veloren/veloren!1359
|
2020-09-10 05:07:51 +00:00 |
|
Justin Shipsey
|
9cab5de99d
|
Merge branch 'healing' into 'master'
#753 Do not make pets think they are attacked when healed
See merge request veloren/veloren!1374
|
2020-09-09 23:43:19 +00:00 |
|
TheThirdSpartan
|
0fb2d1cd5a
|
fixed empty chat messages for cli clients
|
2020-09-09 18:50:45 -04:00 |
|
Matthew Martin
|
57c6160b72
|
* Set the KillType to Other for HealthSource::Healing
* Extend logic to projectiles and explosions
|
2020-09-09 23:34:10 +02:00 |
|
Matthew Martin
|
a9086b27a0
|
Do not make healing items deal damage
|
2020-09-09 23:22:49 +02:00 |
|
Imbris
|
b0dc35aa21
|
Merge branch 'TheThirdSpartan/chat-features' into 'master'
Added localization config options for new death messages
See merge request veloren/veloren!1372
|
2020-09-09 20:26:20 +00:00 |
|
TheThirdSpartan
|
7fd673ecb2
|
Added localization config options for new death messages
|
2020-09-09 20:26:20 +00:00 |
|
Marcel
|
8eee8dfa1f
|
Merge branch 'xMAC94x/make_veloren_small.fixes' into 'master'
replace heavy msgbox with light native-dialog
See merge request veloren/veloren!1373
|
2020-09-09 11:16:13 +00:00 |
|
Marcel Märtens
|
018d03d860
|
fix panic for macos
|
2020-09-09 12:11:56 +02:00 |
|
Marcel Märtens
|
68168b0ae4
|
replace heavy msgbox with light native-dialog
|
2020-09-08 23:49:49 +02:00 |
|
Marcel
|
b285f714e4
|
Merge branch 'fix' into 'master'
fix comment
See merge request veloren/veloren!1371
|
2020-09-07 15:52:18 +00:00 |
|
Marcel Märtens
|
a50757b88b
|
fix comment
|
2020-09-07 17:45:00 +02:00 |
|
Marcel
|
def983bb9d
|
Merge branch 'fixed#757' into 'master'
fixed #757
Closes #757
See merge request veloren/veloren!1370
|
2020-09-07 15:21:44 +00:00 |
|
Marcel Märtens
|
a0eebf15d0
|
fixed #757
|
2020-09-07 17:20:52 +02:00 |
|
Marcel
|
4bd41ddd9c
|
Merge branch 'xMAC94x/remove_busy_waiting' into 'master'
detect EOL on stdin and no longer try to read commands.
See merge request veloren/veloren!1369
|
2020-09-07 15:04:05 +00:00 |
|
Marcel Märtens
|
4cf86c725e
|
detect EOL on stdin and no longer try to read commands.
This can be locally tested with CTRL+D on basic mode.
RUST_LOG=trace might help
|
2020-09-07 16:28:13 +02:00 |
|
Marcel
|
a531aeca13
|
Merge branch 'tui_performance' into 'master'
decrease TUI to only draw 10 frames on idle.
See merge request veloren/veloren!1368
|
2020-09-07 13:06:37 +00:00 |
|
Marcel Märtens
|
5f15555fc5
|
decrease TUI to only draw 10 frames on idle.
add tracing when a cmd is entered
|
2020-09-07 14:32:46 +02:00 |
|
Imbris
|
37eaa3f85a
|
Merge branch 'doctaray/adding-borderless-fullscreen-option' into 'master'
added option for borderless fullscreen in setting -> graphics menu
See merge request veloren/veloren!1270
|
2020-09-07 05:12:15 +00:00 |
|
Raiyan Sayeed
|
906da2f0c7
|
added option for borderless fullscreen in setting -> graphics menu
|
2020-09-07 05:12:15 +00:00 |
|
Imbris
|
f39d1e9bb5
|
Use less verbose span names when the tracy feature is off
|
2020-09-07 00:59:16 -04:00 |
|
Imbris
|
7efbc74551
|
remove duplicate tracing filter code, fix compiling voxygen with the
tracy feature
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
0683a40741
|
Use finish_continuous_frame directly
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
63d60c212c
|
Add spans to server systems
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
4f68a6df27
|
Update tracy crates, reduce overhead of timing, add more misc instrumentation
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
e37a01be9d
|
Sprinkle instrumentation in common crate,in particular in the ecs systems
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
50ceb1c93e
|
Add workaround for spans with winit loop, configure filtering when the tracy feature is on, spinkle some spans in the codebase
|
2020-09-06 22:28:14 -04:00 |
|
Imbris
|
d95e539495
|
Intial setup of tracy
|
2020-09-06 22:28:14 -04:00 |
|
Marcel
|
b933db8b68
|
Merge branch 'xMAC94x/timeout_config' into 'master'
Implement the Player Timeout as config
See merge request veloren/veloren!1367
|
2020-09-06 23:29:16 +00:00 |
|
Marcel Märtens
|
961b8a4d7c
|
Implement the Player Timeout as config
|
2020-09-06 23:34:57 +02:00 |
|
Imbris
|
198c12babc
|
Merge branch 'TheThirdSpartan' into 'master'
adding feature requested in issue #153 - displaying your alias in game as 'you'
See merge request veloren/veloren!1356
|
2020-09-06 19:42:32 +00:00 |
|
TheThirdSpartan
|
6dbd1bc132
|
adding feature requested in issue #153 - displaying your alias in game as 'you'
|
2020-09-06 19:42:32 +00:00 |
|
Joshua Barretto
|
b87bbaff0b
|
Merge branch 'xMAC94x/hotfix_increase_timeout' into 'master'
tmp increase TIMEOUT from 20s to 40s.
See merge request veloren/veloren!1352
|
2020-09-06 17:54:59 +00:00 |
|
Imbris
|
dc2fc11956
|
Merge branch 'bag' into 'master'
Dropping a bag instead of turning entity into one
Closes #747
See merge request veloren/veloren!1362
|
2020-09-05 20:33:13 +00:00 |
|
Joshua Barretto
|
49c713a071
|
Merge branch 'zesterer/rtsim' into 'master'
Beehives, Fireflies, and minor worldsim/lighting adjustments
See merge request veloren/veloren!1357
|
2020-09-05 17:16:08 +00:00 |
|
notoria
|
264b5ec1c5
|
Avoid destroying a deleted entity
Suggested by @Imbris.
|
2020-09-05 18:59:14 +02:00 |
|
Monty Marz
|
679c8661ae
|
Merge branch 'fix_dummy_cmd' into 'master'
/dummy -> admin command
See merge request veloren/veloren!1363
|
2020-09-05 15:13:36 +00:00 |
|
Monty Marz
|
a70567b644
|
make dummy cmd an admin cmd to avoid exp cheesing and entity spamming
|
2020-09-05 16:12:35 +02:00 |
|
notoria
|
23021f955f
|
Dropping a bag instead of turning entity into one
|
2020-09-05 11:11:19 +02:00 |
|
Marcel
|
3c4c178264
|
Merge branch 'snowram/issue-622' into 'master'
Add 1st and 2nd item of inventory in hotbar
See merge request veloren/veloren!1314
|
2020-09-05 08:45:21 +00:00 |
|
Imbris
|
fb33a5e519
|
Merge branch 'termac/inventory_collect_when_full_fix' into 'master'
Fix bug collecting items into full inventory
See merge request veloren/veloren!1333
|
2020-09-05 06:51:22 +00:00 |
|
Imbris
|
0b9f2a5d3b
|
Merge branch 'sharp/default-shadows-real' into 'master'
Make shadow maps the default.
See merge request veloren/veloren!1361
|
2020-09-05 05:47:21 +00:00 |
|
Joshua Barretto
|
0a29c6b6f4
|
Better grass density
|
2020-09-04 21:20:08 +01:00 |
|
Joshua Yanovski
|
66f49d5386
|
Merge branch 'sharp/default-shadows' into 'master'
Create (segment, offset) just once per figure.
See merge request veloren/veloren!1360
|
2020-09-04 15:54:55 +00:00 |
|
Joshua Yanovski
|
a2de759296
|
Make shadow maps the default.
|
2020-09-04 16:41:08 +02:00 |
|
Joshua Barretto
|
0adc57e487
|
Made particle code more rugged
|
2020-09-04 11:49:49 +01:00 |
|
Joshua Barretto
|
282291c9dc
|
Updated changelog
|
2020-09-04 11:49:48 +01:00 |
|
Joshua Barretto
|
0c0f150140
|
fmt
|
2020-09-04 11:48:57 +01:00 |
|
Joshua Barretto
|
798e9d7cd7
|
Cheaper terrain sprites
|
2020-09-04 11:48:57 +01:00 |
|