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
3,167 Commits 151 Branches 18 Tags
Commit Graph

3167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Whitehurst
44d5fc5087 Add triple_strike behavior to cs behavior sys 2020-03-12 07:34:24 -07:00
Adam Whitehurst
aab87741ba Remove can_transition and begin triple_strike 2020-03-12 07:33:19 -07:00
Adam Whitehurst
ccb3141c40 Add TripleStrike 2020-03-12 07:25:06 -07:00
Adam Whitehurst
8e27a07bd3 TripleAttack -> TimedCombo 
(it wasnt the right logic for the tiple attack)
 2020-03-12 05:16:40 -07:00
timokoesters
d902828e00 exit basic_attack when no weapon is equipped 2020-03-10 20:40:54 +01:00
timokoesters
8efcda724e clean up old states, lower gravity 2020-03-10 19:12:16 +01:00
timokoesters
665dab6d93 fix: deny gliding/jumping/rolling under water 2020-03-10 19:00:49 +01:00
timokoesters
1685c05739 feat: hitting enemies with basic_attack gives energy 2020-03-10 18:54:59 +01:00
timokoesters
6929a8b684 fix: stop switching quickly between climbing and idle at low energy 2020-03-10 17:33:36 +01:00
Adam Whitehurst
10eb4aa35b rename get_tool_data to unwrap_tool_data 2020-03-08 21:28:45 -07:00
jshipsey
f27ba91440 animation corrections 2020-03-08 17:02:25 -04:00
Adam Whitehurst
df4eac167d Begin implementing triple attack 2020-03-08 12:37:17 -07:00
Adam Whitehurst
2079e30420 Renaming fn's 2020-03-08 10:38:40 -07:00
Adam Whitehurst
3512e01a26 More util fn's, add comments 2020-03-08 10:38:18 -07:00
Adam Whitehurst
c6ae08a0b6 Add charging back 2020-03-08 10:04:26 -07:00
Adam Whitehurst
638efa85f9 User constants, faster characters 2020-03-08 08:38:53 -07:00
Adam Whitehurst
e48e90584b Update utils/handle_move fn's 2020-03-07 15:45:10 -08:00
Adam Whitehurst
c0fe259a6a Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
ff66a0ff61 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
fcc9b65a00 Merge master 2020-03-07 12:49:15 -08:00
Adam Whitehurst
915c689f35 Re-add blocking 2020-03-07 11:55:15 -08:00
Adam Whitehurst
d2e7e33682 Rename character behavior sys 2020-03-07 11:02:54 -08:00
Adam Whitehurst
06826850a8 Clean up character states 2020-03-07 10:15:02 -08:00
Songtronix
7b6670b212 Merge branch 'songtronix/introduce-codeowners' into 'master' 
add CODEOWNERS file

See merge request veloren/veloren!698
 2020-03-07 02:39:20 +00:00
Songtronix
05f3b7f253 add: CODEOWNERS file 
introduces the need of approval by a specific group/person for the MR to be merged based on which part of the codebase is being touched
 2020-03-06 19:10:27 +01:00
Imbris
4a916e41ae Merge branch 'imbris/character-rendering' into 'master' 
Remove `Client` dependency from Scene and implements #506

Closes #506

See merge request veloren/veloren!831
 2020-03-06 18:09:30 +00:00
Imbris
06759a6ed7 Fix tests 2020-03-05 23:12:51 -05:00
Imbris
0feb44047a Remove Client dependency from Scene types and audio managers, add an 
example for using voxygen as a library to renderer images of characters
 2020-03-05 23:12:51 -05:00
Acrimon
3f3958543f Merge branch 'capucho/screenshots-logs-directory' into 'master' 
Save screenshots and logs in a fixed directory

Closes #484

See merge request veloren/veloren!835
 2020-03-05 19:26:07 +00:00
S Handley
936f370960 Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file) 2020-03-05 19:26:07 +00:00
Acrimon
5b8bc3bb22 Merge branch 'capucho/add-pause-single-player-when-in-pause-menu' into 'master' 
Pause when in singleplayer and pause menu

Closes #36

See merge request veloren/veloren!833
 2020-03-05 19:18:20 +00:00
Capucho
ee6cc91479 Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player 2020-03-05 18:55:14 +00:00
Capucho
3a5b2c81ce Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
1a504f5a67 Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
218b75616e Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
005bca6230 Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
Justin Shipsey
55fa458d12 Merge branch 'slipped/attack-anim-experiment' into 'master' 
weapon control bone

See merge request veloren/veloren!828
 2020-03-05 14:02:11 +00:00
Justin Shipsey
f8d18e4913 weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
074f69cc9d Merge branch 'shandley/deselect-after-drop' into 'master' 
Deselect the inventory slot after dropping an item.

Closes #510

See merge request veloren/veloren!836
 2020-03-05 07:43:54 +00:00
Shane Handley
5b370a4f86 Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
Acrimon
8cec151ae7 Merge branch 'shandley/inventory-sfx' into 'master' 
Add inventory SFX

Closes #485

See merge request veloren/veloren!810
 2020-03-04 10:09:48 +00:00
S Handley
c7b4b94b15 Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it. 2020-03-04 10:09:48 +00:00
Forest Anderson
14688d465b Merge branch 'shandley/no-wield-sfx-rolling' into 'master' 
No wield/unwield sfx when rolling

Closes #507

See merge request veloren/veloren!830
 2020-03-01 19:45:05 +00:00
S Handley
1ae002e695 Revert "Do that better, and add a TODO." 
This reverts commit 9b0f11bd8922491bf2c2a9b4422d59982b227564.

It wasn't better.
 2020-03-01 19:45:05 +00:00
Forest Anderson
81206519bf Merge branch 'tim74/add-veloren-desktop-and-appdata-files' into 'master' 
Add veloren desktop and appdata files

See merge request veloren/veloren!823
 2020-02-28 15:11:54 +00:00
Marcel
9cdf234099 Merge branch 'docker-server' into 'master' 
Docker server

See merge request veloren/veloren!821
 2020-02-27 21:43:17 +00:00
Artem Polishchuk
272d5eadcb Add desktop file and AppData manifest 
Fix screenshot duplicate in appdata

Move .png icon to git lfs
 2020-02-27 16:25:07 -05:00
Marcel Märtens
66e7c7f338 workaround for tests and tarpaulin 2020-02-27 22:19:51 +01:00
Marcel Märtens
6ba112f318 automated macos builds 2020-02-27 12:50:43 +01:00
Marcel Märtens
8ecdb53076 auto-generated docker image for server-cli based on kaniko like i researched for torvus and correct release branch detection: 
- ade4d37575
 2020-02-26 17:08:46 +01:00