|
|
84bfa73d26
|
Added private, broadcast, and game_state messages
|
2019-07-26 07:29:37 -04:00 |
|
|
|
40285c6ac1
|
Rebase fixes
|
2019-07-26 07:29:37 -04:00 |
|
|
|
3fbca57d2e
|
Correct tells
|
2019-07-26 07:29:37 -04:00 |
|
|
|
887d07f902
|
Fix build error
|
2019-07-26 07:29:37 -04:00 |
|
|
|
dc28070640
|
Adds colour to tells in chat box #194
|
2019-07-26 07:29:37 -04:00 |
|
|
|
a8c14a574e
|
Merge branch 'Nero/light_offsets' into 'master'
Nero/light offsets
See merge request veloren/veloren!360
|
2019-07-25 20:51:20 +00:00 |
|
|
|
940ef92318
|
Nero/light offsets
|
2019-07-25 20:51:20 +00:00 |
|
|
|
8548dab025
|
Merge branch 'qutrin/camera-modes' into 'master'
Camera Modes
See merge request veloren/veloren!355
|
2019-07-25 13:14:00 +00:00 |
|
|
|
acc5b531d4
|
Fix build mode inaccuracy
|
2019-07-25 15:00:17 +02:00 |
|
|
|
b62613fd91
|
Properly hide the player character
|
2019-07-24 16:45:27 +02:00 |
|
|
|
d57ad7bff0
|
An attempt at hiding the player in first person mode
|
2019-07-24 16:09:16 +02:00 |
|
|
|
a0802dd092
|
Change FP Mode distance to 0.1 to fix building
|
2019-07-24 15:04:12 +02:00 |
|
|
|
b751a507bd
|
Zoom out the camera when entering third person mode
|
2019-07-24 15:04:12 +02:00 |
|
|
|
e80879e993
|
Add camera modes
|
2019-07-24 15:04:12 +02:00 |
|
|
|
4d14e98e48
|
Merge branch 'static_entities' into 'master'
Spawn objects by name, more assets
See merge request veloren/veloren!359
|
2019-07-24 01:30:22 +00:00 |
|
|
|
a633e6bac8
|
offsets
|
2019-07-24 03:01:35 +02:00 |
|
|
|
072405b494
|
More objects
|
2019-07-24 02:50:19 +02:00 |
|
|
|
91d1d51a5e
|
chat warning for unknown objects
|
2019-07-24 02:50:19 +02:00 |
|
|
|
c7efc784e3
|
spawn objects by name
|
2019-07-24 02:50:19 +02:00 |
|
|
|
271fee04ee
|
Comand for specific model spawning part I
|
2019-07-24 02:50:19 +02:00 |
|
|
|
4448e9a484
|
Add tent
|
2019-07-24 02:50:19 +02:00 |
|
|
|
88a5844995
|
Update lantern_ground.vox
|
2019-07-24 02:50:19 +02:00 |
|
|
|
8732d879d5
|
Add cauldron
|
2019-07-24 02:50:19 +02:00 |
|
|
|
23562cd393
|
chests, human female head changes
|
2019-07-24 02:50:19 +02:00 |
|
|
|
82a3f25f09
|
MOAR Pumpkins!
|
2019-07-24 02:50:19 +02:00 |
|
|
|
d97fdc1ac2
|
added lanterns and potions
|
2019-07-24 02:50:18 +02:00 |
|
|
|
8bef737757
|
formatting
|
2019-07-24 02:50:18 +02:00 |
|
|
|
36f0414922
|
Add campfire
|
2019-07-24 02:50:18 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4c2392014d
|
Hopefully fix conflict.
|
2019-07-24 02:20:35 +02:00 |
|
|
|
81689b694a
|
Some other stuff I missed to commit. (Hooked into server-cli)
|
2019-07-24 02:20:35 +02:00 |
|
|
|
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 |
|
|
|
e63350ea05
|
Hopefully fix conflict.
|
2019-07-24 02:02:22 +02:00 |
|
|
|
7c6c2b3ee1
|
Some other stuff I missed to commit. (Hooked into server-cli)
|
2019-07-24 01:44:33 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
deaab36299
|
[FIX] Callback hell of AudioDevice construction while opening audio settings window.
|
2019-07-23 09:54:41 +00:00 |
|
|
|
ccef9a04cd
|
Merge branch 'pfauenauge/crosshair-options' into 'master'
Crosshair variations
See merge request veloren/veloren!356
|
2019-07-23 01:02:57 +00:00 |
|
|
|
18f07b86b9
|
Crosshair variations
|
2019-07-23 01:02:57 +00:00 |
|
|
|
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 |
|
|
|
b1392a1910
|
Static entities: Per model offsets, more models
|
2019-07-21 23:54:31 +00:00 |
|
|
|
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 |
|
|
|
41fefb7ebc
|
Moved lighting uniforms into light.glsl
|
2019-07-21 19:22:49 +01:00 |
|
|
|
044c4d4a2c
|
Added LightEmitter component
|
2019-07-21 19:22:49 +01:00 |
|
|
|
b387d14e10
|
Fixed infinite NPC jumping
|
2019-07-21 19:22:49 +01:00 |
|
|
|
8df07da2e4
|
Fixed light cap
|
2019-07-21 19:22:49 +01:00 |
|
|
|
1333ffa7a4
|
Added point lights
|
2019-07-21 19:22:49 +01:00 |
|
|
|
6a025de031
|
Added object entities
|
2019-07-21 19:22:49 +01:00 |
|
|
|
1a23ab5ba8
|
pumpkin model
|
2019-07-21 19:22:49 +01:00 |
|
