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
4,651 Commits 151 Branches 18 Tags
Commit Graph

1970 Commits

Author SHA1 Message Date
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
703da622bb Merge branch 'BottledByte/ability_design' into 'master' 
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
 2020-08-06 04:44:51 +00:00
BottledByte
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar 
Also fixed two wrong asset references and did some .ron formatting
 2020-08-05 01:21:42 +02:00
Imbris
64185584b4 Merge branch 'sharp/os-x-resize' into 'master' 
Fix window resizing on OS X.

See merge request veloren/veloren!1256
 2020-08-03 03:47:48 +00:00
BottledByte
4a19f1dacc De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
8d43b0b828 Fix window resizing on OS X. 
Not really clear why this was working on any platform...
 2020-08-03 04:40:36 +02:00
Imbris
24a675802b Merge branch 'w3yden/overitem_hud' into 'master' 
Voxygen/HUD: Display item name over dropped items

See merge request veloren/veloren!1240
 2020-08-02 19:54:33 +00:00
w3yden
c91dc994f9 Voxygen/HUD: Display item name over dropped items 
Fix clippy warning: Removed unneeded () in fn style

Fix formatting for fn style
 2020-08-02 09:49:39 +02:00
Imbris
2307d54101 Merge branch 'shandley/collect-block-keyup-fix' into 'master' 
Prevent inventory collect events from firing on keyup

See merge request veloren/veloren!1252
 2020-08-02 06:49:14 +00:00
Shane Handley
6c4210f0a5 Prevent keyholds for collect (e) 2020-08-02 15:25:57 +10:00
BottledByte
c7a5161b43 Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
Samuel Keiffer
6f73713c79 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Shane Handley
3211472a3b Prevent inventory collect events from firing on keyup, which is causing item pickup actions to be called twice. 2020-08-01 20:26:44 +10:00
jshipsey
1fe795839f changelog 2020-08-01 02:28:57 -04:00
jshipsey
030f29d102 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
0eaa41f5ba arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
b37c0962af Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
2645f9e631 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
d7bafe7fb5 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
654088820c maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
1b7cb8cde6 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
9a4415509c catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
8251fcfa55 new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
eb5ebdce12 Various changes to npcs animations 
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
 2020-08-01 02:19:43 -04:00
Snowram
18546d0ba5 Skeleton rework with rough offsets 2020-08-01 02:19:43 -04:00
Imbris
d24ca1a037 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Marcel Märtens
e4eb380cdf update auth to newest version 2020-07-29 19:28:22 +02:00
Marcel Märtens
451b6fddef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
Imbris
97e602ef68 Fix filtering out resize events in the ui 2020-07-26 18:21:20 -04:00
Samuel Keiffer
b41fff299f Bow charged shot attack 2020-07-26 03:06:53 +00:00
Imbris
ed3cea411c Make video mode selection slightly better 2020-07-25 17:07:50 -04:00
Monty Marz
6d3f0f2e29 lots of things 
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
 2020-07-23 12:10:13 +00:00
Justin Shipsey
4a5837397d Merge branch 'quickfixes' into 'master' 
small fixes

See merge request veloren/veloren!1221
 2020-07-21 13:36:10 +00:00
T-Dark0
d8c6f82d6b Voxygen and server-cli no longer panic if server creation returns error 
The process just exists instead
 2020-07-21 09:59:00 +00:00
jshipsey
ae79ffc68d small fixes 2020-07-20 21:37:13 -04:00
Monty Marz
87079b3bba Fix cut off chat 2020-07-18 21:56:45 +00:00
Imbris
e5ebc3238a Merge branch 'imbris/screenshot-tweak' into 'master' 
Only screenshot and toggle fullscreen once per frame

See merge request veloren/veloren!1217
 2020-07-18 19:08:42 +00:00
Imbris
3647c2303f Only screenshot and toggle fullscreen once per frame 2020-07-18 12:21:22 -04:00
Imbris
fae00c19ea Fix color depth selection 2020-07-18 08:17:42 -04:00
Imbris
c3563cd9ba Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window 2020-07-17 22:18:43 -04:00
Imbris
3f36dfd644 Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes 2020-07-17 21:26:21 -04:00
Imbris
9319ea75a0 Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend 2020-07-17 21:26:21 -04:00
Imbris
001e00c455 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
1db52fdce3 Fixes for Alt key related issues 2020-07-17 21:26:21 -04:00
Imbris
ce8194c7a6 small fix and refactor stop auto walk to a method 2020-07-17 21:26:21 -04:00
Imbris
2ad0d9268d Fix rebase mistake 2020-07-17 21:26:21 -04:00
Imbris
68917587dc Increment glutin version in Cargo.toml file 2020-07-17 21:26:20 -04:00
Imbris
1d632c6e62 Fix mistake with event processing 2020-07-17 21:26:20 -04:00
Imbris
83c397f7be clippy fixes 2020-07-17 21:26:20 -04:00