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,455 Commits 151 Branches 18 Tags 2.1 GiB
c6e635c511
Commit Graph

3455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Capucho
fb4aba9bb7 Fix the spam on disconnect 2020-03-08 08:54:29 +00:00
Capucho
ca6d5ab506 Proper fix to the logout timeout problem using Disconnect ACK 2020-03-08 08:13:19 +00:00
Adam Whitehurst
5a9a8323f2 Update utils/handle_move fn's 2020-03-07 15:45:10 -08:00
Capucho
99e64d06b9 Janky fix of the logout timeout problem 2020-03-07 22:14:21 +00:00
Adam Whitehurst
49c7143144 Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
Adam Whitehurst
c678ca9540 Re-add blocking 2020-03-07 11:55:15 -08:00
Adam Whitehurst
cb9e3859da Rename character behavior sys 2020-03-07 11:02:54 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Adam Whitehurst
b1d1299fe6 Clean up character states 2020-03-07 10:15:02 -08:00
Songtronix
d5c3034b8f 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
c433e5e64d 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
bf2844c71f 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
ed5afaec8a Fix tests 2020-03-05 23:12:51 -05:00
Imbris
4a0c474be1 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
511bbd3899 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
ea53dea8a7 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
30f84c0115 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
a3479f6a49 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
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 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
a97b694dfe 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
68fbc2d1b6 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
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
3c7a8a7ce7 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
9d8d61736b Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
Acrimon
7478d1a063 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
b0ca85069b 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
e89810e0a1 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
daa0a10c2c Revert "Do that better, and add a TODO." 
This reverts commit 9b0f11bd89.

It wasn't better.
 2020-03-01 19:45:05 +00:00
Forest Anderson
0456016265 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
fa77646823 Merge branch 'docker-server' into 'master' 
Docker server

See merge request veloren/veloren!821
 2020-02-27 21:43:17 +00:00
Artem Polishchuk
ce7b9a84b8 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
0cb0328c79 workaround for tests and tarpaulin 2020-02-27 22:19:51 +01:00
Marcel Märtens
bf14deb5e0 automated macos builds 2020-02-27 12:50:43 +01:00
Marcel Märtens
1fbdb9c590 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
Imbris
0d189cb546 Merge branch 'kalculate/attacking-the-dead' into 'master' 
Fixing #504 - Enemies stop attacking after combat

Closes #504

See merge request veloren/veloren!820
 2020-02-26 05:35:55 +00:00
Caleb Cochran
89dd2fbaa0 Added changelog entry 2020-02-25 22:41:58 -06:00
Caleb Cochran
219f9fa3be Added missed comma 2020-02-25 22:01:51 -06:00
Caleb Cochran
8479230e66 Replaced commas (fmt issue) 2020-02-25 21:59:08 -06:00
Caleb Cochran
9f7aa61fbd Fixing #504 - Enemies stop attacking after combat 2020-02-25 20:48:09 -06:00
Shane Handley
0d2b26a3b8 SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust 
config.
 2020-02-25 22:03:29 +09:00
Justin Shipsey
21291739e5 Merge branch 'slipped/smallfixes' into 'master' 
animation housekeeping

See merge request veloren/veloren!818
 2020-02-25 06:47:56 +00:00
Justin Shipsey
5438514343 animation housekeeping 2020-02-25 06:47:56 +00:00
Shane Handley
d6f72876e9 Fix tests for movement sfx. 2020-02-25 10:01:41 +09:00
timokoesters
4cc998f92b fix: non-humanoid npcs can attack again 2020-02-24 22:20:50 +01:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
ac611f4618 fix: sync characterstates, better energy management 2020-02-24 20:57:33 +01:00