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,573 Commits 151 Branches 18 Tags 2.1 GiB
08b7bb781f
Commit Graph

11573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
81ca86ad06 Merge branch '191_player_to_player_dm' into 'master' 
Add "You tell {}" message to sending player, closes #191

Closes #191

See merge request veloren/veloren!341
 2019-07-17 19:26:48 +00:00
tommy
e60881079f Add "You tell {}" message to sending player 2019-07-17 15:01:04 -04:00
Forest Anderson
b4b1a30ef8 Merge branch '191_player_to_player_dm' into 'master' 
Player to player DM, closes #191

Closes #191

See merge request veloren/veloren!334
 2019-07-17 18:13:15 +00:00
tommy
8bb4993a79 rustfmt issue 2019-07-17 14:04:07 -04:00
tommy
3c6fb7a3ec Merge branch 'master' into 191_player_to_player_dm 2019-07-17 13:53:10 -04:00
Forest Anderson
617a28c962 Merge branch 'vechro/pyramid_fix' into 'master' 
Fix pyramid spawning

See merge request veloren/veloren!340
 2019-07-17 17:50:46 +00:00
Forest Anderson
4ffe60f8e3 Merge branch '187_persist_default_server' into 'master' 
Save the server index when it changes, closes #187

Closes #187

See merge request veloren/veloren!332
 2019-07-17 17:35:21 +00:00
Forest Anderson
b8993f568f Merge branch '183_add_killnpcs_command' into 'master' 
/killnpcs command, closes #183

Closes #183

See merge request veloren/veloren!329
 2019-07-17 17:34:36 +00:00
Vechro
9c1b93a70a Fix pyramid spawning 2019-07-17 20:18:56 +03:00
Forest Anderson
e912b96332 Merge branch 'songtronix/add-server-config' into 'master' 
Add server config

Closes #173

See merge request veloren/veloren!277
 2019-07-17 17:11:56 +00:00
Songtronix
5b31c7c1f9 little cleanup 2019-07-17 19:03:37 +02:00
Songtronix
bfa6a2e2a2 add configurable TimeOfDay 2019-07-17 18:32:02 +02: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
bf82f5925d maybe improved setting file handling 2019-07-17 18:32:01 +02:00
Songtronix
b41508f025 generalise errors based on zests suggestion 2019-07-17 18:32:01 +02:00
Songtronix
e2b83883f3 fmt 2019-07-17 18:32:01 +02:00
Songtronix
b6c8bdc223 add configurable max player count 2019-07-17 18:32:01 +02:00
Songtronix
bbb024224d add configureable server info 2019-07-17 18:32:01 +02:00
Songtronix
1213d9844b add customizable port and worldseed 2019-07-17 18:32:00 +02:00
Dominik Broński
c47bb5ed45 Merge branch 'xacrimon/update-d' into 'master' 
Update UVTH dependency to fix some minor issues.

See merge request veloren/veloren!338
 2019-07-15 20:39:59 +00:00
Acrimon
b11bc46e09 Update uvth in lockfile. 2019-07-15 22:11:18 +02:00
Joshua Barretto
0c31fb7e91 Merge branch 'tmpportchange' into 'master' 
Change the default port for the veloren server because the original server is...

See merge request veloren/veloren!337
 2019-07-15 17:48:22 +00:00
Marcel Märtens
242cdbe6e5 Change the default port for the veloren server because the original server is unanvailable for a few days and the secondary server cannot use the default veloren port 2019-07-15 19:42:13 +02:00
tommy
732eb9a0e8 Code review updates 2019-07-15 13:10:24 -04:00
tommy
bfa42dd33b Incorporated changes from Imbris 2019-07-14 16:35:22 -04:00
tommy
6d8eea5085 rustfmt issues 2019-07-14 13:39:27 -04:00
tommy
52b65d5938 Stopped 'spammy' output 2019-07-14 13:30:02 -04:00
Joshua Barretto
9da822efce Merge branch 'pfau-vechro/orc-heads' into 'master' 
New orc head models

See merge request veloren/veloren!336
 2019-07-14 14:34:47 +00:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
tommy
19ff836676 Remove TODO 2019-07-13 08:41:50 -04:00
tommy
5dee589107 Player to player DM #191 2019-07-13 00:25:44 -04:00
tommy
f15194b6f8 Save the server index when it changes #187 2019-07-12 20:26:17 -04:00
tommy
3c9046c5d0 rustfmt updates 2019-07-12 17:43:20 -04:00
tommy
42861541cf Updates based on code review #183 2019-07-12 17:16:07 -04:00
Forest Anderson
2bf2e7f958 Merge branch 'xacrimon/switch-threadpool-to-uvth' into 'master' 
Switch threadpool implementation to uvth.

See merge request veloren/veloren!328
 2019-07-12 18:29:50 +00:00
Acrimon
a36c049b06 Resolve Forests discussion. 2019-07-12 20:13:35 +02:00
Acrimon
b4f2cd1547 Resolve discussion from Timo. 2019-07-12 19:56:40 +02:00
Acrimon
a72722e5d1 Resolved discussion from imbris. 2019-07-12 19:35:11 +02:00
Acrimon
ccc7cb2976 Ran rustfmt 2019-07-12 21:29:16 +02:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Acrimon
69537f7dd9 Switched threadpool impl for veloren/server. 2019-07-12 18:30:15 +02:00
Forest Anderson
1506898baa Merge branch 'zesterer/worldgen' into 'master' 
Worldgen overhaul

See merge request veloren/veloren!321
 2019-07-11 12:57:17 +00:00
Joshua Barretto
9d1575db3f Fixed pyramid biome bug 2019-07-10 12:57:29 +01:00
Joshua Barretto
09717f1c56 Added pyramids 2019-07-10 00:51:54 +01:00
Joshua Barretto
92d4b4dfbe Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
9bc50ae547 Better acacia tree colours 2019-07-09 20:42:43 +01:00
Joshua Barretto
a6c9c10062 Better tree colours 2019-07-09 17:58:20 +01:00
Joshua Barretto
e7dd151833 Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
bbd7f579d2 Fix for clipping 2019-07-09 15:07:53 +01:00