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

1617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
3895e21c6c Merge branch 'Nero/lantern_strength' into 'master' 
lantern strength and clamp values

See merge request veloren/veloren!369
 2019-07-28 14:13:43 +00:00
kacper
2a192d9a2d formatting 2019-07-28 16:00:14 +02:00
kacper
0435ac457f lantern strength and clamp values 2019-07-28 13:36:35 +02:00
Marcel
aa7298d98b Merge branch 'current_time' into 'master' 
Command: '/time' without any arguments; gives the client the current time

See merge request veloren/veloren!367
 2019-07-28 11:12:17 +00:00
Christoffer Lans
23ac36f2ca Command: '/time' without any arguments; gives the client the current time 2019-07-28 11:12:17 +00:00
Marcel
8739c3ae7e Merge branch 'server-startup-time-at-9-00-AM' into 'master' 
change server startup time to 32400.0 / 9:00 AM

See merge request veloren/veloren!366
 2019-07-28 10:46:03 +00:00
Monty Marz
83a978556c change server startup time to 32400.0 / 9:00 AM 2019-07-28 10:46:03 +00:00
Marcel
09d8f5eada Merge branch 'pfauenauge/objects' into 'master' 
Object rotation relative to player

See merge request veloren/veloren!362
 2019-07-28 09:21:17 +00:00
Monty Marz
8d63b0a159 added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself 2019-07-28 09:21:17 +00:00
Marcel
c97c663dee Merge branch 'qutrin/level-up' into 'master' 
Levels and XP

See merge request veloren/veloren!364
 2019-07-27 13:16:59 +00:00
Piotr Korgól
948dc2ee7e Show level and xp on character menu 2019-07-27 15:04:34 +02:00
Piotr Korgól
69dcd3ddef Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Piotr Korgól
f5351589d6 Add Level and Exp component 2019-07-26 16:44:59 +02:00
Joshua Barretto
99440583ca 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
6bf666bc05 Applied cargo fmt 2019-07-26 16:38:31 +02:00
Christoffer Lantz
f6334c1532 match arms in handle_time now returns a NaiveTime object instead of f64 2019-07-26 16:16:35 +02:00
Christoffer Lantz
eab81d5692 Now tells the client what the time was changed to 2019-07-26 16:03:05 +02:00
Christoffer Lantz
b609951cc2 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
623754d0a0 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
e0881942ae Fix chat calls 2019-07-26 07:42:10 -04:00
tommy
84bfa73d26 Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
40285c6ac1 Rebase fixes 2019-07-26 07:29:37 -04:00
tommy
3fbca57d2e Correct tells 2019-07-26 07:29:37 -04:00
tommy
887d07f902 Fix build error 2019-07-26 07:29:37 -04:00
tommy
dc28070640 Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Joshua Barretto
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
Nero
940ef92318 Nero/light offsets 2019-07-25 20:51:20 +00:00
Joshua Barretto
8548dab025 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
acc5b531d4 Fix build mode inaccuracy 2019-07-25 15:00:17 +02:00
Piotr Korgól
b62613fd91 Properly hide the player character 2019-07-24 16:45:27 +02:00
Piotr Korgól
d57ad7bff0 An attempt at hiding the player in first person mode 2019-07-24 16:09:16 +02:00
Piotr Korgól
a0802dd092 Change FP Mode distance to 0.1 to fix building 2019-07-24 15:04:12 +02:00
Piotr Korgól
b751a507bd Zoom out the camera when entering third person mode 2019-07-24 15:04:12 +02:00
Piotr Korgól
e80879e993 Add camera modes 2019-07-24 15:04:12 +02:00
Forest Anderson
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
Pfauenauge90
a633e6bac8 offsets 2019-07-24 03:01:35 +02:00
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