Joshua Barretto
|
4a198ca626
|
Numerous minor lighting fixes
|
2019-07-29 13:01:39 +01:00 |
|
Imbris
|
27517ae234
|
Merge branch 'imbris/ui_scaling' into 'master'
Add Ui Scale Setting and Slider
Closes #116
See merge request veloren/veloren!361
|
2019-07-28 23:48:17 +00:00 |
|
Imbris
|
ff518a4a23
|
Ui scaling interface tweaks
|
2019-07-28 16:54:32 -04:00 |
|
Pfauenauge90
|
8e15117be7
|
set min and max values
|
2019-07-28 16:54:32 -04:00 |
|
Pfauenauge90
|
d33bbf26ad
|
aligned value position to crosshair transp. value
|
2019-07-28 16:54:32 -04:00 |
|
Pfauenauge90
|
e15c4eb40b
|
changed displayed value for scale
|
2019-07-28 16:54:31 -04:00 |
|
Pfauenauge90
|
1567c63421
|
checkboxes functionality
|
2019-07-28 16:54:31 -04:00 |
|
Pfauenauge90
|
7ce71dda02
|
visuals change
|
2019-07-28 16:54:31 -04:00 |
|
Imbris
|
4ad42c57e4
|
Add ui scale setting and slider
|
2019-07-28 16:54:30 -04:00 |
|
Timo Koesters
|
dcb34385fd
|
Merge branch 'update-dependencies' into 'master'
Update most dependencies
See merge request veloren/veloren!372
|
2019-07-28 20:52:42 +00:00 |
|
timokoesters
|
5aa864ee58
|
Update most dependencies
|
2019-07-28 22:47:23 +02:00 |
|
Joshua Barretto
|
cdc8f3629e
|
Merge branch 'Nero/lantern_strenght_fix' into 'master'
after review
See merge request veloren/veloren!370
|
2019-07-28 18:16:54 +00:00 |
|
neronim66@gmail.com
|
2c5dc0c3ff
|
after review
|
2019-07-28 16:24:47 +02:00 |
|
Forest Anderson
|
081e72a3d0
|
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
|
999b6709a3
|
formatting
|
2019-07-28 16:00:14 +02:00 |
|
kacper
|
fd0df4177f
|
lantern strength and clamp values
|
2019-07-28 13:36:35 +02:00 |
|
Marcel
|
23ca2aa83f
|
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
|
633b8a1701
|
Command: '/time' without any arguments; gives the client the current time
|
2019-07-28 11:12:17 +00:00 |
|
Marcel
|
0a4e34442f
|
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
|
31d9e73a52
|
change server startup time to 32400.0 / 9:00 AM
|
2019-07-28 10:46:03 +00:00 |
|
Marcel
|
1faeb918ed
|
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
|
33565b9480
|
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
|
bacee7750f
|
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
|
198d532e38
|
Show level and xp on character menu
|
2019-07-27 15:04:34 +02:00 |
|
Piotr Korgól
|
5c84508015
|
Get EXP for killing NPCs and Players, properly show EXP bar
|
2019-07-26 20:51:40 +02:00 |
|
Piotr Korgól
|
b1aace0110
|
Add Level and Exp component
|
2019-07-26 16:44:59 +02:00 |
|
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 |
|