Can you believe it? More stuff #633
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SheridanR
added a commit
that referenced
this pull request
May 3, 2022
* scroll slider in settings and other windows can be escaped when using controller * fix a few minor UI issues * fix issues with gamepad speed sliders in settings menu * fix ear-rapey slider ticking sound * fix minor issue printing time in hall of trials menu * * minor update editor vsproj to not be optimized in eos debug * * initial chest update code - selected item from chest clear on item->node deletion * flame particle movement much gentler when "flicker lights" is off * fix issues with gentle flame sprites * Various minor menu changes and bug fixes * add "fire" overlay effect to story screen images * change story "fire" speed from 50hz to 20hz * * chest WIP * better stacking behavior when using mouse/cursor to move items * drag + drop to stack similar items with indicator * * fix item swapping with chest items + stacking not playing animation on controller * module navigation for chest lb/rb * prevent paper doll taken slots being selectable when holding chest item on controller * * reset selected item on chest open. * remove unused code for chest opening * * old chest variable clean up * add close chest action to button * * stash/retrieve on chests should handle stacking and repeat operations until finished * grab all functionality * * can close chest by interacting with it again * * add more info to return of itemStacking() funcs - tells you what item* node to stack into. Fixes case where 8/8 daggers and dropping 4 at once wouldn't distribute evenly into 9/9/2 * * fix item identified status not matching editor displayed value * * fix for disableItems usable to place items in chest if not equipped * * fix spells showing 'store' when chest is open instead of ready/cast * * drag from chest to hotbar slot - adds to existing stack, otherwise adds new item and replaces pointed slot * * context menu for hotbar !shootmode items * fix old hotbar highlighted item sprite not disabling (would overlap in compact view) * * more lang entries * * fix selectedEntity not being cleared * * add delay to tooltips when taking items out using right clicking * paper doll ducks in/out to make space for chest in compact mode * close chest not allowed if skillsheet open * fix module not being selected if walking away from a chest * * remove old updateChest from game loop * * fix hotbar activate not working in facemenu mode * * button selectors for chest * draw mouse offset when hotbar interact menu hangs off edge * * add prompts for chest gamepad * magic button add selector * fix spell list/skill list being available while chest open * * lang update * * fix lang * * gamepad sensitivity independant of fps in smoothed camera mode * * fix negative DEX bug * * set player item mode to inventory when chest navigating * * swapped item animation for hotbar slots * * HP/MP tooltips separate mouse location now * * fix RB/LB triggering 'use' commands in world * * gate gamepad deadzone debug keys behind enabledebugkeys * * cycle world tooltip on actual inputs * * images can have outline with storage for this surface. image_t->outline = true enables * * new hotbar images to fit the rune shape for bless/curse backgrounds * add commented out outline image for item beatitudes (didn't work out nice enough on testing, but code is there to reuse) * remove old unused newGameHUD() code * * disable cycling world tooltips in inventory mode * * expand tooltip binding dont enable in shootmode * inputs::refresh() won't override gamepad defaults with pad[hidden] bindings (was conflicting for expand tooltip for instance here) * * tooltip 4-glyph adjust size to match new gamepad glyphs 22x24px * * disable trying to equip broken items * * fix broken item logic - can apply to unequips * * tooltip headers use pixel_maz to save space * * reverse autosort logic, add defaults to main menu config for autosort * * world tooltip is disabled temporarily if keyboard + !shootmode * * autosort items on pickup * * broken item frame fix for hotbar display * * only bunkbeds have world tooltip * * torches when degrade make a new appearance unique to last one * * torch change back to original decay time * * rightx/y add player parameter * * missed re-roll on torch appearance on degradation * * lanterns unstackable, torches degrade by 1 qty every extinguish interval. items degrade by 1 stage when blocking and keep old behavior * * revert appearance rolling of degraded items - to eliminate equipping multiples in the first place * * fix autosort for duplicate items in inventory - incorrectly not checking for item equip slot pointer * * skip drawing empty opacity images * * disable drawing 0 alpha fields * fire effect "optimizations" * fix issues with appearances list in character card * Add screenshot binding * Network lobbies WIP fix spacebar deactivating active fields... * lots of network lobby stuff * lobby net stuff * yet more lobby stuff * disconnect window for timeout * some syntax errors * draft network lobbies * * fix wrong params in AddItemToChest * fix wrong assert * fix random compile errors * fix crashing issues when failing to connect to lobby * Fix various bugs to make network multiplayer work * * chest update * * fix shieldswap logic using wrong player num * * fix torch burnout not clearing shield * * fix multiplayer camera rendering * Lobby fixes (#627) * * fix wrong params in AddItemToChest * fix wrong assert * * chest update * * fix shieldswap logic using wrong player num * * fix torch burnout not clearing shield * * fix multiplayer camera rendering Co-authored-by: WALL OF JUSTICE <-> * WIP network scan stuff * fix minimap icons disappearing * fix net clients potentially starting the game too early * Lobby browser additions list entry images list entry selection background * * 64 bit build update proj files * Network Lobbies (#624) * fire effect "optimizations" * fix issues with appearances list in character card * Add screenshot binding * Network lobbies WIP fix spacebar deactivating active fields... * lots of network lobby stuff * lobby net stuff * yet more lobby stuff * disconnect window for timeout * some syntax errors * draft network lobbies * fix random compile errors * fix crashing issues when failing to connect to lobby * Fix various bugs to make network multiplayer work * Lobby fixes (#627) * * fix wrong params in AddItemToChest * fix wrong assert * * chest update * * fix shieldswap logic using wrong player num * * fix torch burnout not clearing shield * * fix multiplayer camera rendering Co-authored-by: WALL OF JUSTICE <-> * WIP network scan stuff * fix minimap icons disappearing * fix net clients potentially starting the game too early * Lobby browser additions list entry images list entry selection background * fix minor bugs Co-authored-by: WALL OF JUSTICE <bpot055@gmail.com> * Trash remaining TCP connection bits change isLocalPlayer logic * * fix multiplayer cam when host leaves * * server properly empties all chest items * * 64 bit vsproj changes * re-enable notifications and banners.... * fix clients hanging on game start sometimes * timeouts and disconnects handled properly (?) * fix bug in isLocalPlayer * various main menu tweaks * * fix succubus steal crash, potential other crash * change menu graphics to use point filtering * fix broken configs fucking up game * * add templates for controller stick glyphs * * use reference to player input bindings instead of copy * * avoid double pressing 'start' when exiting settings/bindings menus * fix broken configs fucking up game * minor menu bugfixes * fix MSVC compile errors * * replay commit lost in merge * join lobby stuff, constructor shenanigans * Stick Glyph Templates (#631) * fire effect "optimizations" * fix issues with appearances list in character card * Add screenshot binding * Network lobbies WIP fix spacebar deactivating active fields... * lots of network lobby stuff * lobby net stuff * yet more lobby stuff * disconnect window for timeout * some syntax errors * draft network lobbies * fix random compile errors * fix crashing issues when failing to connect to lobby * Fix various bugs to make network multiplayer work * * fix shieldswap logic using wrong player num * * fix torch burnout not clearing shield * * fix multiplayer camera rendering * Lobby fixes (#627) * * fix wrong params in AddItemToChest * fix wrong assert * * chest update * * fix shieldswap logic using wrong player num * * fix torch burnout not clearing shield * * fix multiplayer camera rendering Co-authored-by: WALL OF JUSTICE <-> * WIP network scan stuff * fix minimap icons disappearing * fix net clients potentially starting the game too early * Lobby browser additions list entry images list entry selection background * * 64 bit build update proj files * * fix multiplayer cam when host leaves * * server properly empties all chest items * * 64 bit vsproj changes * * fix succubus steal crash, potential other crash * fix broken configs fucking up game * * add templates for controller stick glyphs * * use reference to player input bindings instead of copy * * avoid double pressing 'start' when exiting settings/bindings menus * * replay commit lost in merge Co-authored-by: SheridanR <sheridan.rathbun@gmail.com> Co-authored-by: WALL OF JUSTICE <-> * join lobby button works * skipintro always recorded as true * remove SDLNet_ResolveHost / SDLNet_ResolveIP (#633) * isLocalPlayer() shenanigans * handle disconnect from remote server properly * remove SDLNet_ResolveIP from lobbyPlayerJoinRequest() (#635) * * fix crash click monster after death * * furniture magic damage fix not showing at all health values * * function to clear facehotbar conflicting bindings (allow LB/RB to be used without accidental usage) * * enemy HP bars set 2 parameters in HUD_Settings.json to quickly fade if HP 0 and you are close to the HP bar * * facemenu quickcast disable default * * add stick glyph paths for NX * * fix editor compilation * * fix backpack slots not being init to correct size if starting with brewer * * fix dummybot no world tooltip * * auto appraise enable default ON * * pressed states for sticks in getGlyphPathForBinding * * add a prompt for the expand/hide tooltip detail * add appraise functionality to gamepads * * more tooltip prompts on lang file * Lots o' cool stuff (#637) * remove SDLNet_ResolveIP from lobbyPlayerJoinRequest() * safeguards in createReadyStone() * fix bugs and shit * When server DCs in-game, clients get disconnect prompt * fix issues starting games on clients * disable test lobby entries * yet more lobby browser improvements * minor changes * hack to make FP whip animate better * console variable on whips (default false) * port number settings works restore defaults in settings works better * More Misc fixes (#636) * * furniture magic damage fix not showing at all health values * * function to clear facehotbar conflicting bindings (allow LB/RB to be used without accidental usage) * * enemy HP bars set 2 parameters in HUD_Settings.json to quickly fade if HP 0 and you are close to the HP bar * * facemenu quickcast disable default * * add stick glyph paths for NX * * fix editor compilation * * fix backpack slots not being init to correct size if starting with brewer * * fix dummybot no world tooltip * * auto appraise enable default ON * * pressed states for sticks in getGlyphPathForBinding * * add a prompt for the expand/hide tooltip detail * add appraise functionality to gamepads * * more tooltip prompts on lang file Co-authored-by: WALL OF JUSTICE <-> * Fix minor compilation issue * * start status fx * * change a binding to non-ref * * callbacks to deselect active selection on charsheet - stop 'A' press failing * * WIP status effects * * turn works in inventory * * refactor playerRequiresBlood and hunger interval getting for insectoid players to play messages consistently with status effect icon * * fix client items pregenerated on ground not having tooltips * * status effect JSON load up on boot * misc definitions for status effect queue * * fix logic for hunger interval function * * most of status effect code implemented, split among all players * opacity functions for tooltips fix windows being partially visible in high FPS (200+) * new bless/curse backgrounds WIP * * deprecate old hunger icon/effect list * deprecate old getStatusEffectSprite in favor of new status effect definitions * replace enemy HP bar status effect icon with new functions * * serverUpdateEffects for tins - make sure called after hp/mp regen * * individual master frames for each player to enable/disable whole screens * disable status effect tooltip on selected item or dropdown active * * lang entries for ui nav character sheet * * drop gold takes player as argument for splitscreen * * misc character sheet tooltip positioning for splitscreen, and dropdown for gold on gamepad * add new 'A' prompt on character sheet for controller to activate widgets * fix flickering onclick for items/magic/status buttons on UINav * * move global player HUD frames outside of ingameHUD() func, to properly read intro variable * * frames add mouseActive guards around mouse detection, in splitscreen was issues when a non-kb player has a selectable widget open, then the actual mouse player can't select anything due to it being result_t.usable = false by another player * Hook up cutscenes (#639) * hook up cutscenes * Steam player count bugfixes * Always open the first player's controls in bindings menu * fixed most of the hijinks with messages getting cut-off and bad message placement * fix a few more message hijinks * disable descending messages by default * fix issues with the minimap and log appearing too large in splitscreen fix certain walls getting aggressively culled around tight corners * find console commands with Tab key left aligned log text not occluded by backpack * shared minimap * remove a lot of mainsurface crap leaderboard stuff fix randomize class setting female incubus / male succubus /staggeredsplitscreen, /clippedsplitscreen, and /setupsplitscreen cmds * uint32 color defines are now constexpr, don't require SDL_Surface& * remove all remaining references to mainsurface * leaderboards menu opens * Fix WING packet being too short on send actMonster() returns immediately if cutscene is active * Messages for disconnected players fade * * fix merge conflict * * fix namesays for actMonster (mysterious shopkeeper) * * fix mainsurface still in code * * reset status effect queue if in intro * automaton hunger status effect - remove old from drawStatus * automaton low boiler has -STR -PER at critical level, instead of normal hunger rules modifying STR/DEX/INT/PER, no effect when hunger disabled * * camera lerp - add auto adjust based on frametime if low fps. Maybe helps overshooting during stutters * * hpmp bar flashing, add dividers to HP bar * * add dividers back to MP, reduce dividers from 25/50/75 to 33/66 then 50 percent if minimum width not achievable * * mana flash adjustments - add animation to flashing tip * * spell list new assets make positioning adjustments, also mini slider * * add linetrace to world tooltips to stop detecting through walls * * fix book display font size to proper 32 pt * * useItem doesn't try to sell/offer to shopkeepers anymore, dedicated function for that * deprecate some GUI_MODE_SPELL stuffs * * shopkeeper sort item inventory by price descending on generation * * items have flag to denote if they were sold to a shopkeeper * * many new shop UI elements * * fix typo in shop string * add new shop strings * * shop navigation, buying/selling works * * more shop fields filled in, minor resizing and adjustments to fit all content * * remove spells forcebolt/lightning/fire having their base damage lowered - it actually redefines the element->damage and is permanent for the game session * Leaderboards (#642) * fix max printed messages, message trimming logic * leaderboards WIP * pasting text into input buffer does not overwrite existing text * version string includes date + steam player count updates every 5 secs * leaderboard improvements * polish leaderboards * leaderboards polish and other stuff * Prompt user to play tutorial on first try * minor fix * Online Leaderboards * fix minor issues * use gnu compilers instead of clang for CI * use g++ instead of clang++ * disable achievements wherever map hash check fails * minor fixup * fix compile issues * * many shop changes - networking works * fix quivers not being fully purchased by multiplayer clients * mysterious shopkeeper done? * * shopgui push changes before remove old code * * clean up old shopkeeper code, shopspeech now is std string * * console var to debug frame searches * * grey out unsellable items to shop * item property "UNSELLABLE" from item tooltips prevents selling orbs to general stores * add shop name/type fields * skillsheet trading show same values as in shop (normalized around 100%) * * fix old shop strings to align into new textboxes * * tidy some commented shop code * * more shop lang entry adjustments to new size * * deprecate sellitem variable * * succubi shop line change to peoples * * fix shop flicker when releasing items * test buying item only raising trade skill * * let shop deny cursed equipped item and play 'can't remove text' without returning early * * fix nosteam compilation, add static keyword to help some lambdas compile * * hunger icon fix to new width 76px not 64px * * remove some debug for charsheet tooltips * * add hotkey for skillsheet * * fix game timer positioning of tooltip + being selectable in compact view * * fix deselect on mp rgn button * * fix random monster picking for polymorph/summontrap targets * * minotaurs can walk thru boulders * * fix itemPickup not preserving variation of items when de-duplicating stack * fix appraisal not preserving variation of items when de-duplicating stack * * feather repair spellbook preserve x/y position of new item * * shopkeeper gold reserves go down when they buy items * remove debug key from shop gui * * tinkering WIP * widget add isToBeDeleted() function * * tinkering WIP * * wip * * bump text remove hp/mp from text * * wip * Shops (#644) * * fix book display font size to proper 32 pt * * useItem doesn't try to sell/offer to shopkeepers anymore, dedicated function for that * deprecate some GUI_MODE_SPELL stuffs * * shopkeeper sort item inventory by price descending on generation * * items have flag to denote if they were sold to a shopkeeper * * many new shop UI elements * * fix typo in shop string * add new shop strings * * shop navigation, buying/selling works * * more shop fields filled in, minor resizing and adjustments to fit all content * * remove spells forcebolt/lightning/fire having their base damage lowered - it actually redefines the element->damage and is permanent for the game session * * many shop changes - networking works * fix quivers not being fully purchased by multiplayer clients * mysterious shopkeeper done? * * shopgui push changes before remove old code * * clean up old shopkeeper code, shopspeech now is std string * * console var to debug frame searches * * grey out unsellable items to shop * item property "UNSELLABLE" from item tooltips prevents selling orbs to general stores * add shop name/type fields * skillsheet trading show same values as in shop (normalized around 100%) * * fix old shop strings to align into new textboxes * * tidy some commented shop code * * more shop lang entry adjustments to new size * * deprecate sellitem variable * * succubi shop line change to peoples * * fix shop flicker when releasing items * test buying item only raising trade skill * * let shop deny cursed equipped item and play 'can't remove text' without returning early * * fix nosteam compilation, add static keyword to help some lambdas compile * * hunger icon fix to new width 76px not 64px * * remove some debug for charsheet tooltips * * add hotkey for skillsheet * * fix game timer positioning of tooltip + being selectable in compact view * * fix deselect on mp rgn button * * fix random monster picking for polymorph/summontrap targets * * minotaurs can walk thru boulders * * fix itemPickup not preserving variation of items when de-duplicating stack * fix appraisal not preserving variation of items when de-duplicating stack * * feather repair spellbook preserve x/y position of new item Co-authored-by: WALL OF JUSTICE <-> * Skr/online lobbies (#645) * a bit of lobby browser stuff * lobby browser stuff * steam lobbies?? * syntax errors * bugfix crap * update lobby data * steam lobbies work???????? * random stuff * server fix for steam lobbies???? * asdf * skipjoin fixes * steam lobbies work * fix server not sending shutdown signal to all clients * /resizegui command * fix _virtualScreenY definition * shorten name on player ready card * net fixes * suicide commands + end life works in multiplayer * fix lobby disconnect (?) * fix disconnecting from lobby for real (???) * fix sendPacket / sendPacketSafe * delete steamIDRemote entries in closeNetworkInterfaces() * Better disconnect messages * hostHasLostP2P error message * fix stupid typo * error messages when steam lobby join fails EOS update to latest sdk * extern template class ConsoleVariable<> types * fix CI * go back to GCC again for CI * bugfixes initialize hotbars of splitscreen players correctly fix name not updating when reducing length fix (?) server softlocking in lobby when REDY packet received late * savegame stuff * UI scaling improvements * upscale_ui defaults false * uifilter console variable * ui fiddling * add gameover window * fix misplaced pause menu options * * tinkering allow grabbing items while using kit * finish dpad tinker navigation cases * * lots of tinkering functionality, update animations * Add .gitignore * added testfont command * renamed splitscreen cvars: /split_staggered, /split_clipped, /split_clipped_percent (new), /split_refresh * fix issue with splitscreen viewport clipping fix gameover window only appearing if all players die fix issue with camera occlusion frustum being too small in vertical splitscreen * fix issues with gameover window * fov stuff * purple gameover window * * frame allow deletion of disabled frames * * many tinkering additions to UI, bugfixes * * add getColor for buttons * * fix merge conflict in shopkeeper gold * * gitignore update * * New tinkering lang entries * Bump player removed HP/MP display from text * * merge conflict fix * Obituaries (#647) * rebase * fix eos build * Misc Cleanup (#648) * * fix up cursor_hand alignment * * add openGL vendor info in log on boot * * export high performance NVIDIA/AMD variables on windows to auto-select high perf gfx * * hide old tinkering ui * robots have health percentage in tooltips and tinker ui * misc clean up * * missed a bit old tinkering menu removal Co-authored-by: WALL OF JUSTICE <-> * fixed issues with gameovers and restarts * restart packet fix Co-authored-by: WALL OF JUSTICE <-> Co-authored-by: WALL OF JUSTICE <bpot055@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.