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
13,705 Commits 151 Branches 18 Tags 2.1 GiB
458acce5ac
Commit Graph

13705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isse
458acce5ac set vel to zero when sprite mounted 2023-05-09 19:43:09 +02:00
Isse
6ddfd631d6 don't sit through walls 2023-05-09 19:43:09 +02:00
Isse
7eba16a2d7 use mount key 2023-05-09 19:43:08 +02:00
Isse
2928eb8d15 sit on sprites 2023-05-09 19:43:08 +02:00
Joshua Barretto
1cc221f653 Merge branch 'zesterer/rtsim-tweaks' into 'master' 
Started adding wandering rtsim monsters

See merge request veloren/veloren!3908
 2023-05-09 14:51:15 +00:00
Marcel
9ac654baa9 Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3920
 2023-05-09 13:22:43 +00:00
Marcel
f7519974b6 Merge branch 'xMAC94x/update_toolchain' into 'master' 
update rust toolchain to 2023-04-20

See merge request veloren/veloren!3916
 2023-05-09 13:18:08 +00:00
Marcel Märtens
c164c7979a update cache docker image 2023-05-09 11:57:23 +02:00
Marcel
8e1f40895b Merge branch 'vasco-quest' into 'master' 
Italian translation for quest and sword abilities

See merge request veloren/veloren!3822
 2023-05-08 18:33:35 +00:00
Francesco Vasco
232d4c932e Italian translation 2023-05-08 19:29:24 +02:00
Marcel Märtens
9dc550daea fix windows compilation 2023-05-08 18:58:54 +02:00
Marcel Märtens
377787e3c8 avoid: 
```
PHI nodes not grouped at top of basic block!
  %246 = phi <4 x float> [ <float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00>, %114 ], [ %241, <badref> ], !dbg !961029
label %243
in function _ZN14veloren_common4comp9inventory4item7modular11ModularBase4kind17h0950571ff74739d8E
LLVM ERROR: Broken function found, compilation aborted!
```
 2023-05-08 18:58:54 +02:00
Marcel Märtens
95bca5418a update toolchain to nightly-2023-04-20 2023-05-08 18:58:54 +02:00
tygyh
7f17520163 Update swedish translations 2023-05-08 17:58:45 +02:00
Samuel Keiffer
07bb4f72aa Merge branch 'sam/multiple-contexts' into 'master' 
Abilities can have multiple contexts, added sword abilities which use dual sword context

See merge request veloren/veloren!3898
 2023-05-08 02:36:13 +00:00
Sam
d5fc65ce83 Fix ci test 2023-05-07 21:50:59 -04:00
Sam
faff715c4f Simultaneous melee hits now show separately in SCT 2023-05-07 20:43:52 -04:00
Sam
a38f336c9e Added dual wielding sword contextual abilities. 2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87 Dual wielding weapons of the same kind added as a context 2023-05-07 20:43:51 -04:00
Sam
9cedf854de Abilities can now be activated from multiple contexts 2023-05-07 20:43:50 -04:00
Imbris
95a38ff8f6 Merge branch 'imbris/revert-some' into 'master' 
Revert some of the updates to make windows cross compile directx work

See merge request veloren/veloren!3918
 2023-05-06 05:12:20 +00:00
Imbris
af0d0f3ea4 Second attempt (success) 2023-05-06 00:30:54 -04:00
Imbris
1a7e38e48b First attempt (no success) 2023-05-06 00:30:41 -04:00
Samuel Keiffer
69089e378a Merge branch 'Corvella/more_decheeseification' into 'master' 
Cheesing fixes mainly focused on bosses

See merge request veloren/veloren!3897
 2023-05-06 01:57:41 +00:00
Corvella
6367a51fa3 Cheesing fixes mainly focused on bosses 2023-05-06 01:57:41 +00:00
Marcel
66976c2ee9 Merge branch 'xMAC94x/more_useful_audit' into 'master' 
better cargo audit

See merge request veloren/veloren!3915
 2023-05-05 16:48:44 +00:00
Marcel Märtens
6a8f10bf41 fix master fmt 2023-05-05 18:26:14 +02:00
Marcel Märtens
cd7d889c13 get rid of oldtime in chrono 2023-05-05 18:25:49 +02:00
Marcel Märtens
d995491f44 we are ignoreing those errors anyway, i think chrono is not using that functionality of time any more and the other 2 dependencies are very hard to get ever rid of in our codebase :/ 2023-05-05 18:25:49 +02:00
Marcel
59f12ef110 Merge branch 'clap-fix' into 'master' 
Yse correct clap macro

See merge request veloren/veloren!3917
 2023-05-05 13:10:37 +00:00
Isse
eed613a50f change other value parsers 2023-05-05 15:05:57 +02:00
Isse
a74ec7a1ad use correct macro 2023-05-05 14:49:14 +02:00
Marcel
7a5be42926 Merge branch 'master-patch-2e28' into 'master' 
Update ukrainian translation

See merge request veloren/veloren!3904
 2023-05-05 09:51:34 +00:00
Vitalya
b3a1d7af6c Update ukrainian translation 2023-05-05 09:51:34 +00:00
Marcel
223ae7ee98 Merge branch 'xMAC94x/update_deps' into 'master' 
update further dependencies

See merge request veloren/veloren!3913
 2023-05-05 08:42:43 +00:00
Marcel Märtens
d90ea8c1da get rid of structop and update clippy in common test, now only criterion is left with version 2 2023-05-05 09:46:46 +02:00
Joshua Barretto
b6d8182382 Merge branch 'zesterer/item-merging' into 'master' 
Zesterer/item merging

See merge request veloren/veloren!3912
 2023-05-05 00:03:22 +00:00
Joshua Barretto
73c84dfcc2 Clippy 2023-05-05 00:04:13 +01:00
Joshua Barretto
8d9625d6ee Addressed comments 2023-05-04 23:18:40 +01:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Joshua Barretto
693684d1c9 Updated changelog 2023-05-04 22:13:14 +01:00
Joshua Barretto
ee971e4056 Added item merging 2023-05-04 22:12:25 +01:00
Marcel
32d8d25124 Merge branch 'xMAC94x/updateSQL' into 'master' 
Update SQLlite

See merge request veloren/veloren!3862
 2023-05-04 20:55:15 +00:00
Joshua Barretto
79dd1e2629 Fixed ambient lighting 2023-05-04 19:57:28 +01:00
Joshua Barretto
6fe102b86d Fixed cyclops loot table 2023-05-04 19:57:18 +01:00
Marcel Märtens
27620e665b we need a new version of refinery that needs a new version of rusqlite, so update both 2023-05-04 20:53:00 +02:00
Marcel
ce4beff7fe Merge branch 'xMAC94x/update_deps' into 'master' 
update veloren deps

See merge request veloren/veloren!3911
 2023-05-04 18:28:59 +00:00
Imbris
60dbcf86f9 Merge branch 'imbris/server-start-faster' into 'master' 
Improve server startup times, in particular, finding paths between sites.

See merge request veloren/veloren!3888
 2023-05-04 18:06:38 +00:00
Joshua Barretto
f000347cac Make NPCs respond to each other 2023-05-04 11:53:01 +01:00
Joshua Barretto
a5b1e41d8b Make NPC interaction go via rtsim 2023-05-04 11:23:46 +01:00