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

1581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
072405b494 More objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
91d1d51a5e chat warning for unknown objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
c7efc784e3 spawn objects by name 2019-07-24 02:50:19 +02:00
Pfauenauge90
271fee04ee Comand for specific model spawning part I 2019-07-24 02:50:19 +02:00
Vechro
4448e9a484 Add tent 2019-07-24 02:50:19 +02:00
Pfauenauge90
88a5844995 Update lantern_ground.vox 2019-07-24 02:50:19 +02:00
Vechro
8732d879d5 Add cauldron 2019-07-24 02:50:19 +02:00
Pfauenauge90
23562cd393 chests, human female head changes 2019-07-24 02:50:19 +02:00
Pfauenauge90
82a3f25f09 MOAR Pumpkins! 2019-07-24 02:50:19 +02:00
Pfauenauge90
d97fdc1ac2 added lanterns and potions 2019-07-24 02:50:18 +02:00
Vechro
8bef737757 formatting 2019-07-24 02:50:18 +02:00
Vechro
36f0414922 Add campfire 2019-07-24 02:50:18 +02:00
Forest Anderson
f4b927b3bd 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
31bf8ab58a 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
4c2392014d Hopefully fix conflict. 2019-07-24 02:20:35 +02:00
Acrimon
81689b694a Some other stuff I missed to commit. (Hooked into server-cli) 2019-07-24 02:20:35 +02:00
Acrimon
3edddd8bbe 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
e63350ea05 Hopefully fix conflict. 2019-07-24 02:02:22 +02:00
Acrimon
7c6c2b3ee1 Some other stuff I missed to commit. (Hooked into server-cli) 2019-07-24 01:44:33 +02:00
Acrimon
b453121a55 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
d1b795594b 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
deaab36299 [FIX] Callback hell of AudioDevice construction while opening audio settings window. 2019-07-23 09:54:41 +00:00
Joshua Barretto
ccef9a04cd 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
18f07b86b9 Crosshair variations 2019-07-23 01:02:57 +00:00
Joshua Barretto
633800c1e5 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
b1392a1910 Static entities: Per model offsets, more models 2019-07-21 23:54:31 +00:00
Joshua Barretto
27fe047b78 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
41fefb7ebc Moved lighting uniforms into light.glsl 2019-07-21 19:22:49 +01:00
Joshua Barretto
044c4d4a2c Added LightEmitter component 2019-07-21 19:22:49 +01:00
Joshua Barretto
b387d14e10 Fixed infinite NPC jumping 2019-07-21 19:22:49 +01:00
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