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

3107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
c6a159ff14 Update chat-cli to work properly. 
Update reqwest to 0.10.0
 2020-03-08 22:54:15 +01:00
Imbris
d066505bd3 Add warning prompt for untrusted auth servers, move some auth code into 2020-03-08 22:51:37 +01:00
Acrimon
db427a2c18 Server auth handling improvements. 2020-03-08 22:49:47 +01:00
Acrimon
f4689db333 Updated to latest and greatest auth version. 2020-03-08 22:46:40 +01:00
Songtronix
0997620381 :/ and reactivated the password field 2020-03-08 22:34:06 +01:00
Justin Shipsey
7c9f0a8416 Merge branch 'snowram/eagle' into 'master' 
eagle npc

See merge request veloren/veloren!839
 2020-03-08 15:46:13 +00:00
Justin Shipsey
1044819cd9 Merge branch 'snowram/eagle' into 'snowram/eagle' 
more eagle adjustements

See merge request veloren/veloren!838
 2020-03-08 15:07:47 +00:00
Snow
a3ceac99c3 more eagle adjustements 2020-03-08 15:07:47 +00:00
jshipsey
ec53045893 eagle adjustments 2020-03-07 13:26:46 -05: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
Imbris
c51a224ce6 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
5795e53549 Added changelog entry 2020-02-25 22:41:58 -06:00
Caleb Cochran
4b3ca906a0 Added missed comma 2020-02-25 22:01:51 -06:00
Caleb Cochran
708ec6f8c0 Replaced commas (fmt issue) 2020-02-25 21:59:08 -06:00
Caleb Cochran
cf2c3ae856 Fixing #504 - Enemies stop attacking after combat 2020-02-25 20:48:09 -06:00
Justin Shipsey
b73b6ff0dd Merge branch 'slipped/smallfixes' into 'master' 
animation housekeeping

See merge request veloren/veloren!818
 2020-02-25 06:47:56 +00:00
Justin Shipsey
ea8744c4a1 animation housekeeping 2020-02-25 06:47:56 +00:00
Imbris
8863353ec4 Merge branch 'shandley/small-animal-run-sfx' into 'master' 
Emit run sfx for some non-humanoids

Closes #502

See merge request veloren/veloren!814
 2020-02-23 01:26:51 +00:00
S Handley
aee89cc72f Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size. 2020-02-23 01:26:51 +00:00
Forest Anderson
ec2dbd13f3 Merge branch 'shandley/level-up-command-hp' into 'master' 
Update max hp after using the set_level command

Closes #496

See merge request veloren/veloren!816
 2020-02-23 00:41:51 +00:00
Justin Shipsey
f27835392f Merge branch 'juli/sfx-sword-update' into 'master' 
UpdatedSoundFX

See merge request veloren/veloren!815
 2020-02-23 00:16:15 +00:00
Shane Handley
b13e6d0e3b Update max hp and refill health when a player uses the set_level command. 2020-02-23 09:08:30 +09:00
Julian
03929561f7 UpdatedSoundFX 
New souunds for Sword_in  and  Sword_out.
 2020-02-22 20:26:49 +01:00
Justin Shipsey
b9391d2337 Merge branch 'shandley/weapon-wield-sfx' into 'master' 
Add weapon wield/unwield sfx support

Closes #486

See merge request veloren/veloren!805
 2020-02-21 02:56:54 +00:00