Joshua Barretto
58a41d4bec
Merge branch 'tell_fix' into 'master'
...
Fix tell command, rename to /tell
See merge request veloren/veloren!343
2019-07-20 16:10:16 +00:00
Joshua Barretto
e5eafdfdc0
Merge branch 'zesterer/block_diffs' into 'master'
...
Send block diffs instead of entire chunks on block change
Closes #184
See merge request veloren/veloren!347
2019-07-20 16:08:37 +00:00
Joshua Barretto
ce327445a7
Send block diffs instead of entire chunks on block change
2019-07-20 16:41:03 +01:00
Marcel
aaeb20be42
Merge branch 'newport' into 'master'
...
Change default port of veloren from 59003 to 14004
See merge request veloren/veloren!346
2019-07-20 12:12:03 +00:00
Marcel Märtens
98b0a40a22
Change default port of veloren from 59003 to 14004
...
TCP and UDP Ports for applications should lie in a range between 1024-49151
the ports below are used for privileged services
the ports above should be dynamicly assigned.
Port 14004 seems to be used by no other service and i like it personally, so we choose it.
Also deactivate the workaround for the secondary veloren server again
2019-07-20 13:59:35 +02:00
Joshua Barretto
44b3f67347
Merge branch 'zesterer/better_voxygen_errors' into 'master'
...
Switched to Debug trait object for backend errors
See merge request veloren/veloren!344
2019-07-20 11:14:29 +00:00
Tom Watson
025e0712be
Update cmd.rs
2019-07-19 18:26:10 +00:00
Marcel
e45cad65a8
Merge branch '190_send_logon_commands' into 'master'
...
Send commands on client launch, closes #190
Closes #190
See merge request veloren/veloren!333
2019-07-18 22:50:46 +00:00
Tom Watson
3a1ae1b361
Send commands on client launch, closes #190
2019-07-18 22:50:46 +00:00
Joshua Barretto
752eca07b8
Switched to Debug trait object for backend errors
2019-07-18 16:42:31 +01:00
tommy
a442371a1f
Fix tell command, rename to /tell
2019-07-18 11:19:44 -04:00
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
