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
10,206 Commits 151 Branches 18 Tags 2.1 GiB
a5e64af199
Commit Graph

1935 Commits

Author SHA1 Message Date
Samuel Keiffer
2ee11de6c7 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Marcel
544fa423ba Merge branch 'juliancoffee/fix_testserver' into 'master' 
Make test-server compile again

See merge request veloren/veloren!2974
 2021-10-30 09:27:27 +00:00
Sam
83d8ea869b Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Sam
d1408395a4 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
48522a14c1 Fixed falloff calculations 2021-10-29 17:37:05 -04:00
Sam
3bfff6cf18 Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
juliancoffee
874a579818 Make test-server compile again 2021-10-29 23:49:37 +03:00
Monty Marz
d089a5d239 text and alignment WIP 2021-10-27 17:02:35 -04:00
Sam
67b19f5474 Salvaging now requires a salvaging station. 2021-10-27 17:02:33 -04:00
Sam
b924ae9f54 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
404ff2918e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
db0c636e16 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Kemper
2a1f0f2674 Aim fireballs at feet 
AI aims fireballs at the target’s feet, for a slight improvement
in splash damage.
 2021-10-27 19:50:50 +00:00
Kemper
c0f9b19928 Add a range limit to trading 
Prevents initiating trades with client-side ghosts.
 2021-10-25 00:47:45 +00:00
Q-I-U
1b305dd617 Prevent lantern from turning off on death 2021-10-24 20:45:57 +02:00
ubruntu
a41fc4cba7 Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Doctor Kompot
e916e32547 DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Bryant Deters
3f48604db5 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
7adbc2f7b5 Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
socksonme
c8576d35d4 Renamed emit_alarm to emit_scream 2021-10-16 19:11:57 +03:00
Joshua Barretto
2da9f7994f Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
socksonme
ea11cb388e small code quality change 2021-10-15 23:23:45 +03:00
socksonme
092720346e Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Joshua Barretto
99a83aba2b Merge branch 'make-merchants-send-trade-on-iteraction' into 'master' 
Make merchants send the player a trade request when interacted with

Closes #1368

See merge request veloren/veloren!2914
 2021-10-11 16:45:18 +00:00
juliancoffee
a4f882a8d6 Fix Traveller names 
- Previously RtSim were created with automatic name for body generated
  from EntityConfig, not from RtSim body. Now RtSim body is set for
  EntityConfig.
 2021-10-11 15:06:43 +03:00
Joshua Barretto
2ba40b53bb Added ability to toggle world features 2021-10-10 13:41:57 +01:00
antoniomuso
ab92c4d52f Make merchants send the player a trade request when interacted with 2021-10-09 21:14:01 +02:00
Joshua Barretto
af18c2590d Merge branch 'ubruntu/group-loot-notifications' into 'master' 
Groups can see what each member picks up

See merge request veloren/veloren!2906
 2021-10-09 10:50:02 +00:00
ubruntu
ba9923c049 Groups can see what each member picks up 2021-10-09 10:50:01 +00:00
Imbris
5394ab16bb Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain. 2021-10-08 16:17:31 -04:00
Imbris
8575661d28 Ensure cancelled chunks are not loaded into the terrain 2021-10-08 13:20:50 -04:00
Joshua Barretto
afc0fa0ffd Prevented double-spawning of chunks 2021-10-08 12:20:46 +01:00
Joshua Barretto
fa767246f3 Added minimum server-side chunk loading 2021-10-07 14:23:55 +01:00
Treeco
6409bd1abb Fix large map loading 2021-10-06 02:26:58 +01:00
Imbris
7898af73c2 Revert "Merge branch 'ubruntu/par-entity-sync' into 'master'" 
This reverts merge request !2891
 2021-10-05 14:42:39 +00:00
Bryant Deters
b2d384b436 using par_join.for_each as if I know what I'm doing 2021-10-01 18:05:52 -05:00
Imbris
2cc2db3186 Merge branch 'ubruntu/trade-fix-part3' into 'master' 
Trade fix (with hashmap awareness)

See merge request veloren/veloren!2877
 2021-10-01 21:17:19 +00:00
ubruntu
241fbc47dd Trade fix (with hashmap awareness) 2021-10-01 21:17:19 +00:00
juliancoffee
e5d6fd2887 Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7df22ceaec Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
juliancoffee
3c0211bf0b Adress review 
- Added comments on why Waypoint branch of NpcData is unreachable.
- Added comments on signature of get_adhoc_loadout.
 2021-09-27 15:09:22 +03:00
juliancoffee
98382ea012 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
9a57b218ed Rtsim now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
99e19dc5d0 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
38c004d494 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
Sam
06f3e04034 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Marcel
64a8e3c5df Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2021-09-24`

See merge request veloren/veloren!2862
 2021-09-26 19:25:02 +00:00
Samuel Keiffer
d7a89bf944 Merge branch 'sam/cr-weights' into 'master' 
Changed weights of cr calculation and exp from cr formula.

See merge request veloren/veloren!2875
 2021-09-26 18:21:56 +00:00
Sam
f74bb6d70a Condense assignment of variables 2021-09-26 13:51:27 -04:00
Imbris
ec5204af37 Add note on a clippy suppression pointing to relevant clippy issue 2021-09-26 11:24:30 -04:00