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,099 Commits 151 Branches 18 Tags 2.1 GiB
30b668d0cc
Commit Graph

607 Commits

Author SHA1 Message Date
Louis Pearson
64d38e687b Move to latest version of cpal 2019-05-31 13:19:32 -06:00
Joshua Barretto
024afb9b4a Added desert and snowy areas 
Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802
 2019-05-29 22:24:47 +01:00
Joshua Barretto
f49796dcef Basic cave test 
Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e
 2019-05-29 14:49:27 +01:00
Joshua Barretto
1e2f130ad6 Added voxel shadows 
Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c
 2019-05-29 12:01:02 +01:00
Imbris
061ab9f45e limit ingame element size 
Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e
 2019-05-28 20:47:03 -04:00
Imbris
c41fc026a8 fmt 
Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa
 2019-05-28 20:47:03 -04:00
Imbris
e3e8afd99b Stop drawing entities outside the vd 
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
 2019-05-28 20:47:01 -04:00
timokoesters
59967c603c Save settings when the game closes 
Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907
 2019-05-28 19:16:07 -04:00
Imbris
38416ef37c Show disclaimer once 
Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61
 2019-05-28 19:16:07 -04:00
Imbris
045f41dae7 Use vd setting when creating client 
Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410
 2019-05-28 19:16:06 -04:00
Joshua Barretto
ec3176a471 Merge branch 'audio-error-1' into 'master' 
Fix game crashing when trying to start audio

Closes #112

See merge request veloren/veloren!187

Former-commit-id: e2c62779efae0a91edf1ad546fe1f077ddc5227e
 2019-05-28 22:16:03 +00:00
Louis Pearson
a3dafde081 Add better version of Snowtop 
Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6
 2019-05-28 15:01:10 -06:00
Louis Pearson
4502def070 Fix game crashing when trying to start audio 
Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27
 2019-05-28 15:01:10 -06:00
Joshua Barretto
5b5cd7d341 Merge branch 'healthbar-rendering-when-less-than-full' into 'master' 
Only render other player's healthbars when less than 100% full

Closes #123

See merge request veloren/veloren!195

Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24
 2019-05-28 20:37:37 +00:00
timokoesters
3d21cd7402 Get player count and calculate ping time 
Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a
 2019-05-28 21:55:05 +02:00
JMS
e3902ea134 Fix debug coordinates window crashing when player has no Pos component yet 
Closes #136


Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8
 2019-05-28 15:40:50 -04:00
JMS
b5976b567e Only render other player's healthbars when less than 100% full 
Implements part of #123


Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197
 2019-05-28 15:26:11 -04:00
JMS
4fcb6cd025 Add player coordinates to debug window 
Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7
 2019-05-28 14:23:24 -04:00
Marcel
b5b61462ee Merge branch 'event-chat-messages' into 'master' 
Event chat messages

See merge request veloren/veloren!188

Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
 2019-05-28 10:45:24 +00:00
Marcel
7cbc4dbfdb Merge branch 'easy-run' into 'master' 
Add default-run to allow compiling with just `cargo run`

See merge request veloren/veloren!189

Former-commit-id: e520b72762accce00e275a48d70bbec31f2dbd83
 2019-05-28 10:27:45 +00:00
jshipsey
6cb1a75b93 speed tweak 
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
 2019-05-27 19:48:44 -04:00
jshipsey
f9e2828de5 swing animation changes 
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
 2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f swing animation 
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
 2019-05-27 18:54:09 -04:00
timokoesters
7ced54ba54 Add default run to allow compiling with just cargo run 
Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565
 2019-05-27 22:51:42 +02:00
timokoesters
2008400169 Implement killer name in chat 
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
 2019-05-27 21:47:19 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages 
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
 2019-05-27 19:45:43 +02:00
Monty Marz
8a3b308224 Wolf model assets update 
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
 2019-05-26 19:12:32 +00:00
Imbris
ec4bf7279a Add check for typing 
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
 2019-05-26 12:23:24 -04:00
Imbris
8754ea1661 Fix hud handle_event() match arm order 
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
 2019-05-26 12:12:10 -04:00
Timo Koesters
48a905ba86 Merge branch 'attack' into 'master' 
Attack fixes

See merge request veloren/veloren!179

Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf
 2019-05-26 16:07:08 +00:00
timokoesters
a7faa82aad Fix invisibility 
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
 2019-05-26 18:01:55 +02:00
timokoesters
4ebf2e13a5 Fix wolf red and dead velocity 
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
 2019-05-26 17:34:00 +02:00
Imbris
3c7f463330 Don't create Consts if they are not needed 
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
 2019-05-26 11:24:26 -04:00
Imbris
4a8e85ef64 restore lost changes 
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
 2019-05-26 11:24:25 -04:00
jshipsey
d179ccbd92 rebase fix 
Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2
 2019-05-26 11:11:14 -04:00
jshipsey
b4e9359e3f Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets 
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
 2019-05-26 11:04:11 -04:00
jshipsey
7aab509701 rebase with combat merge 
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
 2019-05-26 11:02:01 -04:00
