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
2,712 Commits 151 Branches 18 Tags 2.1 GiB
2635c405fe
Commit Graph

2712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Whitehurst
2635c405fe Ability comps and sys 2020-01-01 09:16:29 -08:00
AdamWhitehurst
b67a4835f4 Update disabled state flags 2019-12-31 05:19:23 -08:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
AdamWhitehurst
7a4cdfb7a4 Documentation comments 2019-12-29 08:36:59 -08:00
AdamWhitehurst
ca44497258 Add movement_utils 2019-12-28 08:10:39 -08:00
AdamWhitehurst
06053faed0 Add state disables, cleanup imports 2019-12-26 10:01:19 -08:00
AdamWhitehurst
8e0317e03d refactor states to handle update logic 2019-12-26 06:43:59 -08:00
AdamWhitehurst
c2ceabea0e finish movment states handle() fn logic 2019-12-22 08:08:48 -08:00
AdamWhitehurst
1ab09220b0 Rudimentary Stand State handle() move 2019-12-21 07:57:15 -08:00
Adam Whitehurst
e40eb2ba20 Finish Stand handle() (untested) 2019-12-20 08:50:54 -08:00
Adam Whitehurst
e074c7ce1d begin impl state handle traits 2019-12-20 05:30:37 -08:00
Imbris
226826e026 Merge branch 'character-tweaks' into 'master' 
Fix fall->climb, tweak jump and glide

See merge request veloren/veloren!687
 2019-12-15 17:44:19 +00:00
Adam Whitehurst
4ead941c82 Fix fall->climb, tweak jump and glide 2019-12-15 17:44:19 +00:00
Songtronix
8cc2e62b28 Merge branch 'songtronix/fix-readme-links' into 'master' 
fix broken download links in Readme

See merge request veloren/veloren!688
 2019-12-14 07:09:30 +00:00
Songtronix
7c39b2af75 fix(readme): broken download links 2019-12-14 07:56:44 +01:00
Monty Marz
2eb32c8d55 Merge branch 'pfau/fix_bow' into 'master' 
Fix bow-shot frequency

See merge request veloren/veloren!685
 2019-12-12 20:13:45 +00:00
Monty Marz
1e1990758b Fix bow-shot frequency 2019-12-12 20:13:45 +00:00
Marcel
bb350bbdff Merge branch 'xmac94x/update-toolchain' into 'master' 
update toolchain to `nightly-2019-12-11`

See merge request veloren/veloren!682
 2019-12-11 14:20:21 +00:00
Marcel Märtens
72d8f95e8c please ci toolchain 2019-12-11 15:13:46 +01:00
Marcel Märtens
c84335fa26 update toolchain to nightly-2019-12-11 2019-12-11 14:43:22 +01:00
Imbris
318adecb0d Merge branch 'cfrantz1/veloren-astar-pathfinding-no-fork' into 'master' 
Add advanced path finding to new 'Traveler' enemy using A* algorithm

See merge request veloren/veloren!680
 2019-12-11 05:28:45 +00:00
Forest Anderson
d8fc7cb667 Add advanced path finding to new 'Traveler' enemy using A* algorithm 2019-12-11 05:28:45 +00:00
Imbris
0529716fa5 Merge branch 'shandley/fix-music-volume-startup' into 'master' 
Set the music and sfx volumes during startup

Closes #373

See merge request veloren/veloren!667
 2019-12-10 14:02:51 +00:00
S Handley
da2d36ed76 (fix) Set the music and sfx volumes immediately after initialising the 
audio frontend.

Fixes #373
 2019-12-10 14:02:51 +00:00
Acrimon
7cb177bb44 Merge branch 'update-controller' into 'master' 
Update controller

See merge request veloren/veloren!679
 2019-12-09 14:45:10 +00:00
Adam Whitehurst
20575e0aab Update controller 2019-12-09 14:45:10 +00:00
Acrimon
47b480eac6 Merge branch 'shandley/fix-glider-close-sfx' into 'master' 
Fix the glider_close sfx event

See merge request veloren/veloren!678
 2019-12-09 09:50:14 +00:00
S Handley
56f9c5d35f Fix the glider_close sfx event 
This was failing to trigger since we now have a MovementState::Fall, but
the sfx mapper was still trying to work this out itself based on
velocity. We no longer need to track velocity as a result and can use
the MovementState.

Also silenced warnings resulting from unused vars when running tests.
 2019-12-09 09:50:14 +00:00
Songtronix
35b4098b16 Merge branch 'shandley/footsteps-grass' into 'master' 
Update footsteps SFX

Closes #374

See merge request veloren/veloren!676
 2019-12-08 10:03:40 +00:00
S Handley
11dd6b8090 Update footsteps SFX 2019-12-08 10:03:40 +00:00
Acrimon
3e2fe36a8c Merge branch 'treeco/invert-mouse-setting' into 'master' 
Added mouse inversion setting

Closes #376

See merge request veloren/veloren!677
 2019-12-06 23:24:55 +00:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Acrimon
ea6374b1e4 Merge branch 'refactor-controller-movement-states' into 'master' 
Refactor controller movement states

See merge request veloren/veloren!672
 2019-12-03 06:30:09 +00:00
Adam Whitehurst
92d99af53c feat: weapon-type dependent wield and attack durations 
also some controller.rs cleanup
 2019-12-03 06:30:08 +00:00
Forest Anderson
1da30875c0 Merge branch 'revert-a2cfc4ba' into 'master' 
Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"

See merge request veloren/veloren!674
 2019-12-01 22:26:16 +00:00
Forest Anderson
f840e49e72 Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'" 
This reverts merge request !650
 2019-12-01 22:12:26 +00:00
Forest Anderson
a2cfc4bae8 Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master' 
Added audio compression job for CI

See merge request veloren/veloren!650
 2019-12-01 21:16:55 +00:00
Forest Anderson
14eebd930d Added audio compression job for CI 2019-12-01 21:16:55 +00:00
Marcel
c0ae12452e Merge branch 'treeco/fp-view-height' into 'master' 
Made the first person camera follow race heights, plus minor zoom changes

See merge request veloren/veloren!673
 2019-12-01 20:56:33 +00:00
Treeco
7c17c45f47 made first person camera follow race heights, minor zoom chances 2019-12-01 19:05:28 +00:00
Marcel
a6ef802f9c Merge branch 'inputs-enhancements' into 'master' 
Inputs enhancements

See merge request veloren/veloren!671
 2019-11-29 15:20:35 +00:00
Adam Whitehurst
4e574cb29a Inputs enhancements 2019-11-29 15:20:35 +00:00
Monty Marz
b7a084cbb8 Merge branch 'pfau/assets' into 'master' 
Set overflow checks to 'false' for release builds in order to bandaid fix recent master error

See merge request veloren/veloren!670
 2019-11-28 13:32:38 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
d374e8e673 Merge branch 'pfau/assets' into 'master' 
Fix map being inverted and indicator positioning

See merge request veloren/veloren!669
 2019-11-26 22:39:07 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
Marcel
3f36118886 Merge branch 'fixci' into 'master' 
remove option to build debug builds, because they are not needed and to reduce caches

See merge request veloren/veloren!666
 2019-11-25 08:59:36 +00:00
Marcel Märtens
203d76a550 remove option to build debug builds, because they are not needed and to reduce caches 2019-11-25 01:10:06 +01:00
Monty Marz
6c13ab8707 Merge branch 'region-name-display-fix' into 'master' 
Region name display fix

See merge request veloren/veloren!665
 2019-11-24 16:45:13 +00:00