jshipsey
eddffb9d91
cleanup
...
Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986
2019-05-26 00:43:16 -04:00
jshipsey
b7cbe1e67c
add wolf
...
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
2019-05-25 23:31:49 -04:00
Imbris
3ddf4bddab
Merge branch 'chat-limit' into 'master'
...
Limited total messages
See merge request veloren/veloren!176
Former-commit-id: 74000e7cec193056ce9215666668aac32b347487
2019-05-25 20:15:02 +00:00
Joshua Barretto
242a23658c
Switched to pop_front
...
Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439
2019-05-25 21:03:56 +01:00
Joshua Barretto
3534804697
Limited total messages
...
Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb
2019-05-25 20:16:38 +01:00
Imbris
ad2fadf8bc
Merge branch 'fixes_and_tweaks' into 'master'
...
Fixes and tweaks
Closes #104
See merge request veloren/veloren!175
Former-commit-id: a0dee8b70c9b2a0dffa287d1fda371b0f216287a
2019-05-25 14:05:10 +00:00
Imbris
9edcabc679
Fix difficult grabbing after closing via button
...
Former-commit-id: 2649d9e210d375f19d2970f15614be23d5173c67
2019-05-25 08:59:58 -04:00
Imbris
3daec2cb17
Don't take mouse events from an unfocused window
...
Former-commit-id: 99b60171c86109606318c6f39b45370105e3a7d9
2019-05-25 08:59:58 -04:00
Imbris
a09c3691db
add pan and zoom sensitivity settings
...
Former-commit-id: 26d2becc17cc3b9fce77e27f91834b0caf3ea77a
2019-05-25 08:59:58 -04:00
Imbris
25dbc54961
set player alias as nametag if default char name
...
Former-commit-id: 0c6053842028b2b2743746267bb65a34a6581d71
2019-05-25 08:59:57 -04:00
Joshua Barretto
c536bfb511
Merge branch 'worldgen-structures' into 'master'
...
Worldgen structures
See merge request veloren/veloren!161
Former-commit-id: 0c11ec40ce5ec06e6ce98e33a2a304f8818f8270
2019-05-25 08:45:19 +00:00
Joshua Barretto
0bb217d53f
Added docs to assets::load_map
...
Former-commit-id: 50397d3c5d8c30ea392b784d9309d0e2ecb28f73
2019-05-25 09:38:30 +01:00
Joshua Barretto
8348633a0f
Stopped trees spawning in water
...
Former-commit-id: 1cc73b0eea4126da4501e19a695b572efc436935
2019-05-25 08:36:11 +01:00
Joshua Barretto
62f3808f5a
Fixed world viewer
...
Former-commit-id: 03113582d1bd9bce6848c66b9c73a2ba2939162e
2019-05-25 07:00:24 +01:00
Joshua Barretto
92391883a9
fmt
...
Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd
2019-05-25 06:54:47 +01:00
Joshua Barretto
16b80ab006
Marginally increased tree spawn frequency
...
Former-commit-id: c23a172e4796317bafdf4a6661330ed86d4eb248
2019-05-25 06:49:55 +01:00
Joshua Barretto
e0aaa96262
Improved grass and tree colour
...
Former-commit-id: 9372612047df95ec9588d35a32161248df85178a
2019-05-25 06:47:11 +01:00
Joshua Barretto
2f376509a3
Better spawn point
...
Former-commit-id: 31b4df016aea512494d419515043baa288fa9ab5
2019-05-25 06:42:26 +01:00
Joshua Barretto
c919f6fc83
Better tree spawning, more trees
...
Former-commit-id: abf4ff8a2eb005c2cd1832f5a3ae7182c4fc31f6
2019-05-25 06:38:40 +01:00
Joshua Barretto
9ed330d8fe
Improved sea-like slopes
...
Former-commit-id: 4b3ba56dcf6d99db7e48c169d42e042811872fd3
2019-05-25 05:51:45 +01:00
Joshua Barretto
1551bf0ae6
Much bigger terrain
...
Former-commit-id: f83f281a1ec1d18079a574580d5d963416fccde2
2019-05-25 05:51:45 +01:00
Joshua Barretto
842f518535
Made mountains bigger
...
Former-commit-id: c6ef0a8dba599e70177c7446fe282f357d33a66b
2019-05-25 05:51:45 +01:00
Joshua Barretto
c8ba5d9f89
Basic pine tree spawning
...
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d
Refactored worldgen sampling, added cache layer
...
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
2019-05-25 05:51:45 +01:00
Joshua Barretto
857315a27d
Added basic structure generation
...
Former-commit-id: 88a6bf2e18ac4f8f9b560797c8aac82ca318afb0
2019-05-25 05:51:45 +01:00
Joshua Barretto
79ae6f10e7
Changed snow altitude
...
Former-commit-id: 0a673564d854e535574381874127254e83f92585
2019-05-25 05:51:45 +01:00
Joshua Barretto
bab4cbb782
Adjusted snow
...
Former-commit-id: d30f3f8bb4e59c436023ccb38f65e868935d62f0
2019-05-25 05:51:45 +01:00
Joshua Barretto
31e25e8b09
Made mountain rock darker
...
Former-commit-id: 2da60a1e6b69d2522773ee3aae5cf2d83a1d0396
2019-05-25 05:51:45 +01:00
Joshua Barretto
86bb277116
Added snow to mountains, fixed hash sub-chunk allocation failure
...
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52
Small worldgen fixes and hash chunk optimisation
...
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
2019-05-25 05:51:45 +01:00
Joshua Barretto
611b270ded
Improved cache-coherency of world chunk interpolation
...
Former-commit-id: 2f45cf47916970185c65c701dfc63ae838f05734
2019-05-25 05:51:45 +01:00
Forest Anderson
0ef1c0084c
Merge branch 'adding-combat-anims' into 'master'
...
Combat animation groundwork
See merge request veloren/veloren!174
Former-commit-id: 7fd5356a9fab76184e2726e96154d975c5855458
2019-05-24 23:36:19 +00:00
jshipsey
e84d19b5c8
fmt
...
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
2019-05-24 19:01:10 -04:00
jshipsey
ee029b380c
erge branch 'adding-combat-anims' of https://gitlab.com/veloren/veloren into adding-combat-anims
...
rebase
Former-commit-id: 3cc8d5ff5435b2328c2104fbd2d345a3f4be6a67
2019-05-24 18:54:48 -04:00
jshipsey
f94a8b636d
restored previous animations with new bone setup
...
Former-commit-id: e507dba772d931e3ddebd0c4ecc8e038521a2e3e
2019-05-24 18:51:33 -04:00
jshipsey
8e896cc3c4
rotation simplification
...
Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8
2019-05-24 18:43:49 -04:00
jshipsey
98630b3692
attack state
...
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f
rotation simplification
...
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae
attack state
...
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00
Forest Anderson
c45d1f37b7
Merge branch 'msgbox_update' into 'master'
...
Msgbox update
See merge request veloren/veloren!170
Former-commit-id: 7af35336762375d9b6d1c1ef3f4608d90f54d247
2019-05-24 21:26:25 +00:00
Joshua Barretto
9101889aa5
Remove msgbox dependency
...
The messagebox denedency was causing conflicts when trying to build on
my workstation. Removing this dependency resolved the problem
immediately. Will work to replace this functionality before sending
upstream.
Former-commit-id: aeb4255e9c046c5c721316ec408497a7eeca0a5a
2019-05-24 21:26:25 +00:00
Forest Anderson
27f2a5c3cc
Merge branch 'link-fixes' into 'master'
...
Book link fix.
Closes #98
See merge request veloren/veloren!173
Former-commit-id: b412b5b8b143e04b7462a0af361c001d4f21b9ea
2019-05-24 21:18:06 +00:00
Cody
ee813cf747
Fixes broken book link.
...
Former-commit-id: f5636533167c22fef504026acdfad8e35e7b2694
2019-05-24 17:06:55 -04:00
Forest Anderson
d057c2e636
Merge branch 'login-screen' into 'master'
...
New Background image (.png)
See merge request veloren/veloren!172
Former-commit-id: 8f392b67e77716848f4748396571aad3414c62dd
2019-05-24 19:41:18 +00:00
Monty Marz
70033245cc
New Background image (.png)
...
Former-commit-id: 35912f0ecb432f54a74daa076ff2b192aa100778
2019-05-24 19:41:18 +00:00
Joshua Barretto
959945e97f
Merge branch 'ingame_ui_attempt' into 'master'
...
Add Health Bars and Name Tags
See merge request veloren/veloren!155
Former-commit-id: 8ebb8dd060cc66349829b9e4b335b1f42ae949e5
2019-05-24 12:53:42 +00:00
Joshua Barretto
4f2b27c338
fmt
...
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
2019-05-24 13:43:03 +01:00
Imbris
265e8f243c
small fixes
...
Former-commit-id: 0ac2c4e058340d99709843b52fed4a06498ab500
2019-05-24 02:32:39 -04:00
Imbris
dd607ba9a4
add key to toggle ingame ui elements
...
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
2019-05-24 02:31:05 -04:00
