Marcel Märtens
|
fea6182aa0
|
replace heavy msgbox with light native-dialog
|
2020-09-08 23:49:49 +02:00 |
|
Marcel
|
8a69b7342f
|
Merge branch 'fix' into 'master'
fix comment
See merge request veloren/veloren!1371
|
2020-09-07 15:52:18 +00:00 |
|
Marcel Märtens
|
f65fcd87db
|
fix comment
|
2020-09-07 17:45:00 +02:00 |
|
Marcel
|
ff477908f1
|
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
|
3f70baa90c
|
fixed #757
|
2020-09-07 17:20:52 +02:00 |
|
Marcel
|
4baf965117
|
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
|
3897f59848
|
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
|
1e245c665c
|
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
|
e59f67b8c0
|
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
|
0c9191f979
|
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
|
af0aecda32
|
added option for borderless fullscreen in setting -> graphics menu
|
2020-09-07 05:12:15 +00:00 |
|
Marcel
|
7ecc805618
|
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
|
e3c981c7f6
|
Implement the Player Timeout as config
|
2020-09-06 23:34:57 +02:00 |
|
Imbris
|
62a57eeb25
|
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
|
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 |
|