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
11,384 Commits 151 Branches 18 Tags 2.1 GiB
dba817ba57
Commit Graph

51 Commits

Author SHA1 Message Date
juliancoffee
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
holychowders
30af95942a .gitignore: Ignore .vim, not just .vi files. 2022-03-19 11:46:42 -05:00
Imbris
d0cc636402 Add more profiling outputs to the .gitignore 2021-10-15 01:23:00 -04:00
Marcel Märtens
5012e2ba8b rename hud_settings to settings 2021-08-01 13:47:03 +02:00
Joshua Barretto
0cb524d8d6 Properly fixed command parsing 2021-07-23 17:33:31 +01:00
juliancoffee
832a7d89f4 add assets/tweak directory to .gitignore 2021-06-08 13:31:27 +03:00
juliancoffee
8b38137715 Ignore local neovim rc 2021-04-29 20:49:35 +03:00
holychowders
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Yusuf Bera Ertan
e9a7ff7dd7
build(nix): switch to naersk 2021-03-23 16:02:47 +03:00
Yusuf Bera Ertan
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv 2020-11-30 23:51:05 +03:00
Yusuf Bera Ertan
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
Imbris
7c14a3f4a4 New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes 2020-10-10 02:10:32 -04:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation 
* Added migrations for entity ID changes to existing tables
 2020-09-17 23:02:14 +00:00
Samuel Keiffer
f930f52df5 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Forest Anderson
a3eafe9b70 Merge branch 'yusdacra/crate2nix' into 'master' 
nix: Switch to crate2nix for building, and niv for dependency management

See merge request veloren/veloren!1090
 2020-06-28 18:28:29 +00:00
Monty Marz
32f6d42ed9 alpha disclaimer 2020-06-24 13:44:39 +00:00
Yusuf Bera Ertan
6cfa48e82e
nix: Switch to crate2nix, and niv for dependency management 2020-06-23 20:51:32 +03:00
Shane Handley
24cdea0a4c Enable WAL and busy_timeout for each sqlite connection to mitigate db locks, 2020-06-07 22:33:48 +10:00
S Handley
5a13b54cbf - Load characters after login. 
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
 2020-05-09 15:41:25 +00:00
Songtronix
996eee0b42 change(server): rename settings file to server_settings.ron 2020-04-15 13:31:16 +02:00
Imbris
6d0ec984c8 maybe fix hotreload panic 2020-03-15 15:53:51 +01:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
Joshua Yanovski
ee5d383c46 Map saving, soil production, speedup attempts. 2020-01-23 18:18:10 +01:00
Adam Whitehurst
7353ab3432 Undo sfx changes 2020-01-18 05:13:25 -08:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Shane Handley
cb987ed850 Add additional .vscode/ entry to .gitignore as this was not working for som devs. 2019-10-02 15:17:16 +09:00
haslersn
683936a0b5 gitignore: Add .envrc (direnv config file) 2019-08-14 14:58:41 +02:00
Joshua Barretto
215a09005e Only change entity orientation when on the ground 2019-07-21 00:18:03 +01:00
Songtronix
1215ced121 ignore settings file 2019-07-17 18:32:01 +02:00
Songtronix
ed0d842e57 Mark InvalidAlias Message as to be done 2019-07-17 18:32:01 +02:00
Songtronix
bbb024224d add configureable server info 2019-07-17 18:32:01 +02:00
Sheldon Knuth
c699801d78 Revamping the audio system for Voxygen from #163 2019-07-02 04:10:55 +00:00
Mckol
e534ad279f Added vim to gitignore 2019-06-27 14:38:19 +02:00
Mckol
4ea29f91ee Added Eclipse project file to gitignore 2019-06-27 13:13:55 +02:00
timokoesters
cda253c3cf Make Failed to tick go back to the main screen and move to ron 
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
 2019-05-26 12:58:43 +02:00
Joshua Barretto
0a9d7d68d5 Merge branch 'VD-Slider' into 'master' 
View distance slider

See merge request veloren/veloren!152

Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
 2019-05-19 01:10:42 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Imbris
7855dfe52f Add screenshot, fullscreen, & debug keys 
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
 2019-05-18 17:16:35 -04:00
Joshua Barretto
5df6b25d00 Added run.sh to gitignore 
Former-commit-id: 1f13cd6f334f5702ab092f595139691b0ff96bd4
 2019-05-12 19:01:29 +01:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Louis Pearson
515039c62d Add auto generation of settings.toml if it does not already exist 
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
 2019-04-16 10:06:23 -06:00
Joshua Barretto
520706debf Updated gitignore 
Former-commit-id: aa8f178f7004c61af2f0463bc1b190ae25909372
 2019-04-15 00:29:28 +01:00
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
Pfauenauge
8ecb849970 Char Window, Mana, Health, Exp-Bar 
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
 2019-04-06 00:36:04 +02:00
Pfauenauge90
87a41a30a7 Bag Additions 
Former-commit-id: 62e02ad0d67916b8ee12674e564931e92c08ee95
 2019-04-02 01:26:42 +02:00
Pfauenauge90
0ce80ec9ad Inventory Window 
Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301
 2019-04-01 22:31:29 +02:00
Pfauenauge
702e8321b1 Added chat arrow 
Former-commit-id: 387bf73af19e23678a9048ab3870665c88ff47b9
 2019-03-30 01:11:10 +01:00
Pfauenauge
99e364dc54 Asset Path Changes 
Former-commit-id: 8d31707d0e5c6db8328e0a389296f4f1a7f7cd69
 2019-03-29 21:08:14 +01:00
Imbris
48d5c70b2a minor fixes 
Former-commit-id: 56d6b123d6def65b3f7660eea6490277597813b0
 2019-03-29 01:56:08 -04:00
Pfauenauge90
07f7e89ca7 removed assets from folder, added race desc 
Former-commit-id: fd11261bfbf3e5986775dc6b818fced9df6dd09b
 2019-03-28 23:07:10 -04:00