TheThirdSpartan
44499b16f4
adding feature requested in issue #153 - displaying your alias in game as 'you'
2020-09-06 19:42:32 +00:00
Joshua Barretto
870386211c
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
f693ce820b
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
eb707880d2
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
8acf354994
Avoid destroying a deleted entity
...
Suggested by @Imbris.
2020-09-05 18:59:14 +02:00
Monty Marz
492f69ec72
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
f5c2d8e73d
make dummy cmd an admin cmd to avoid exp cheesing and entity spamming
2020-09-05 16:12:35 +02:00
notoria
3efdf336c8
Dropping a bag instead of turning entity into one
2020-09-05 11:11:19 +02:00
Marcel
e47c8c2c93
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
f8c5877144
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
ad31f48f5e
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
2f127e9b33
Better grass density
2020-09-04 21:20:08 +01:00
Joshua Yanovski
e67a7a92fe
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
90ae22acaf
Make shadow maps the default.
2020-09-04 16:41:08 +02:00
Joshua Barretto
c1d1aca079
Made particle code more rugged
2020-09-04 11:49:49 +01:00
Joshua Barretto
788a0ab8b8
Updated changelog
2020-09-04 11:49:48 +01:00
Joshua Barretto
65858853cd
fmt
2020-09-04 11:48:57 +01:00
Joshua Barretto
0be6c98a7b
Cheaper terrain sprites
2020-09-04 11:48:57 +01:00
Joshua Barretto
91ff3e90ea
Improved lighting
2020-09-04 11:48:57 +01:00
Monty Marz
2a1b0b5866
adjustments to firefly density
2020-09-04 11:48:57 +01:00
Joshua Barretto
0324baa4b4
Moved scatter to dedicated file
2020-09-04 11:48:57 +01:00
Monty Marz
d6f2d81d5e
added fireflies to reed and flowers, readded sunflowers
2020-09-04 11:48:57 +01:00
Monty Marz
b7610981de
reed models
2020-09-04 11:48:57 +01:00
Joshua Barretto
23a55c400a
Fixed projectiles reorienting once stickied
2020-09-04 11:48:56 +01:00
Joshua Barretto
75023f4db4
Overhauled terrain sprite spawning
2020-09-04 11:48:56 +01:00
Joshua Barretto
76b4a90828
Added bee hives
2020-09-04 11:48:56 +01:00
Joshua Barretto
31ec289ebf
Added fireflies, reeds near rivers
2020-09-04 11:48:56 +01:00
Joshua Barretto
ac3ed2695c
Made light attenuation nicer, fixed campfire light offset
2020-09-04 11:48:54 +01:00
Joshua Barretto
f34491e2ba
Made boulders avoid rivers
2020-09-04 11:41:56 +01:00
Monty Marz
7f9655e2b8
Merge branch 'fix_invite_NPCs' into 'master'
...
Make npcs decline invites until we have a better recruitment system
See merge request veloren/veloren!1358
2020-09-03 23:49:32 +00:00
Monty Marz
b7adc944d4
made npcs decline invites until we have a better recruitment system
2020-09-04 00:46:32 +02:00
Marcel
995e4a9df1
Merge branch 'intel-gpu-fix' into 'master'
...
Fix a crash and model/shadow issues on Intel Gen7/7.5 GPUs.
See merge request veloren/veloren!1349
2020-09-03 09:11:19 +00:00
Marcel
7d333299f2
Merge branch 'capucho/spicy-cli' into 'master'
...
Server cli revamp
See merge request veloren/veloren!1237
2020-09-03 08:27:08 +00:00
Marcel
c489df8755
Merge branch 'patch-2' into 'master'
...
Update recompile.yml
See merge request veloren/veloren!1354
2020-09-03 07:55:54 +00:00
Capucho
b892d71c73
Added commands to basic mode
2020-09-03 09:05:15 +02:00
Capucho
f7951d352b
Fix all the problems with the tui
2020-09-03 09:04:42 +02:00
Joshua Yanovski
c7d62a5818
Update recompile.yml
2020-09-02 18:33:36 +00:00
termac
a30e4de4f3
Fix bug collecting items into full inventory
...
When the inventory is full and a player tries to reclaim an item from a
block, collecting always failed. If the item is stackable and already
present inside the inventory it should be collected though.
The collect case now behaves more like the pickup case, using
inventory's 'push' method to add the item and implicitly check for
available space.
2020-09-02 12:47:56 +02:00
Marcel
466d5cc450
Merge branch 'update-zh' into 'master'
...
update the Simplified Chinese translation
See merge request veloren/veloren!1350
2020-09-02 08:07:28 +00:00
law4x
5e624456bb
update the Simplified Chinese translation
2020-09-02 08:07:27 +00:00
Marcel Märtens
2cc7b7159e
tmp increase TIMEOUT from 20s to 40s.
...
This will not solve the StreamClose, but make it less annoying for some.
2020-09-01 23:16:11 +02:00
Marcel Märtens
ee89afa76a
clean shutdown and do a full frame all 10 ticks. also increase polling time to 100ms and dont poll while drawing but afterwards
2020-09-01 23:03:50 +02:00
Marcel Märtens
6ca4f31a9e
move tui in multiple files
2020-09-01 23:03:48 +02:00
Capucho
848dd32755
Fix lack of scrolling
2020-09-01 23:03:47 +02:00
Capucho
c80295e10a
Fix panic when window is too small
2020-09-01 23:03:45 +02:00
Capucho
6a344c6eea
Fix resize issue
2020-09-01 23:03:43 +02:00
Capucho
063146f99d
Updated the Dockerfile
2020-09-01 23:03:42 +02:00
Capucho
6fc992f027
Fix typo and clippy warnings
2020-09-01 23:03:40 +02:00
Capucho
d3a2a20d63
Added flags to toggle the tui
2020-09-01 23:03:38 +02:00
Capucho
47b25b35b1
Make it easier to add commands and added the help command
2020-09-01 23:03:36 +02:00
