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
935 Commits 151 Branches 18 Tags 2.1 GiB
e647be3e57
Commit Graph

541 Commits

Author SHA1 Message Date
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
Louis Pearson
affa5c081e Temporarily remove Ruination 
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
 2019-05-22 03:00:16 -06:00
Louis Pearson
eeceef12ef Prevent framerate drop when accessing settings menu 
Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b
 2019-05-21 16:44:51 -06:00
Louis Pearson
4dfebb779e Use global_state for accessing settings in hud 
This has led to a performance regression. For some reason when the menu opens
FPS drops to about 20.


Former-commit-id: 84cdbec5ef40cf6189e544eba6b87981bb9514fe
 2019-05-21 16:44:51 -06:00
Louis Pearson
9f1c70792f Move to using only global_state for settings menu 
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
 2019-05-21 16:44:51 -06:00
Louis Pearson
f52954971d Save view distance, volume, and audio device to settings when changed 
Former-commit-id: ac7db47520c6524b3f2d7a788907daabb73ad237
 2019-05-21 16:44:51 -06:00
Louis Pearson
c8928587dd Allow user to change audio device in the settings menu 
Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e
 2019-05-21 16:44:51 -06:00
Louis Pearson
0437f88601 Prevent audio crashes by blocking jack by default 
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
 2019-05-21 16:44:51 -06:00
Louis Pearson
ee6ec2d299 Continue implementing audio device selection 
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
 2019-05-21 16:44:51 -06:00
Louis Pearson
8dc35b8609 Add audio to settings 
Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344
 2019-05-21 16:44:51 -06:00
Louis Pearson
50fc7549b9 Add baby steps for audio device choice support 
Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed
 2019-05-21 16:44:51 -06:00
Louis Pearson
7cfd3ad1cd Add field_grazing.ogg 
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
 2019-05-21 16:44:51 -06:00
Joshua Barretto
fc25dc8c7f fmt 
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
 2019-05-21 23:31:38 +01:00
Joshua Barretto
a696847f67 Fixed singleplayer failure caused by worldgen 
Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923
 2019-05-21 23:31:17 +01:00
Joshua Barretto
dcd2b4392d Added rocks, improved hills 
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
 2019-05-21 22:51:41 +01:00
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen 
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
 2019-05-21 22:51:41 +01:00
Louis Pearson
7dc087fe93 Create config dir if needed 
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
 2019-05-20 15:32:16 -06:00
Louis Pearson
8de6d5ad3d Stop saving singleplayer settings to network settings 
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
 2019-05-20 15:05:09 -06:00
Imbris
39caf7e51b Don't allow negative volumes 
Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5
 2019-05-19 17:50:20 -04:00
Imbris
888bd65036 Add volume adjustment, lower default volume 
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
 2019-05-19 15:31:32 -04:00
Pfauenauge
13e916d485 visuals in settings - audio 
Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01
 2019-05-19 19:35:40 +02:00
Joshua Barretto
0a9d7d68d5 Merge branch 'VD-Slider' into 'master' 
View distance slider

See merge request veloren/veloren!152

Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
 2019-05-19 01:10:42 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Imbris
0349461533 Pass up Vd slider changes to session.rs & fmt 
Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b
 2019-05-18 19:55:06 -04:00
Pfauenauge
78173b4bce added slider 
Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f
 2019-05-19 01:22:30 +02:00
Imbris
4f970b63ef fix screen shot flipping 
Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643
 2019-05-18 19:09:23 -04:00
Imbris
7855dfe52f Add screenshot, fullscreen, & debug keys 
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
 2019-05-18 17:16:35 -04:00
Imbris
9e9e8be196 Tweak settings change event handling in hud 
Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640
 2019-05-18 17:09:03 -04:00
Louis Pearson
b0f26633d3 Remove lewton, fix filename issue 
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
 2019-05-18 14:26:16 -06:00
Louis Pearson
6b0fc57ce3 Move global maintains above rendering 
Also moves the call to the AudioFrontend constructor to take place in the
GlobalState constructor


Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a
 2019-05-18 14:10:02 -06:00
Louis Pearson
22286c24e6 Play random music whenever a track ends 
To support this, a global_state.maintain() method was added that calls
audio.maintain().


Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
 2019-05-18 13:53:57 -06:00
Louis Pearson
315767f19f Add code to ignore jack as an audio device 
Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134
 2019-05-18 13:53:57 -06:00
Louis Pearson
5a04e98725 Change asset paths to be relative 
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
 2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Joshua Barretto
7f857daa91 Colour adjustment and server crash fix 
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
 2019-05-18 17:47:55 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
7174830279 fmt 
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
 2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Imbris
8e0c1b1abd cleanup some warnings, pretty crash string literal 
Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c
 2019-05-17 03:55:51 -04:00
Imbris
c780b85f24 Stop crash when minimizing 
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
 2019-05-17 01:13:14 -04:00
Joshua Barretto
db4be8e492 Updated sphynx 
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
 2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181 Added figure colour to shader and health component 
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
 2019-05-16 23:34:57 +01:00
Joshua Barretto
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
jshipsey
6db00e371d popup origin fix 
Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38
 2019-05-16 01:29:48 -04:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 2019-05-15 13:26:14 +01:00
Joshua Barretto
8af606e348 Fixed singleplayer logout crash due to orphaned mesh worker 
Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5
 2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d Added figure colour to shader and health component 
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
 2019-05-15 13:26:14 +01:00
Imbris
8b97ee14bc add backtrace to panic hook 
Former-commit-id: c831dfa85ebfa1ace05e5ffdec5cc68954394ae1
 2019-05-15 13:24:32 +01:00
Louis Pearson
85e97e16d3 Change vec<u8> to BufReader 
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
 2019-05-15 13:24:32 +01:00
jshipsey
efc019f7a4 idle, run, jump animations 
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
 2019-05-15 00:24:36 -04:00
Joshua Barretto
49cc422dfa Fixed quadruped animation selection 
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
 2019-05-14 12:37:05 +01:00
jshipsey
2a2b873f56 added skeleton, needs animation fix 
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
 2019-05-13 22:24:34 -04:00
Joshua Barretto
cf487589e2 Made model cache handle non-humanoids 
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
 2019-05-14 01:02:37 +01:00
jshipsey
732c43ce11 first quadruped changes 
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
 2019-05-13 19:43:10 -04:00
Imbris
ca60b86f53 add ImageSlider widget 
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
 2019-05-13 13:09:38 -04:00
Joshua Barretto
5c36aaf01f Merge branch '79-glsl-include' into 'master' 
Move u_globals to shared included file

See merge request veloren/veloren!124

Former-commit-id: 297d46cfe956881ae7a22528fc4c12b8c5ed5c56
 2019-05-13 13:40:02 +00:00
Joshua Barretto
67241fec31 Massively increased efficiency of terrain meshing, chunks generate from centre 
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
 2019-05-13 13:08:17 +01:00
Joshua Barretto
ee380782fb fmt 
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
 2019-05-13 11:29:35 +01:00
Joshua Barretto
4f53be633e sync 
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
 2019-05-13 11:15:03 +01:00
Joshua Barretto
216819ca92 fmt 
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
 2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8 Switched to actor system 
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
 2019-05-13 11:06:58 +01:00
robojumper
ba10ca38ba Fix chunk meshing 
Former-commit-id: d3a53602e4b480ab9db0a2a98e25cbba5081b624
 2019-05-13 11:03:47 +01:00
sxv20_
f600eca072 start fixing chunk rendering, noticed stack overflow crash 
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
 2019-05-13 11:03:47 +01:00