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

1551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
8df07da2e4 Fixed light cap 2019-07-21 19:22:49 +01:00
Joshua Barretto
1333ffa7a4 Added point lights 2019-07-21 19:22:49 +01:00
Joshua Barretto
6a025de031 Added object entities 2019-07-21 19:22:49 +01:00
Pfauenauge90
1a23ab5ba8 pumpkin model 2019-07-21 19:22:49 +01:00
Pfauenauge90
8bdbedc109 added bomb, chest and scarecrow models 2019-07-21 19:22:49 +01:00
Joshua Barretto
e05aadd0dd Merge branch 'Spawn_Command_Fix' into 'master' 
fix spawn command placement

See merge request veloren/veloren!288
 2019-07-21 18:22:13 +00:00
Jessie Mancer
097fa1f588 fix spawn command placement to be random to improve AI responsivity and not spawn directly on player 2019-07-21 18:22:13 +00:00
Imbris
072db37b4b Merge branch '172_add_server_name_to_char_selection' into 'master' 
Add server name to char selection screen,  closes #172

Closes #172

See merge request veloren/veloren!330
 2019-07-21 18:13:17 +00:00
Tom Watson
4d2328cb4d Revert "Add server name to char selection screen" 
This reverts commit a4a9b972736079484d811ee2b61c4458e2360c81.
 2019-07-21 18:13:17 +00:00
Joshua Barretto
da01090e18 Merge branch 'songtronix/include_git_commit' into 'master' 
add global git hash constant

See merge request veloren/veloren!350
 2019-07-21 17:45:31 +00:00
Songtronix
b2f1a843cc add global git hash constant 2019-07-21 17:45:31 +00:00
Joshua Barretto
353af9565f Merge branch 'zesterer/small-fixes' into 'master' 
Better fog

See merge request veloren/veloren!349
 2019-07-21 08:16:56 +00:00
Joshua Barretto
3898448f60 Merge branch 'master' into 'zesterer/small-fixes' 
# Conflicts:
#   common/src/sys/phys.rs
 2019-07-20 23:43:22 +00:00
Joshua Barretto
c33fd0cdba Better fog 2019-07-21 00:32:36 +01:00
Joshua Barretto
2a51da86fc Only change entity orientation when on the ground 2019-07-21 00:18:03 +01:00
Joshua Barretto
c823c6e1f8 Merge branch 'zesterer/small-fixes' into 'master' 
Removed warning on OoB block modification

See merge request veloren/veloren!348
 2019-07-20 18:13:24 +00:00
Joshua Barretto
024ed9eac8 Removed warning on OoB block modification 2019-07-20 19:08:28 +01:00
Joshua Barretto
e7c8702b44 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
781f8bbf1c 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
cdf35598e2 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Marcel
3c30974bae 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
de76d0c013 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
a737a7f9f9 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
809a961e59 Update cmd.rs 2019-07-19 18:26:10 +00:00
Marcel
711bacdea9 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
5aae41e753 Send commands on client launch, closes #190 2019-07-18 22:50:46 +00:00
Joshua Barretto
0d066d336e Switched to Debug trait object for backend errors 2019-07-18 16:42:31 +01:00
tommy
773d46c594 Fix tell command, rename to /tell 2019-07-18 11:19:44 -04:00
Forest Anderson
6fafd7d865 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
1f16b32b79 Add "You tell {}" message to sending player 2019-07-17 15:01:04 -04:00
Forest Anderson
54057511ae 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
87bb92f68b rustfmt issue 2019-07-17 14:04:07 -04:00
tommy
a1f36ab1b9 Merge branch 'master' into 191_player_to_player_dm 2019-07-17 13:53:10 -04:00
Forest Anderson
686e5ff908 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
9a22974e4d 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
08c43a0777 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
b81f8e317e Fix pyramid spawning 2019-07-17 20:18:56 +03:00
Forest Anderson
bd007dfd9a 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
f0114656bf little cleanup 2019-07-17 19:03:37 +02:00
Songtronix
59278405ef add configurable TimeOfDay 2019-07-17 18:32:02 +02:00
Songtronix
59fbc6101c ignore settings file 2019-07-17 18:32:01 +02:00
Songtronix
3e18da0560 Mark InvalidAlias Message as to be done 2019-07-17 18:32:01 +02:00
Songtronix
77f37bc8b8 maybe improved setting file handling 2019-07-17 18:32:01 +02:00
Songtronix
accaa22dee generalise errors based on zests suggestion 2019-07-17 18:32:01 +02:00
Songtronix
36f9c413a8 fmt 2019-07-17 18:32:01 +02:00
Songtronix
e0de110751 add configurable max player count 2019-07-17 18:32:01 +02:00
Songtronix
5f35778ef5 add configureable server info 2019-07-17 18:32:01 +02:00
Songtronix
92e3ff4a34 add customizable port and worldseed 2019-07-17 18:32:00 +02:00
Dominik Broński
e981669445 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
aba35c50f0 Update uvth in lockfile. 2019-07-15 22:11:18 +02:00