Joshua Yanovski
eaea83fe6a
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-05-21 22:47:07 +02:00
Joshua Yanovski
2f89b863e0
Merge branch 'treeco/new-map' into 'master'
...
Changed default map and seed, lowered site counts
See merge request veloren/veloren!992
2020-05-21 20:46:54 +00:00
Joshua Yanovski
f8376fd5dc
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-05-21 17:53:57 +02:00
Monty Marz
9d7e0aad12
Aeronic/forest tune
2020-05-21 04:09:59 +00:00
Joshua Yanovski
654f7e0492
Correct backface culling.
2020-05-20 21:22:30 +02:00
Joshua Yanovski
560501df05
Greedy messhing for shadows.
2020-05-19 17:22:06 +02:00
Joshua Barretto
f1b166d15d
Innumerable camera improvements
2020-05-18 23:40:28 +01:00
Joshua Barretto
68e77f43f8
Made figure placement correct with warping
2020-05-18 15:15:58 +01:00
Justin Shipsey
9e5c0ce601
Merge branch 'silentium/arms-and-armor' into 'master'
...
Added 2 sets of armour.
See merge request veloren/veloren!951
2020-05-17 19:03:00 +00:00
Silentium
1673a25e8b
Added 2 sets of armour.
2020-05-17 19:02:59 +00:00
Joshua Yanovski
a4d87e1875
Shadow maps work for lantern.
2020-05-17 05:59:00 +02:00
Monty Marz
ecb7963730
Pfau/0.6 bg
2020-05-16 12:48:29 +00:00
Marcel Märtens
39de4bd4fd
swap main background for 0.6 background
2020-05-16 01:07:07 +02:00
Joshua Barretto
aac28d04d5
Added dungeon bosses, boss loot, boss arenas
2020-05-15 16:05:50 +01:00
Joshua Yanovski
243d0837b8
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-05-15 14:53:13 +02:00
Joshua Yanovski
04382dc286
WIP: better graphics config, better LOD, shadow maps.
2020-05-15 14:22:17 +02:00
Treeco
61bcfbeeb2
Changed default map and seed, lowered site counts
2020-05-15 11:36:19 +01:00
CapsizeGlimmer
0a723614f9
Popup message when setting waypoint
2020-05-14 16:56:10 +00:00
Shane Handley
e852e0cfab
- Update the stats of characters individually, reverting the change with
...
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
2020-05-13 09:14:09 +10:00
jshipsey
ef70949d5d
cyclops
2020-05-11 21:44:21 -04:00
Treeco
2797af0c87
Removed old-style dungeons
...
I believe this means that trees are the only thing still using the
old-style structure spawning. Maybe it can be simplified a lot more?
2020-05-11 18:37:16 +01:00
Justin Shipsey
78f3f2cc32
Merge branch 'snowram/dragon-animation' into 'master'
...
dragon
See merge request veloren/veloren!969
2020-05-10 18:39:29 +00:00
CapsizeGlimmer
8d3463e2f1
Update english welcome message
2020-05-09 22:54:15 -04:00
jshipsey
62bd79dba7
dragon and general animation cleanup
2020-05-09 18:10:24 -04:00
Snowram
5b77c74497
Add cockatrice
2020-05-09 18:09:27 -04:00
Snowram
0248c6a44e
Cleanup
2020-05-09 18:09:27 -04:00
jshipsey
a6de8159f6
dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes
2020-05-09 18:09:06 -04:00
Snowram
9d2277ecd4
Better animations
2020-05-09 18:09:06 -04:00
jshipsey
e5a7086502
asset and manifest tweaks
2020-05-09 18:09:06 -04:00
Snowram
cd452cc715
New dragon model, added jaw, splitted head into upper/lower
2020-05-09 18:09:05 -04:00
Snowram
9027967fb7
Initial run animation work
2020-05-09 18:08:35 -04:00
Snowram
33f8a47cfa
Symmetry of dragon skeleton
2020-05-09 18:08:35 -04:00
Robin Gilh
edcde84505
Dragon work 2
2020-05-09 18:07:31 -04:00
Robin Gilh
40360ff149
Dragon work
2020-05-09 18:07:31 -04:00
S Handley
5a13b54cbf
- Load characters after login.
...
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
Monty Marz
b589c3fc71
Fix animals not attacking
2020-05-04 16:59:32 +00:00
Monty Marz
89980284aa
Merge branch 'CapsizeGlimmer/functional_lanterns' into 'master'
...
Equipped lanterns now provide an illumination effect.
See merge request veloren/veloren!935
2020-05-04 15:15:31 +00:00
CapsizeGlimmer
4e7f8c686a
Equipped lanterns now provide an illumination effect.
2020-05-04 15:15:31 +00:00
Julian
cf9820e204
Added new SFX and adjusted sfx.ron
...
New SFX sounds.
add_item.wav (Better fitting pickup sound)
drop_item.wav (New sound for dropping items)
open_inventory.wav (The old pickup sound, can be used for opening the bag but needs to be implemented)
sword_in.wav (Better fitting sound)
sowrd_out.wav (Better fitting sound)
Fixed the drop sfx sound in sfx.ron
Its the drop_item sound instead of a grass moving step.
2020-05-03 21:52:11 +02:00
Joshua Yanovski
22ddbad3eb
Minor shader fixes.
2020-05-02 18:54:09 +02:00
Joshua Yanovski
746a10e8d0
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-05-02 04:02:09 +02:00
Monty Marz
f5c2341167
Shoulder offsets, meta.ron versioning
2020-05-01 21:27:12 +00:00
Joshua Yanovski
0f4a0e763d
Switch back to pop-in terrain.
2020-05-01 23:03:24 +02:00
Joshua Yanovski
dd74fa7e4a
LOD shading closer to voxel shading.
2020-05-01 22:58:55 +02:00
Monty Marz
c792cc05a9
Villagers and Cultists
2020-04-30 20:43:24 +00:00
Pfauenauge90
1211a59f91
cleanup, more dungeon entrances
2020-04-29 17:01:35 +02:00
Joshua Barretto
d0b1c9eb6f
Added dungeon entrances
2020-04-29 17:01:34 +02:00
Joshua Barretto
1e91f7a0ab
Added 1 extra bit per figure vertex position component, resolved char screen bug
2020-04-29 15:22:08 +01:00
Marcel Märtens
83af40a460
Allow for 0.5 offsets in figures
2020-04-29 14:10:46 +02:00
Joshua Yanovski
ef67bd58ba
Experimental underwater lighting.
2020-04-28 20:49:03 +02:00
