Acrimon
b1e1cb0f00
Hopefully fix conflict.
2019-07-24 02:20:35 +02:00
Acrimon
deb6c6adef
Some other stuff I missed to commit. (Hooked into server-cli)
2019-07-24 02:20:35 +02:00
Acrimon
551433f03a
Hook the tracking allocator into binaries. Doesn't do any monitoring/logging. Just provides the data when you want it.
2019-07-24 02:18:50 +02:00
Joshua Barretto
eab3fce010
Merge branch 'audio/fix-settings' into 'master'
...
[FIX] Callback hell of AudioDevice construction while opening audio settings window.
See merge request veloren/veloren!354
2019-07-23 09:54:41 +00:00
Sheldon Knuth
c2fa8bd615
[FIX] Callback hell of AudioDevice construction while opening audio settings window.
2019-07-23 09:54:41 +00:00
Joshua Barretto
0091419ace
Merge branch 'pfauenauge/crosshair-options' into 'master'
...
Crosshair variations
See merge request veloren/veloren!356
2019-07-23 01:02:57 +00:00
Monty Marz
7a4ad099ff
Crosshair variations
2019-07-23 01:02:57 +00:00
Joshua Barretto
be00d49b01
Merge branch 'static_entities' into 'master'
...
Static entities: Per model offsets, more models
See merge request veloren/veloren!353
2019-07-21 23:54:31 +00:00
Monty Marz
ae4c569fc9
Static entities: Per model offsets, more models
2019-07-21 23:54:31 +00:00
Joshua Barretto
35191c1bdb
Merge branch 'static_entities' into 'master'
...
Static entities and lights
See merge request veloren/veloren!352
2019-07-21 18:37:37 +00:00
Joshua Barretto
1cf8383eba
Moved lighting uniforms into light.glsl
2019-07-21 19:22:49 +01:00
Joshua Barretto
5cdfb26e0d
Added LightEmitter component
2019-07-21 19:22:49 +01:00
Joshua Barretto
dd84c6698b
Fixed infinite NPC jumping
2019-07-21 19:22:49 +01:00
Joshua Barretto
16c8ecec66
Fixed light cap
2019-07-21 19:22:49 +01:00
Joshua Barretto
b34d22565e
Added point lights
2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7
Added object entities
2019-07-21 19:22:49 +01:00
Pfauenauge90
56433f0b40
pumpkin model
2019-07-21 19:22:49 +01:00
Pfauenauge90
bc61a6e759
added bomb, chest and scarecrow models
2019-07-21 19:22:49 +01:00
Joshua Barretto
78240d64df
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
4893ab5c2a
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
cac780c5b9
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
cd456b6e2d
Revert "Add server name to char selection screen"
...
This reverts commit a4a9b97273
2019-07-21 18:13:17 +00:00
Joshua Barretto
d3d2198b58
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
de2dbcef45
add global git hash constant
2019-07-21 17:45:31 +00:00
Joshua Barretto
02180db437
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
059d50020e
Merge branch 'master' into 'zesterer/small-fixes'
...
# Conflicts:
# common/src/sys/phys.rs
2019-07-20 23:43:22 +00:00
Joshua Barretto
d4821b8de8
Better fog
2019-07-21 00:32:36 +01:00
Joshua Barretto
215a09005e
Only change entity orientation when on the ground
2019-07-21 00:18:03 +01:00
Joshua Barretto
e8aa654f01
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
1d21359337
Removed warning on OoB block modification
2019-07-20 19:08:28 +01:00
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
