Commit Graph

5433 Commits

Author SHA1 Message Date
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
Joshua Barretto
70f52d876a Improved lighting 2020-09-04 11:48:57 +01:00
Monty Marz
b24f5b5b24 adjustments to firefly density 2020-09-04 11:48:57 +01:00
Joshua Barretto
57ccf4863e Moved scatter to dedicated file 2020-09-04 11:48:57 +01:00
Monty Marz
c3ae56114a added fireflies to reed and flowers, readded sunflowers 2020-09-04 11:48:57 +01:00
Monty Marz
8a25ad91df reed models 2020-09-04 11:48:57 +01:00
Joshua Barretto
afe42e0b86 Fixed projectiles reorienting once stickied 2020-09-04 11:48:56 +01:00
Joshua Barretto
be3ceaf677 Overhauled terrain sprite spawning 2020-09-04 11:48:56 +01:00
Joshua Barretto
032ec9ef41 Added bee hives 2020-09-04 11:48:56 +01:00
Joshua Barretto
88add8456f Added fireflies, reeds near rivers 2020-09-04 11:48:56 +01:00
Joshua Barretto
4405227ffb Made light attenuation nicer, fixed campfire light offset 2020-09-04 11:48:54 +01:00
Joshua Barretto
2a64a75a0f Made boulders avoid rivers 2020-09-04 11:41:56 +01:00
Monty Marz
7dab96a9cf 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
821c7e5881 made npcs decline invites until we have a better recruitment system 2020-09-04 00:46:32 +02:00
Marcel
e512578ef5 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
c9bf6492c8 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
2b98127119 Merge branch 'patch-2' into 'master'
Update recompile.yml

See merge request veloren/veloren!1354
2020-09-03 07:55:54 +00:00
Capucho
5fd0e0a5b7 Added commands to basic mode 2020-09-03 09:05:15 +02:00
Capucho
6e24ff31ee Fix all the problems with the tui 2020-09-03 09:04:42 +02:00
Joshua Yanovski
45030530b8 Update recompile.yml 2020-09-02 18:33:36 +00:00
termac
f05c120fab 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
5d1f7d7a0a 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
87c8351890 update the Simplified Chinese translation 2020-09-02 08:07:27 +00:00
Marcel Märtens
3ee7bb5a98 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
36350a08b1 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
f5c8f3fcf8 move tui in multiple files 2020-09-01 23:03:48 +02:00
Capucho
337860de93 Fix lack of scrolling 2020-09-01 23:03:47 +02:00
Capucho
8b1ba19b4f Fix panic when window is too small 2020-09-01 23:03:45 +02:00
Capucho
752b2510ee Fix resize issue 2020-09-01 23:03:43 +02:00
Capucho
aa676a4327 Updated the Dockerfile 2020-09-01 23:03:42 +02:00
Capucho
8fd052768e Fix typo and clippy warnings 2020-09-01 23:03:40 +02:00
Capucho
332cb20df1 Added flags to toggle the tui 2020-09-01 23:03:38 +02:00
Capucho
bf8e455839 Make it easier to add commands and added the help command 2020-09-01 23:03:36 +02:00
Capucho
a893ccc228 Fix the offsetting problem after using the cli 2020-09-01 23:03:35 +02:00
Capucho
6a83da0dfd Force migration text trough tracing 2020-09-01 23:03:33 +02:00
Capucho
83ff13a035 Coloring done very badly 2020-09-01 23:03:32 +02:00
Capucho
a2d70e6ff6 Escape ansi sequences 2020-09-01 23:03:31 +02:00
Capucho
c399afa7c5 Made the server cli great 2020-09-01 23:03:29 +02:00
Joshua Barretto
d8da10f1ff Merge branch 'scott-c/fix-missing-firework-particles' into 'master'
fix missing firework/bomb particle rng & adjust firework colors

Closes #713

See merge request veloren/veloren!1351
2020-09-01 14:01:13 +00:00
scott-c
69e0bf2023 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Joshua Yanovski
4eeb131f4b Create (segment, offset) just once per figure. 2020-09-01 11:23:19 +02:00
Joshua Yanovski
7e6975d881 Merge branch 'sharp/typed-body' into 'master'
Further generalize the typed module.

See merge request veloren/veloren!1346
2020-09-01 06:29:35 +00:00
Lippy13
7c33e7d714 Work around an issue with Intel Gen7/7.5 GPUs where matrices default to being row major if they are not directly assigned to a matrix that has a column major layout. 2020-08-31 19:50:45 +01:00
Lippy13
7efa3373f6 Fix crash on Intel Gen7 GPUs caused by having two return statements in the same branch of code. 2020-08-31 19:49:01 +01:00