Joshua Barretto
|
3c435c809c
|
Merge branch 'change_time_HH_MM' into 'master'
Adds the ability to change time with /time with HH:MM format. e.g. 12:43
See merge request veloren/veloren!363
|
2019-07-26 14:43:33 +00:00 |
|
Christoffer Lantz
|
14bee47e58
|
Applied cargo fmt
|
2019-07-26 16:38:31 +02:00 |
|
Christoffer Lantz
|
71347b5d11
|
match arms in handle_time now returns a NaiveTime object instead of f64
|
2019-07-26 16:16:35 +02:00 |
|
Christoffer Lantz
|
9d245e5edd
|
Now tells the client what the time was changed to
|
2019-07-26 16:03:05 +02:00 |
|
Christoffer Lantz
|
dbe9c5d696
|
Adds the ability to change time with /time with HH:MM format. e.g. 12:43
|
2019-07-26 15:43:39 +02:00 |
|
Joshua Barretto
|
c077c54690
|
Merge branch '194_different_colour_tells' into 'master'
Adds colour to tells in chat box, closes #194
Closes #194
See merge request veloren/veloren!342
|
2019-07-26 11:55:25 +00:00 |
|
tommy
|
75792d374b
|
Fix chat calls
|
2019-07-26 07:42:10 -04:00 |
|
tommy
|
95b5f4acfb
|
Added private, broadcast, and game_state messages
|
2019-07-26 07:29:37 -04:00 |
|
tommy
|
ea0bbe7e47
|
Rebase fixes
|
2019-07-26 07:29:37 -04:00 |
|
tommy
|
8bac6e1e72
|
Correct tells
|
2019-07-26 07:29:37 -04:00 |
|
tommy
|
5b928ce7c5
|
Fix build error
|
2019-07-26 07:29:37 -04:00 |
|
tommy
|
cc6aa6f33d
|
Adds colour to tells in chat box #194
|
2019-07-26 07:29:37 -04:00 |
|
Joshua Barretto
|
b9a5ee0981
|
Merge branch 'Nero/light_offsets' into 'master'
Nero/light offsets
See merge request veloren/veloren!360
|
2019-07-25 20:51:20 +00:00 |
|
Nero
|
53086cb3b2
|
Nero/light offsets
|
2019-07-25 20:51:20 +00:00 |
|
Joshua Barretto
|
d77d4dc60e
|
Merge branch 'qutrin/camera-modes' into 'master'
Camera Modes
See merge request veloren/veloren!355
|
2019-07-25 13:14:00 +00:00 |
|
Piotr Korgól
|
46f19c8f64
|
Fix build mode inaccuracy
|
2019-07-25 15:00:17 +02:00 |
|
Piotr Korgól
|
4f73cc921b
|
Properly hide the player character
|
2019-07-24 16:45:27 +02:00 |
|
Piotr Korgól
|
fd841cdd33
|
An attempt at hiding the player in first person mode
|
2019-07-24 16:09:16 +02:00 |
|
Piotr Korgól
|
e33deac740
|
Change FP Mode distance to 0.1 to fix building
|
2019-07-24 15:04:12 +02:00 |
|
Piotr Korgól
|
00f490c3bf
|
Zoom out the camera when entering third person mode
|
2019-07-24 15:04:12 +02:00 |
|
Piotr Korgól
|
36948890a3
|
Add camera modes
|
2019-07-24 15:04:12 +02:00 |
|
Forest Anderson
|
b5e4b701e1
|
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 |
|
Pfauenauge90
|
7aef8b10cd
|
offsets
|
2019-07-24 03:01:35 +02:00 |
|
Pfauenauge90
|
7a141ad111
|
More objects
|
2019-07-24 02:50:19 +02:00 |
|
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 |
|