Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,806 Commits 151 Branches 18 Tags
Commit Graph

2501 Commits

Author SHA1 Message Date
jshipsey
d47dc7c49e remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Dominik Broński
7589f40eb7 Merge branch 'lboklin/arrow-turret-drag-fix' into 'master' 
Fix ArrowTurret drag coefficient

See merge request veloren/veloren!2175
 2021-04-21 20:17:44 +00:00
Imbris
101e6cdce6 Quick physics perf fix 2021-04-21 14:03:23 -04:00
Imbris
fcfb1f325a Revert "Merge branch 'revert-b10718c5' into 'master'" 
This reverts merge request !2172
 2021-04-21 17:10:13 +00:00
Joshua Barretto
580e99b968 Merge branch 'zesterer/lanterns' into 'master' 
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
 2021-04-21 16:40:20 +00:00
Ludvig Böklin
7d73fdc2c5 Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
Imbris
9818c7131f Merge branch 'revert-b10718c5' into 'master' 
Revert "Merge branch 'imbris/agent-opt' into 'master'"

See merge request veloren/veloren!2172
 2021-04-21 15:06:35 +00:00
Imbris
1e3fad1690 Merge branch 'lboklin/simplify-buoyancy' into 'master' 
Simplify buoyancy for performance reasons

See merge request veloren/veloren!2171
 2021-04-21 15:06:31 +00:00
Joshua Barretto
9e87da7a18 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Ludvig Böklin
bbcb73c4f6 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
Ludvig Böklin
3c82a28d80 Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
Imbris
b90b62fcc1 Revert "Merge branch 'imbris/agent-opt' into 'master'" 
This reverts merge request !2024
 2021-04-21 14:10:06 +00:00
Imbris
42be75ecc0 Appease clippy, add CHANGELOG entry 2021-04-20 15:29:20 -04:00
Imbris
91f092bdaf Remove extra chunk cloning and parallelize serialization in the server terrain sys 2021-04-20 15:25:05 -04:00
Imbris
c52e8c8a64 Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle 2021-04-20 15:25:04 -04:00
Imbris
01196adc8c Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode 2021-04-20 15:25:04 -04:00
Imbris
1ab842523d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -04:00
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
2496c05d11 Merge branch 'better-crafting' into 'master' 
Crafting station sprites in towns

See merge request veloren/veloren!2160
 2021-04-20 15:08:36 +00:00
Joshua Barretto
bacabacaaa Made cooking pots glow 2021-04-20 15:39:46 +01:00
Joshua Barretto
056fa96a58 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
342ec773d5 Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
e87ee6d8c7 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
a0357fdd58 change cauldron spawning 
cooking pot height
fmt
fmt, changelog
 2021-04-20 02:48:13 +02:00
Monty
c40bd37452 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Monty
afea896b5b fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
b605048ae3 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel Märtens
c221209743 only have 1 Fn passed to tick fn 2021-04-20 01:49:45 +02:00
Marcel Märtens
e742020f42 include origin into system name 2021-04-20 01:30:27 +02:00
Marcel Märtens
302769d086 remove authc from common::net 2021-04-20 01:30:23 +02:00
Marcel Märtens
05d0eb9db4 seperate sys/state 2021-04-20 01:30:17 +02:00
Joshua Barretto
8f23d476e8 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
1bfe9f65d6 Fixed block-snapping 2021-04-19 21:46:51 +01:00
Joshua Barretto
c8a5e3ac51 Merge branch 'zesterer/econ-tweaks' into 'master' 
Limit trading currency to sane amounts

See merge request veloren/veloren!2154
 2021-04-19 10:46:17 +00:00
Joshua Barretto
94e40abab2 Limit trading currency to sane amounts 2021-04-19 10:04:28 +01:00
Sam
b0d9a3b4ba Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
2c8f900299 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00:00
Samuel Keiffer
9d145fccb5 Merge branch 'aweinstock/dodgesplosion' into 'master' 
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
 2021-04-18 20:46:15 +00:00
Avi Weinstock
b16d97b39c Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
40ca69148c Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
f5f57f89a8 Trading stock limits 2021-04-18 18:58:26 +01:00
Samuel Keiffer
a0ed6cf978 Merge branch 'sam/permanent-spawn-safezone' into 'master' 
Safezone is now permanently in existence at spawn.

See merge request veloren/veloren!2144
 2021-04-17 23:44:10 +00:00
Sam
5cf40812d9 Safezone is now permanently in existence at spawn. 2021-04-17 17:33:54 -04:00
Ben Wallis
9525c4d64e Changed plugin load errors to debug and reworded plugin init/load error messages 2021-04-17 22:04:14 +01:00
Ben Wallis
07e6f8fbd9 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Avi Weinstock
29146fddbc Added /server_physics admin command. 2021-04-17 13:44:22 -04:00
Samuel Keiffer
a62598c62c Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a Merge branch 'aweinstock/server-authoritative-physics' into 'master' 
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
 2021-04-15 22:24:00 +00:00
gGmMsS123
191d60266a m2 staff 2021-04-16 00:48:20 +03:00
gGmMsS123
90a47a20ea M2 Staff Final Touch 2021-04-16 00:34:24 +03:00