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
6,319 Commits 151 Branches 18 Tags 2.1 GiB
f438eaa9f3
Commit Graph

2685 Commits

Author SHA1 Message Date
Vincent Foulon
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
4d7b985be1 clean even more code 2020-12-31 12:32:19 +01:00
Vincent Foulon
a0a51110a5 clear i18n code + revert back some other part of the code to its original state 2020-12-31 12:32:18 +01:00
Vincent Foulon
59651eb032 Convert Localization from Asset to Compound 2020-12-31 12:32:18 +01:00
Vincent Foulon
2b6b2fd12e use RonLoader as LocalizationFragment's loader directly 2020-12-31 12:32:17 +01:00
Vincent Foulon
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
70c336c6cb fix init_localization return value being in comment 2020-12-31 12:32:15 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Ben Wallis
5636083e27 * Fixed character load errors not being handled in Voxygen. 
* Improved server error message for character load errors.
* Added server logging for item asset load errors during character load.
* Fixed character select error message dialog not supporting long messages.
 2020-12-30 19:29:22 +00:00
Acrimon
ce27cfb30f
update some error handling code 2020-12-29 01:21:09 +01:00
Sarra Kitty
e8eb2b3a6c new gliders 
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
 2020-12-24 02:54:18 +00:00
Frinksy
53d5a9373e fixing #881 
- Multiple buffs make the UI icons flicker
 2020-12-22 15:40:57 +00:00
Adam Blanchet
5f9984df12 working towards #861 - 
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
 2020-12-18 10:01:30 +01:00
Benoît du Garreau
8aac030ecd Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
d2da8d671f Merge branch 'a1phyr/use_assets_manager' into 'master' 
Use `assets_manager` to load assets

See merge request veloren/veloren!1624
 2020-12-17 12:25:29 +00:00
Marcel
78e9f3de28 Merge branch 'test_util' into 'master' 
Add simple tests to utils description functions

See merge request veloren/veloren!1526
 2020-12-17 11:20:19 +00:00
Benoît du Garreau
989683d2d3 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
ce9d706ed4 Fix clippy lints 2020-12-17 12:06:28 +01:00
Benoît du Garreau
7b4aa6d4cc cargo fmt 2020-12-17 12:06:22 +01:00
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
jiminycrick
60d5d62eef Switched to hashbrown everywhere 2020-12-17 10:31:35 +01: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 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
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
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
494436be01 Hid plugins behind a feature flag to resolve Windows CI issue 2020-12-15 11:14:26 +00:00
jiminycrick
ce03fcfda3 Healing bomb sfx fix 2020-12-14 21:36:51 -08:00
Monty
8b9db7b179 cleanup, changelog, small bugfixes 
fmt
fix rebase
fmt
 2020-12-14 21:52:24 +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
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
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
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
f8c8e342e6 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
Marcel Märtens
534f083b08 get rid of insecure dependency completly 2020-12-11 16:13:57 +01:00
Monty Marz
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel Märtens
ccb01e1898 adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Snowram
6713ac935f Addressed comments 2020-12-08 23:04:21 +01:00
Snowram
2e8ac0688c Adds accumulated velocity for animation 2020-12-08 23:03:41 +01:00
Snowram
f94a4ec90d Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Marcel
ed9413e96a Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' 
Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike

Closes #867

See merge request veloren/veloren!1592
 2020-12-08 21:07:15 +00:00
HiggsTardigradeTau
57d3a595ce Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike 2020-12-08 21:07:14 +00:00
Sam
490915d384 Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Ben Wallis
81a8ee0c19 Changed logging to use termcolor crate to fix ansi control codes showing when run under Windows Command Prompt 2020-12-06 14:49:13 +00:00
Joshua Barretto
77a39d74d4 Removed public fields from Client, turned a character error into a frontend event 2020-12-05 11:20:25 +00:00
Joshua Barretto
e5ebbd31fa Began using Grid<T> for LoD data 2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
Imbris
d1431d734a Merge branch 'imbris/update-winit' into 'master' 
Don't drop the wayland clipboard

Closes #855

See merge request veloren/veloren!1576
 2020-12-02 01:33:29 +00:00
Imbris
d7f506cf71 Don't drop wayland clipboard 2020-12-01 19:35:32 -05:00
Imbris
b6b03c4a5f Merge branch 'weldar/remove-ssaa' into 'master' 
Removed SSAA option

Closes #871

See merge request veloren/veloren!1587
 2020-12-02 00:21:30 +00:00
Marcel
bf136a62c5 Merge branch 'xMAC94x/veloren_anim_move' into 'master' 
move anim code from voxygen/src/anim to voxygen/anim

See merge request veloren/veloren!1585
 2020-12-01 20:01:26 +00:00
Marcel Märtens
e5e255cbd3 move anim code from voxygen/src/anim to voxygen/anim 2020-12-01 20:20:01 +01:00
Forest Anderson
57c2f21e4d Cleaning 2020-12-01 10:28:39 -05:00
weldar
a2d98d31a7 Removed SSAA option to resolve issue #871. 2020-12-01 09:43:06 -05:00
Marcel Märtens
e398cca53c move common_state into common_sys 2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653 Move Systems out of common into common_sys 
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
 2020-12-01 13:44:07 +01:00
Marcel
9e5c31a27e Merge branch 'xvar/tooltip-fade-fix' into 'master' 
Changed tooltip fade time from 100 to 0ms to fix tooltip glitching

See merge request veloren/veloren!1567
 2020-11-30 21:13:05 +00:00
Marcel
a189163910 Merge branch 'azymohliad/sun-movement-direction' into 'master' 
Fix Sun and Moon movement direction

See merge request veloren/veloren!1568
 2020-11-30 21:13:03 +00:00
Nicholas Kinney
885e1aac61 Offspec/larger scalemode range 2020-11-30 20:36:58 +00:00
Marcel Märtens
ca1601a980 Change the version number to 0.8 2020-11-28 11:25:58 +01:00
Andrii Zymohliad
8a6f08df91 Fix sun & moon movement direction 
They were rising on the west and setting on the east
 2020-11-27 23:17:59 +02:00
Ben Wallis
7ce0c7fc05 Changed tooltip fade time from 100 to 0ms to fix tooltip glitching 2020-11-27 19:51:45 +00:00
Forest Anderson
9065d0ca02 Merge branch 'imbris/audio-fixes' into 'master' 
Stop unbounded wind volume when zooming out, make campfires quieter

Closes #844

See merge request veloren/veloren!1566
 2020-11-27 18:59:23 +00:00
Forest Anderson
c8735ba946 Merge branch 'timsueberkrueb/log-path-override' into 'master' 
Make VOXYGEN_LOGS override logs_path setting

See merge request veloren/veloren!1565
 2020-11-27 18:25:39 +00:00
Imbris
a96e9982c7 Stop unbounded wind volume when zooming out, make campfires quieter 2020-11-27 12:43:47 -05:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master' 
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
 2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Treeco
ca2e4080c0 Various tiny fixes: 
Text over lootbags no longer scales with distance due to performance

Fixed meshing panic

Fixed ambiant lighting default
 2020-11-26 21:46:41 +00:00
Tim Süberkrüb
49e892b948 Make VOXYGEN_LOGS override settings 
This is needed to support package managers that enforce
strict application confinement (e.g. snap).
 2020-11-25 20:36:41 +01:00
Monty Marz
e7d27a2c21 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Imbris
a545d099a2 Restore fix for dragging on windows platforms 2020-11-25 00:29:28 -05:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Treeco
8922fd949f Make zooming in then back out return to the previous zoom level 2020-11-23 10:58:22 +00:00