jshipsey
c342a7136b tweaking quadrupedmedium 
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
 2019-05-26 10:39:57 -04:00
jshipsey
cd4e36e32a pipeline adjustment 
Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de
 2019-05-26 10:39:57 -04:00
jshipsey
51b54a0252 cleanup 
Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae
 2019-05-26 10:39:57 -04:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
jshipsey
fa07323083 tweaking quadrupedmedium 
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
 2019-05-26 10:25:56 -04:00
jshipsey
9a4e663ef9 pipeline adjustment 
Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12
 2019-05-26 10:18:50 -04:00
timokoesters
f0397f1a32 log::error instead of panic 
Former-commit-id: 802f81425869698a95654d423fef93136617cb5f
 2019-05-26 16:11:30 +02:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
timokoesters
cda253c3cf Make Failed to tick go back to the main screen and move to ron 
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
 2019-05-26 12:58:43 +02:00
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
timokoesters
a18a8e0d15 Fix nametags showing on dead players (maybe) 
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
 2019-05-26 00:34:24 +02:00
timokoesters
79a0edad85 Fix glider 
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
 2019-05-26 00:04:40 +02:00
timokoesters
746e286b5b Fixes 
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
 2019-05-26 00:00:38 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more 
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
 2019-05-25 23:46:56 +02:00
timokoesters
3c0121538b Make key binds work with mouse events 
Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff
 2019-05-25 23:46:52 +02:00
timokoesters
075c0d9e11 Use type MouseButton instead of glutin::MouseButton 
Former-commit-id: 7fc8b2f3f42ed45455feaa4a36e225a981b768ac
 2019-05-25 23:21:40 +02:00
timokoesters
f4434013db Fix clear_terrain not changing Changes 
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
 2019-05-25 23:21:40 +02:00
timokoesters
525af4c201 Add Constant for damage fade 
Former-commit-id: 4b0e2ff6249ebcf814b036ba11c57ad094811e30
 2019-05-25 23:21:40 +02:00
timokoesters
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 2019-05-25 23:21:39 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending 
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
 2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9 Implement fast respawn 
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
 2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8 Implement hit time delay 
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
 2019-05-25 23:21:39 +02:00
timokoesters
e34a47d0d7 Fix chunk loading delay 
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
 2019-05-25 23:21:39 +02:00
timokoesters
f5751d65b1 Fix terrain not loading 
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
 2019-05-25 23:21:39 +02:00
timokoesters
a0918d11b6 Fix red effect 
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
 2019-05-25 23:21:38 +02:00
timokoesters
ad5dcb4158 Make use of states in char-selection 
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
 2019-05-25 23:21:38 +02:00
timokoesters
449b717777 Go back to char selection on death 
Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1
 2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d Implement killing 
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths


Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
 2019-05-25 23:21:37 +02: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
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
86bb277116 Added snow to mountains, fixed hash sub-chunk allocation failure 
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
 2019-05-25 05:51:45 +01:00
jshipsey
e84d19b5c8 fmt 
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
 2019-05-24 19:01:10 -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
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
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
Imbris
1d5bf26491 Round resolution scaling to powers of 2 
Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06
 2019-05-24 02:31:04 -04:00
Imbris
24a14b083f Scaling of ingame text rasterization to match final size 
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
 2019-05-24 02:31:04 -04:00
Imbris
a128abc925 Simplify ingame.rs, fix adding new entities 
Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e
 2019-05-24 02:31:04 -04:00
Imbris
db910855df Simplify ingame.rs, fix adding new entities 
Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc
 2019-05-24 02:31:03 -04:00
Imbris
e9683ba639 Link player stats, remove self name tag 
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
 2019-05-24 02:31:03 -04:00
Imbris
45bea22727 Add healthbars, rebase fixes, warning fixes 
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
 2019-05-24 02:31:03 -04:00
Imbris
93ec66a8b1 Add ability to position tuples of widgets ingame 
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
 2019-05-24 02:31:02 -04:00
Imbris
b828bffba9 Make name labels work 
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
 2019-05-24 02:31:02 -04:00
Joshua Barretto
8c4c14f749 Fixed UI shader 
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
 2019-05-24 02:31:02 -04:00
Imbris
7fd3854093 ingame_ui 
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
 2019-05-24 02:31:01 -04:00
Monty Marz
cc9b028bf1 Disclaimer 
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
 2019-05-23 22:45:48 +00:00
sxv20_
3e49c37a08 fix crash on view distance change related to borrows 
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
 2019-05-23 10:30:46 +01:00
sxv20_
894b4339ca move debug info DebugInfo struct 
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
 2019-05-23 10:30:00 +01:00
Algorhythm
6456198b38 Add ping indicator to debug HUD 
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
 2019-05-23 08:18:25 +00:00
Joshua Barretto
3963d4a3ef fmt 
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
 2019-05-22 19:49:06 +01:00
Joshua Barretto
1684013138 Improved GPU memory usage by ~5x by compressing vertex data 
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
 2019-05-22 19:32:33 +01:00
Louis Pearson
e78ae4fefc Remove hacks, clean up crufty code 
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
 2019-05-22 05:29:38 -06:00