cd452cc715
New dragon model, added jaw, splitted head into upper/lower
2020-05-09 18:09:05 -04:00
875838ecdf
Initial fly animation work
2020-05-09 18:08:35 -04:00
9027967fb7
Initial run animation work
2020-05-09 18:08:35 -04:00
7f0d1e9543
Initial idle animation work
2020-05-09 18:08:35 -04:00
33f8a47cfa
Symmetry of dragon skeleton
2020-05-09 18:08:35 -04:00
edcde84505
Dragon work 2
2020-05-09 18:07:31 -04:00
40360ff149
Dragon work
2020-05-09 18:07:31 -04:00
59c97731ad
Merge branch 'shandley/persistence-characters' into 'master'
...
Character Persistence
See merge request veloren/veloren!916
2020-05-09 15:41:25 +00:00
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
6cebf52a1c
Merge branch 'get_items_num' into 'master'
...
Add optional argument to /get_items
Closes #535
See merge request veloren/veloren!921
2020-05-07 18:39:49 +00:00
63826d1a50
Add optional argument to /get_items
2020-05-07 18:39:48 +00:00
846c3a9a0b
Merge branch 'CapsizeGlimmer/fix_lanterns' into 'master'
...
Fix infinitys and NaNs in lights
See merge request veloren/veloren!966
2020-05-04 22:14:33 +00:00
28c454f9ca
Fix infinitys and NaNs in lights
2020-05-04 17:17:54 -04:00
e5a87f4338
Merge branch 'CapsizeGlimmer/enter_world_with_enter' into 'master'
...
Enter the world by pressing "enter" at character selection
Closes #530
See merge request veloren/veloren!922
2020-05-04 18:51:31 +00:00
701f38ab69
Enter the world by pressing "enter" at character selection
2020-05-04 19:08:51 +02:00
522e3493c5
Merge branch 'pfau/fix-animals' into 'master'
...
Fix animals not attacking
See merge request veloren/veloren!960
2020-05-04 16:59:33 +00:00
b589c3fc71
Fix animals not attacking
2020-05-04 16:59:32 +00:00
9378902d81
Merge branch 'songtronix/add-version-cmd' into 'master'
...
add server version cmd
See merge request veloren/veloren!964
2020-05-04 16:47:07 +00:00
1d88ec6295
server(cmd): add server version cmd
2020-05-04 17:59:53 +02:00
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
4e7f8c686a
Equipped lanterns now provide an illumination effect.
2020-05-04 15:15:31 +00:00
a22a71fd32
Merge branch 'admin-command-limit' into 'master'
...
Fix #542 - Impose limits on admin commands
Closes #542
See merge request veloren/veloren!963
2020-05-04 11:34:25 +00:00
31c0457913
Fix #542 - Impose limits on admin commands
2020-05-04 14:50:58 +05:00
c3c907f36d
Merge branch 'SFX-Update' into 'master'
...
Added new SFX and adjusted sfx.ron
See merge request veloren/veloren!961
2020-05-04 06:16:12 +00:00
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
40ab94673e
Merge branch 'cultists-hotfix' into 'master'
...
Shoulder offsets, meta.ron versioning
See merge request veloren/veloren!959
2020-05-01 21:27:12 +00:00
f5c2341167
Shoulder offsets, meta.ron versioning
2020-05-01 21:27:12 +00:00
250e4b3043
Merge branch 'pfau/assets' into 'master'
...
Villagers and Cultists
See merge request veloren/veloren!957
2020-04-30 20:43:24 +00:00
c792cc05a9
Villagers and Cultists
2020-04-30 20:43:24 +00:00
dc95efa95b
Merge branch 'zesterer/world-changes' into 'master'
...
Dungeon entrances
See merge request veloren/veloren!955
2020-04-29 15:36:57 +00:00
1211a59f91
cleanup, more dungeon entrances
2020-04-29 17:01:35 +02:00
2eac00405d
Updated changelog
2020-04-29 17:01:35 +02:00
44fc88b4d1
Better dungeon waypoint placement
2020-04-29 17:01:35 +02:00
3e86b20c2c
Fixed dungeon offsets
2020-04-29 17:01:34 +02:00
d0b1c9eb6f
Added dungeon entrances
2020-04-29 17:01:34 +02:00
00f0a011de
Merge branch 'non-integer-offsets' into 'master'
...
Non integer offsets
See merge request veloren/veloren!956
2020-04-29 14:45:21 +00:00
1e91f7a0ab
Added 1 extra bit per figure vertex position component, resolved char screen bug
2020-04-29 15:22:08 +01:00
83af40a460
Allow for 0.5 offsets in figures
2020-04-29 14:10:46 +02:00
19ce03d9ed
Merge branch 'snowram/animals' into 'master'
...
new animals
See merge request veloren/veloren!954
2020-04-28 03:13:23 +00:00
171e865f57
new animals
2020-04-28 03:13:23 +00:00
303967a6f7
Merge branch 'slipped/attributes' into 'master'
...
skel attribute transfer
See merge request veloren/veloren!949
2020-04-27 05:11:34 +00:00
b4af588a00
skel attribute transfer
2020-04-27 05:11:34 +00:00
dcc20590bf
Merge branch 'zesterer/phys-fixes' into 'master'
...
Added Colliders, made projectiles point particles
See merge request veloren/veloren!947
2020-04-26 18:24:33 +00:00
390e46b752
Fixed unit tests
2020-04-26 18:50:21 +01:00
bd58be9f58
fmt
2020-04-26 17:56:09 +01:00
bd2093c819
Fixed projectile solid collisions
2020-04-26 17:56:09 +01:00
58b30c4518
Stopped velocity when point particles hit walls
2020-04-26 17:56:09 +01:00
b750b2b00c
Fixed logic issue with sticky objects
2020-04-26 17:56:09 +01:00
8e0f40c71e
Added on_ceiling check for sticky entities
2020-04-26 17:56:09 +01:00
eb23b0b2bd
Added Colliders, made projectiles point particles
2020-04-26 17:56:09 +01:00