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
851 Commits 151 Branches 18 Tags 2.1 GiB
3ddf4bddab
Commit Graph

58 Commits

Author SHA1 Message Date
Imbris
24a14b083f Scaling of ingame text rasterization to match final size 
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
 2019-05-24 02:31:04 -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
7fd3854093 ingame_ui 
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
 2019-05-24 02:31:01 -04:00
sxv20_
3e49c37a08 fix crash on view distance change related to borrows 
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
 2019-05-23 10:30:46 +01:00
Algorhythm
6456198b38 Add ping indicator to debug HUD 
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
 2019-05-23 08:18:25 +00:00
Louis Pearson
e78ae4fefc Remove hacks, clean up crufty code 
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
 2019-05-22 05:29:38 -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
ee6ec2d299 Continue implementing audio device selection 
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
 2019-05-21 16:44:51 -06:00
Imbris
888bd65036 Add volume adjustment, lower default volume 
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
 2019-05-19 15:31:32 -04: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
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
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 2019-05-15 13:26:14 +01:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
e6a40bbda2 Added jumping and Jump animation state 
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
 2019-05-09 18:57:47 +01:00
timokoesters
e8cf815143 Force ungrab on Key::ToggleCursor 
Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d
 2019-05-09 10:55:32 +02:00
Yeedo
164feaa616 fix merge conflicts 
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
 2019-04-29 22:13:14 +01:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
Yeedo
be9a399269 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
 2019-04-28 14:19:08 +01:00
timokoesters
a4d7d0d488 Implement StartSingleplayerState 
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
 2019-04-27 22:57:55 +02:00
Forest Anderson
f85e3546cf Merge branch 'fps_counter' into 'master' 
Add debug window, window toggle, fps counter

See merge request veloren/veloren!63

Former-commit-id: 38e5d85a0db9a01c877f975f91526cd2dbe1c1fb
 2019-04-23 17:57:49 +00:00
timokoesters
701755a8e2 Add disconnect handling 
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
 2019-04-23 14:01:16 +02:00
timokoesters
7baecff1f0 Clean up figure cache models when necessary 
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
 2019-04-23 13:59:16 +02:00
sxv20_
64c97f47fc Add prototype FPS counter to HUD 
Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe
 2019-04-22 20:24:16 +01:00
Imbris
d6d4155fc4 rearrange hud event handling slighlty 
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
 2019-04-20 14:08:39 -04:00
Louis Pearson
a768971c6c Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06:00
Joshua Barretto
11630877e3 Moved figure rendering to a better place 
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01:00
Pfauenauge90
3f2a938735 Key Command Changes, Char Window 
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
 2019-04-09 18:30:13 +02:00
Pfauenauge90
6ebff7ce2c Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Pfauenauge90
b29343490f disabled chat arrows 
Former-commit-id: 5a5ea8e7101c16ae780af1fb9b3e6e4ba59a98b4
 2019-04-02 16:25:14 +02:00
Pfauenauge90
a4f96b4642 Inventory 
Former-commit-id: 01df86c3a652e4a36d37edfdcc90dc350c1e5b04
 2019-04-02 06:54:27 +02:00
Pfauenauge90
8378663cca Added controls to open menus 
Former-commit-id: cfa167aef56e12def40a083effe37d1b0216c00f
 2019-04-02 03:05:18 +02:00
Imbris
fdb0512069 make hud consume key events when typing in the chat box 
Former-commit-id: bb1b06827d3d298f68ae6d17f534c7bc31065306
 2019-03-21 23:55:42 -04:00
Imbris
03b20fa1bd connect chat box to network 
Former-commit-id: 581c724ee31564c7473120d5431ceb2182afb207
 2019-03-20 01:26:22 -04:00
Imbris
e54a1ba369 add ToggleButton widg, make hud return event vec, simplify some widgets 
Former-commit-id: aa3fe6de4944f912cb44fa6ecebe928cc849c52c
 2019-03-20 01:24:27 -04:00
Imbris
f837492284 add chat box, minimap buttons, ui windows, etc 
Former-commit-id: 09d3e20b917a9ac9ef6333ee9bb913d01a7fb52c
 2019-03-20 01:24:27 -04:00
Imberflur
1962320f7e add ui text rendering 
Former-commit-id: 5b9b809c660a2fdd178688bdaa63d16128debe08
 2019-03-20 01:24:21 -04:00
Imberflur
e68fa6b579 separate implementation code from generic UI code 
Former-commit-id: 9c77ca03c4d834188ef863645ab2c26f31763b6c
 2019-03-20 01:24:21 -04:00
Imberflur
3f052cae1c setup ui image rendering, started creating test ui with iteraction 
Former-commit-id: 73235ad6b25ab160e9cde3ad2513d4dd32660161
 2019-03-20 01:24:20 -04:00
Joshua Barretto
2fffe21bc7 Added client localhost connection 
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
 2019-03-04 19:58:58 +00:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by() 
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
 2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system 
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
 2019-03-01 22:48:30 -05:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests 
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
 2019-01-30 12:11:34 +00:00
Joshua Barretto
a1617e7b5c Added window resize handling 2019-01-23 22:39:31 +00:00