Benoît du Garreau
|
d090eefb00
|
Move the asset module to a single file
|
2020-12-17 12:06:13 +01:00 |
|
Benoît du Garreau
|
0cf164f33a
|
Use assets_manager to load assets
|
2020-12-17 12:06:07 +01:00 |
|
Marcel
|
6ecff460bf
|
Merge branch 'james/hashbrown' into 'master'
Switch from std to hashbrown
See merge request veloren/veloren!1621
|
2020-12-17 10:55:13 +00:00 |
|
jiminycrick
|
60d5d62eef
|
Switched to hashbrown everywhere
|
2020-12-17 10:31:35 +01:00 |
|
Marcel
|
52c37e1de0
|
Merge branch 'yusdacra/update-cargonix' into 'master'
nix chore: regenerate Cargo.nix
See merge request veloren/veloren!1629
|
2020-12-17 07:57:37 +00:00 |
|
Marcel
|
f12c0de6fc
|
Merge branch 'xMAC94x/dependencies' into 'master'
update specs
See merge request veloren/veloren!1645
|
2020-12-16 14:20:04 +00:00 |
|
Marcel Märtens
|
ea84cb138f
|
fix wrong alignment
|
2020-12-16 15:17:17 +01:00 |
|
Marcel Märtens
|
e8003a44dd
|
update specs
|
2020-12-16 14:31:16 +01:00 |
|
Marcel
|
4196f0adfd
|
Merge branch 'xMAC94x/dependencies' into 'master'
xMAC94x/dependencies
See merge request veloren/veloren!1643
|
2020-12-16 12:35:20 +00:00 |
|
Marcel Märtens
|
a1b50a86c4
|
update guillotiere
|
2020-12-16 10:56:00 +01:00 |
|
Marcel Märtens
|
e3307344ab
|
get rid of some insecure dependencies
|
2020-12-16 10:42:36 +01:00 |
|
Marcel
|
24a840bc6b
|
Merge branch 'xMAC94x/dependencies' into 'master'
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
See merge request veloren/veloren!1641
|
2020-12-16 09:33:34 +00:00 |
|
Justin Shipsey
|
a365ca7e9d
|
Merge branch 'slipped/animtweaks' into 'master'
accel based run
See merge request veloren/veloren!1628
|
2020-12-16 08:07:38 +00:00 |
|
Justin Shipsey
|
e7249210f6
|
accel based run
|
2020-12-16 08:07:38 +00:00 |
|
Marcel Märtens
|
107fd432f5
|
update further crates
|
2020-12-16 08:56:21 +01:00 |
|
Marcel Märtens
|
26918d10c9
|
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
|
2020-12-16 00:51:07 +01:00 |
|
Joshua Barretto
|
198b1970a7
|
Merge branch 'ccgauche/fix-memory-overwrite' into 'master'
ccgauche/fix memory overwrite
See merge request veloren/veloren!1631
|
2020-12-15 17:09:17 +00:00 |
|
ccgauche
|
2b9dee0727
|
Updated buffer
|
2020-12-15 16:04:55 +01:00 |
|
ccgauche
|
cff08ac8ae
|
Delete lib.rs
|
2020-12-15 16:04:14 +01:00 |
|
Marcel
|
754b149316
|
Merge branch 'HiggsTardigradeTau/fix-slow-motion-effect-after-lag' into 'master'
Fixed slow motion effect after lag
See merge request veloren/veloren!1634
|
2020-12-15 14:31:05 +00:00 |
|
Marcel
|
5600d93844
|
Merge branch 'james/healbomb-sfx-fix' into 'master'
Healing bomb sfx fix
See merge request veloren/veloren!1637
|
2020-12-15 13:15:32 +00:00 |
|
Joshua Barretto
|
242ee1d2de
|
Merge branch 'plugins' into 'master'
Hide plugins behind a feature flag to resolve Windows CI issue
See merge request veloren/veloren!1639
|
2020-12-15 12:51:56 +00:00 |
|
Joshua Barretto
|
494436be01
|
Hid plugins behind a feature flag to resolve Windows CI issue
|
2020-12-15 11:14:26 +00:00 |
|
ccgauche
|
56121cea6a
|
Added memory caching and reallocation prevention
|
2020-12-15 09:29:57 +01:00 |
|
jiminycrick
|
ce03fcfda3
|
Healing bomb sfx fix
|
2020-12-14 21:36:51 -08:00 |
|
Monty Marz
|
2bda6c6d3c
|
Merge branch 'hotifx' into 'master'
Hotfix NPC inviting
See merge request veloren/veloren!1635
|
2020-12-15 02:14:37 +00:00 |
|
Monty
|
cd1c1ffe9c
|
hotfix NPC inviting
|
2020-12-15 01:43:44 +01:00 |
|
Owen McCormick
|
ea28f93dc0
|
Fixed slow motion effect after lag
|
2020-12-14 16:05:42 -08:00 |
|
Monty Marz
|
2d8e9124f3
|
Merge branch 'pfau/group-map-indicators' into 'master'
Group map indicators
Closes #885
See merge request veloren/veloren!1633
|
2020-12-14 23:00:58 +00:00 |
|
Monty
|
8b9db7b179
|
cleanup, changelog, small bugfixes
fmt
fix rebase
fmt
|
2020-12-14 21:52:24 +01:00 |
|
ccgauche
|
7f20c78ce6
|
Updated to zesterer suggestion
|
2020-12-14 21:48:37 +01:00 |
|
Monty Marz
|
b5a2104ca5
|
group member indicator visuals
functional group member indicators
adjust visuals
z-comparison
|
2020-12-14 21:16:13 +01:00 |
|
Joshua Barretto
|
985156fca4
|
Merge branch 'zesterer/gfx' into 'master'
Made LoD water reflective
See merge request veloren/veloren!1632
|
2020-12-14 18:49:59 +00:00 |
|
Snowram
|
834670a641
|
Merge branch 'snowram/objects-offsets-ron' into 'master'
Put objects offsets into a .ron file
See merge request veloren/veloren!1627
|
2020-12-14 18:00:07 +00:00 |
|
ccgauche
|
ea1efd1ce1
|
Runned FMT
|
2020-12-14 18:46:04 +01:00 |
|
ccgauche
|
69dba49884
|
Fixed clippy warnings
|
2020-12-14 18:31:01 +01:00 |
|
ccgauche
|
248e8f7706
|
added safety section
|
2020-12-14 18:22:03 +01:00 |
|
Joshua Barretto
|
49cabfae18
|
Made LoD water reflective
|
2020-12-14 16:52:33 +00:00 |
|
ccgauche
|
438a0dce88
|
added unsafe on function
|
2020-12-14 17:43:32 +01:00 |
|
ccgauche
|
d7aa26371c
|
Fixed memory issue now using alloc
|
2020-12-14 17:07:05 +01:00 |
|
Yusuf Bera Ertan
|
4a11356f50
|
nix chore: regenerate Cargo.nix
|
2020-12-14 18:13:01 +03:00 |
|
Snowram
|
96ed008348
|
Puts objects offsets into a .ron file
|
2020-12-14 02:43:49 +01:00 |
|
Joshua Barretto
|
9f2e01617e
|
Merge branch 'plugins' into 'master'
Plugins and codebase refactor
See merge request veloren/veloren!1625
|
2020-12-14 00:53:09 +00:00 |
|
Samuel Keiffer
|
c3732a8a8c
|
Merge branch 'nahua/replace_sceptre_m2_sound' into 'master'
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2
See merge request veloren/veloren!1618
|
2020-12-13 23:18:30 +00:00 |
|
Joshua Barretto
|
fc96fd780b
|
Moved plugin API to Uid instead of usize for entity IDs, hello plugin to an example
|
2020-12-13 23:08:15 +00:00 |
|
Marcel
|
74c095b778
|
Merge branch 'yusdacra/fix-nix-veloren-version-string' into 'master'
More Nix fixes, better Nix README among other UX
See merge request veloren/veloren!1614
|
2020-12-13 22:13:46 +00:00 |
|
nahuakang
|
f3ed13ca09
|
Replace explosion sound with heal bomb sound for sceptre M2
|
2020-12-13 22:09:28 +01:00 |
|
Joshua Barretto
|
023888f560
|
Updated changelog, fmt and clippy fixes
|
2020-12-13 17:40:15 +00:00 |
|
Joshua Barretto
|
9284aed8bd
|
Temporarily reverted toolchain for CI
|
2020-12-13 17:27:48 +00:00 |
|
Joshua Barretto
|
f8c8e342e6
|
Moved common networking code to common/net, clippy fixes
|
2020-12-13 17:23:45 +00:00 |
|