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,680 Commits 151 Branches 18 Tags 2.1 GiB
f4fa0af3fa
Commit Graph

1680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
9fd2849c6c chat warning for unknown objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
85281e7e54 spawn objects by name 2019-07-24 02:50:19 +02:00
Pfauenauge90
f6e24d8161 Comand for specific model spawning part I 2019-07-24 02:50:19 +02:00
Vechro
f3c5ece983 Add tent 2019-07-24 02:50:19 +02:00
Pfauenauge90
215a2640f4 Update lantern_ground.vox 2019-07-24 02:50:19 +02:00
Vechro
81f66457de Add cauldron 2019-07-24 02:50:19 +02:00
Pfauenauge90
870229cd1c chests, human female head changes 2019-07-24 02:50:19 +02:00
Pfauenauge90
3559926a02 MOAR Pumpkins! 2019-07-24 02:50:19 +02:00
Pfauenauge90
495311de2d added lanterns and potions 2019-07-24 02:50:18 +02:00
Vechro
e37ca1d1f3 formatting 2019-07-24 02:50:18 +02:00
Vechro
6478c4ec69 Add campfire 2019-07-24 02:50:18 +02:00
Forest Anderson
53f5f2d560 Merge branch 'xacrimon/memory-usage-tracking' into 'master' 
Implement memory usage tracking

See merge request veloren/veloren!358
 2019-07-24 00:29:54 +00:00
Acrimon
412d9d01aa Merge branch 'xacrimon/memory-usage-tracking' of gitlab.com:veloren/veloren into xacrimon/memory-usage-tracking 2019-07-24 02:21:10 +02:00
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
Acrimon
07ce7e064e Hopefully fix conflict. 2019-07-24 02:02:22 +02:00
Acrimon
5394c574d9 Some other stuff I missed to commit. (Hooked into server-cli) 2019-07-24 01:44:33 +02:00
Acrimon
d656ec4f64 Hook the tracking allocator into binaries. Doesn't do any monitoring/logging. Just provides the data when you want it. 2019-07-24 01:43:27 +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