Commit Graph

58 Commits

Author SHA1 Message Date
Cody
a258be7aac
Fixes some typos, comment inconsistencies, and incorrect naming conventions. 2019-05-31 16:36:16 -04: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
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
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
dd607ba9a4 add key to toggle ingame ui elements
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
2019-05-24 02:31:05 -04:00
Imbris
45bea22727 Add healthbars, rebase fixes, warning fixes
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
2019-05-24 02:31:03 -04: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
7855dfe52f Add screenshot, fullscreen, & debug keys
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
2019-05-18 17:16:35 -04: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
6da495f0bd Fixed window resizing
Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032
2019-05-09 18:57:47 +01:00
Joshua Barretto
c48a82e78d Adjusted sun and added F16 render target
Former-commit-id: 5585e0038846ef34378933eeb9051714ffe2c100
2019-05-09 18:57:47 +01:00
Joshua Barretto
5aa8a67800 Added jump button
Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307
2019-05-09 18:57:47 +01:00
robojumper
821ab80c5b Add post-process pipeline
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
2019-05-06 10:22:47 +02:00
Yeedo
b7ba7f0795 Use shorter help text format, compact stuff into one format!()
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
2019-05-01 23:15:43 +01: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
0dbdb185d4 Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
2019-04-28 14:19:08 +01:00
Yeedo
c032e60d12 Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a
2019-04-28 14:19:08 +01:00
Yeedo
dc5ec137e9 Update help window to use player's keybindings (fix #42)
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
2019-04-28 14:19:08 +01:00
Yeedo
ad1fc20cfe Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
2019-04-28 14:19:08 +01:00
Yeedo
00e92e5ea2 Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d
2019-04-28 14:19:08 +01:00
Yeedo
e1fc901b5f Update help window to use player's keybindings (fix #42)
Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e
2019-04-28 14:19:08 +01:00
Yeedo
44f8e834fc Redo settings -> help text, add supplement_events to Window.
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
2019-04-28 14:19:08 +01:00
Yeedo
48747dd9a9 Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db
2019-04-28 14:19:08 +01:00
Yeedo
488132f63b Update help window to use player's keybindings (fix #42)
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
2019-04-28 14:19:08 +01:00
Yeedo
be9a399269 Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
2019-04-28 14:19:08 +01:00
Yeedo
7593d4e821 Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8
2019-04-28 14:19:08 +01:00
Yeedo
50c6518d89 Update help window to use player's keybindings (fix #42)
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
2019-04-28 14:19:08 +01:00
Imbris
83ed5200b0 hide entire hud when toggling interface
Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921
2019-04-20 11:34:45 -04:00
Louis Pearson
55f3f0857f Add support for keybinding
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
2019-04-16 08:57:31 -06:00
Joshua Barretto
c98d841890 Fixed physics sync
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
2019-04-15 00:29:28 +01:00
Yeedo
b88dc1bbde Updated mouse wheel zooming to use WindowEvent
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
2019-04-11 23:12:42 +01: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
820967838d enable chat with enter while cursor is captured
Former-commit-id: a6b54d6325135462e04c2cec1703f45641c389f2
2019-03-29 22:15:27 -04:00
Imbris
93897f904a fix bug with ui using old win size when switching to previous playstate
Former-commit-id: b6c166882c978806af65f70496626fad33081975
2019-03-28 00:42:04 -04: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
f837492284 add chat box, minimap buttons, ui windows, etc
Former-commit-id: 09d3e20b917a9ac9ef6333ee9bb913d01a7fb52c
2019-03-20 01:24:27 -04:00
Imbris
3d5c11855a add ui scaling
Former-commit-id: 7c6c3c8fc7d16c4a2cd0e5eff36248d6009652d2
2019-03-20 01:24:23 -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
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