summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
25 hoursbuydialog: Add free weight display to money labelshopping_list_weightFedja Beader1-10/+12
+ fix free weight going below 0
8 daysAdd total weight accounting for the "shopping list" of herc shops.Fedja Beader2-1/+13
.. this will prevent the shopping list from going above your free carry weight, and thus the buy action failing. Note: I don't particularly like this implemention, plus it's not well tested yet. TODO: 1) add the same for total price 2) maybe do a small refactor + add comments where necessary
11 daysREADME.md: clarify that clicking on badge takes one to last good build.Fedja Beader1-2/+2
2025-03-13Clean-up and optimise ActorManager::findMostDamagedPlayerFedja Beader1-15/+21
Cheaper checks reordered to be checked first, removed squared root. **** mana/plus!144
2025-03-13Show quantity for item qty 1 in limited stock shopsFedja Beader1-1/+1
(no quantity display reserved for unlimited stock shops) Depends on !140 due to merge conflicts. **** mana/plus!141
2025-03-10Speedup ActorManager::findNearestByName by testing cheap bounding box ↵Fedja Beader1-9/+8
distance before (potentially) asking pathfinder. Pathfinder may get called in the validateBeing() call, can't tell yet. Squashed with: * Fix linter This test and the below static_cast looks like dynamic_cast should've been used. **** mana/plus!143
2025-03-10Cosmetic cleanup of ActorManager::pickUpNearestFedja Beader2-13/+13
Squashed with: * Fix lint.. just revert previous state, I'll deal with it when I make things pass Positions **** mana/plus!142
2025-03-10Slight cleanup in shopitem.cppFedja Beader1-6/+8
**** mana/plus!140
2025-03-05Rename --without-manaplusgame to --without-gameclientFedja Beader26-202/+202
@jesusalva asked what to rename it to, here: https://forums.themanaworld.org/viewtopic.php?t=21691 Squashed with: * Rename --without-manaversegame to --without-gameclient This makes the most sense, I think. Jes agrees, too. * Rename --without-manaplusgame to --without-manaversegame Split off from !45: Rename the program from ManaPlus to ManaVerse. **** mana/plus!138 Co-authored-by: jak1 <jak1@themanaworld.org>
2025-03-05Change follow-parent default to true (Fix #80).Fedja Beader1-1/+1
Reported by Thorbjorn **** mana/plus!129 Approved-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
2025-03-05Rename manaplus source directories and headers to manaversejak120-49/+49
Split off from mana/plus!45: "Rename the program from ManaPlus to ManaVerse." +POTFILES.in CI fix **** mana/plus!132 Co-authored-by: Fedja Beader <fedja@protonmail.ch>
2025-03-05Remove pointless one-line StatusWindow::addTabBasic() functionFedja Beader2-10/+3
**** mana/plus!139
2025-03-01Report missing/unknown attr fields in clientdata stats.xmlFedja Beader1-4/+8
This makes sure that ml/clientdata!180 never happens again via message in Debug tab. The legacy numeric ID method could be deprecated. Maybe after release. The client uses full attribute names since 2016. **** mana/plus!137
2025-02-26Rename log file manaplus.log -> manaverse.logjak16-12/+12
(Fedja) I'm suspecting that some CI will break on this. Split off from !45: Rename the program from ManaPlus to ManaVerse. **** mana/plus!135 Co-authored-by: Fedja Beader <fedja@protonmail.ch>
2025-02-26StatDB: deduplicate loadBasicStats(...) and loadStats(...)Fedja Beader1-47/+15
**** mana/plus!136
2025-02-26Remove stray continue, loop has no code outside of conditional branches.Fedja Beader1-1/+1
Tested as part of !136, pushed to master
2025-02-25Rename AttributesEnum::find to ::contains to match its meaningFedja Beader3-4/+4
**** mana/plus!134
2025-02-24Add POTFILES.in updater check to linter CI job.Fedja Beader4-5/+49
while processing mana/plus!132 I spotted what looked like an ommision of several src/progs/{manaplus,manaverse} files from POTFILES.in, but as it turned out, they have no strings marked for translation (start with "_("). Squashed with: * Just force LC_COLLATE=C and commit POTFILES.in changes required to make this happen. Don't know how to repro CI's sorting locally and it's pointless as my local sort is clearly wrong. See traderecv.cpp's position for why. * The correct locale variable to set should be LC_COLLATE, which is probably set by LANG on all platforms and so this will fail, again. * sort is still not preserving the order of files :/ * Ensure the order of files remains the same regardless of platform. * POTFILES update to pass CI :) **** mana/plus!133
2025-02-24added manaverse' copyright line to src/jak132-0/+32
Split from mana/plus!28 and rebased on master by specing. **** mana/plus!131
2025-02-24updated copyright -2020 for manaplusjak132-32/+32
In theory split out from mana/plus!28, in practice I (specing) just ran sed myself instead of bothering with splitting out changes. **** mana/plus!130
2025-02-22Update README.md & READMEFedja Beader4-65/+66
Squashed with: * Add build instructions link * CMake is unsupported (for now) * Change IRC link to irc-only channel. * Update text-only README to match * Make the point clearer. And, Bitbucket is dead by now? * Nah, I'll leave the strange statement about licensing and bad platforms in, for now. It's got a point! * Remove strange statement about licensing and bad platforms * Update note, change in-game support text * RIP FreeNode * Fix fix + add in-game "contact" * Reorganise the support section * Remove some duplicates and reword the command help section (which should probably be removed. This is not the 1985 any more) * Comment out nonfunctional CI badges * reorder builds and CI status * Remove version info.. it's 6 years old anyways. Wait... 6 years since last release?! * Shorten the CI status badges * Update main CI status button to point to pipelines page * Try more compact form on a single line (like before) * Add more direct download links when clicking CI status buttons * Add myself to AUTHORS * Change CI link to point to TMW gitlab + remove undress from help.. players don't need that. * Fix forum link - was pointed to general player talk and not https. **** mana/plus!127
2025-02-22Set C++11 as default C++ standardFedja Beader13-59/+60
Autoconf manual states that CXXFLAGS is a user variable and should not be overriden, so I did not use AX_APPEND_COMPILE_FLAGS for this. Thus, there are no checks if the compiler supports it, but also the builder can override this flag by passing another flag that overrides it on the command line. Okay, this is now way too theoretical. Indeed, the override happens with ./configure 'CXXFLAGS=-std=c++17' (both flags in final command line) Do note: - The standard was not explicitly set for some builds (thus compiler default was used) - The default on my own box is C++17 - I'm setting C++11 as that's required by my previous change. Upgrade to C++17 is deferred to until it becomes required. - The use of CPPFLAGS could be reviewed... they may be used incorrectly (instead of CXXFLAGS). I would really like to get all the builders going before requirements are raised. - CI cleanup would be nice - wish 4144 would return. **** mana/plus!128
2025-02-20Convert navigateTo to take a Position instead of two integers.Fedja Beader7-59/+54
Tile coordinates dance in pairs, so let's pair them up. also grows exe size by about 3K, hope this will go away when the rest is converted to Position as well. Note: on my local debug build only. Not on gcc10 CI. Squashed with: * Should it be mNavigateDest or mNavigateTo? Hmm, the jury is still out there ... **** mana/plus!116
2025-02-12Fix erroneous call in find that resulted in cpplint processing only *.cc filesFedja Beader1-10/+14
https://git.themanaworld.org/mana/plus/-/jobs/183682#L81 the ORs were not groupped together in the find call, resulting in only *.cc files being processed. > Total errors found: 3463 Well, this will take a while to fix :disappointed: . Squashed with: * Trim unnecessary excludes, for there is no matching error to exclude. Fine-tune the remaining ones. * The grep below wasn't working as find exited nonzero and code that was supposed to handle that wasn't working as well as expected **** mana/plus!126
2025-02-12Fix remaining cpplint error that was introduced while trying to satisfy ↵Fedja Beader1-5/+3
line-length limits. Introduced in mana/plus!88 and exposed in mana/plus!126 Pushing directly to master from top of !126 before merging 126.
2025-02-10Upgrade cpplint to latest releaseFedja Beader2-3/+6
+Update CI job from Debian Buster to Bullseye. Buster's Py3.7 is too old for cpplint. Squashed with: * Update linters job to debian bullseye * Force use of python3 * Try upgrade to python3. Other scripts will probably break. **** mana/plus!124
2025-02-10Properly fail the nsiqcppstyle part of the linters CI jobFedja Beader3-9/+19
From updating to buster->bullseye in !124: nsiqcppstyle was silently failing, too >_> Squashed with: * I always forget newlines at end of printfs. * Add sore thumb to remind me of untreated wounds beneath bandages * nsiqcppstyle was silently failing, too >_> *Explicitly call python2 *Grep will exit non-zero if it finds nothing. *fix* **** mana/plus!125
2025-02-10Properly fail the failing cpplint.py part of linters CI jobFedja Beader2-9/+15
Squashed with: * Split out change * Let's get this to properly fail, first. put unfiltered file name into a variable and append .log to make it viewable online + direct URL for cpplint.py like before IT's LOGFILE, not ERRFILE.. sigh Nevermind, it actually is ERRFILE + add unfiltered version to init Downgrade version, py3 later Let's get unfiltered log to print if find fails Related: mana/plus!122 **** mana/plus!123
2025-02-10Fix cpplint.py part of linters CI jobFedja Beader1-2/+4
Google has removed cpplint.py three weeks ago and this has been silently failing since then. See also mana/plus!123 **** mana/plus!122
2025-02-03Fix unable to switch to another character after -D (chooseDefault) is used.Fedja Beader1-0/+1
Addendum to !89 (and !117) Amusing: putting this line before the .clear() grows the exe by 40 bytes. **** mana/plus!118
2025-02-03Typofix: mShowNavigePath -> mShowNavigatePathFedja Beader2-5/+5
**** mana/plus!119
2025-02-03Trim whitespace at end of lineFedja Beader1-1/+1
**** mana/plus!120
2025-02-03Expose exe in artifacts and report its size in logFedja Beader2-0/+14
Sometimes we're curious about the impact of a change on code size, this might satisfy us. **** mana/plus!121
2025-01-29Trim too much newliningFedja Beader2-38/+10
Pointless change, I know. **** mana/plus!115
2025-01-28Fix typo chec -> checkFedja Beader3-5/+5
**** mana/plus!113
2025-01-28Fix typo: opitons -> optionsFedja Beader4-14/+14
**** mana/plus!114
2024-10-12Add dark magic to text command magic schools listFedja Beader2-4/+10
Further idea: a lot of these models are wrappers around a string options array. Maybe convert the classes into a single template class taking an array parameter? **** mana/plus!111 Approved-by: Led Mitz <smoothshifter@tuta.io>
2024-10-11Move trade filtering setting to immidiately under trade tab & fix ↵Fedja Beader1-10/+9
description/tooltip. **** mana/plus!105
2024-10-11Introduce a kludge to deduplicate server type strings.Fedja Beader2-39/+23
**** mana/plus!104
2024-10-11Add confirmation dialog for leaving guildFedja Beader3-2/+39
Memory may not be freed properly, also code is IMO ugly. See !109 for the other way of implementing this (unrelated). Was done in socialWindow as the join confirmation is already there. **** mana/plus!110
2024-10-11Remove redundant nullptr checkFedja Beader1-1/+1
Curiously, this increases -g -O2 exe size by 96 bytes, but disassembly dump around this code is the same (redundant check was already optimised out?) **** mana/plus!106
2024-10-11Fix switchmap during switch character crash (@toevent)Fedja Beader1-1/+6
use @toevent, then switch character (and stay on character screen). Thread 1 "manaplus" received signal SIGSEGV, Segmentation fault. 0x.. in Game::getCurrentMap (this=<optimized out>) at ./game.h:108 108 { return mCurrentMap; } (gdb) bt 0x.. in Game::getCurrentMap (this=<optimized out>) at ./game.h:108 Ea::PlayerRecv::processMapMask (msg=...) at net/ea/playerrecv.cpp:242 **** mana/plus!108
2024-09-23Show MP bar below HP barewew ukek4-4/+49
Adds a light blue bar for MP below player's HP bar. It shows only if M.Atk is above 0. I didn't add a checkbox to the settings to disable this, let me know if I should. Squashed with: * Sneak in another TODO * Sneak in a TODO **** mana/plus!68 Co-authored-by: Fedja Beader <fedja@protonmail.ch>
2024-09-20Move move-specific keybinds from basic to move section of SETUPFedja Beader2-18/+18
Move to target & move to target type intentionally kept in basic's targetting section. **** mana/plus!103
2024-09-19Rename server types - Test_User spent time figuring out why herc doesen't ↵Fedja Beader1-3/+3
work for ML Squashed with: * Sync with last comment (Evol->Evol2) * Another rename, to reflect TMW->Manasource rebrand (maybe?) **** mana/plus!79
2024-09-19Horizontally extend the login screen server type selection boxFedja Beader1-1/+9
Split from mana/plus!79
2024-09-08Quote all the variable expansionsFedja Beader1-60/+60
Squashed with: * More quoting, but these are likely unnecessary [^"x]$[a-zA-Z] [^"]x$[a-zA-Z] **** mana/plus!98
2024-09-08Refactor outfit saving logicFedja Beader1-13/+23
Shaves some bytes from exe, too **** mana/plus!102
2024-09-07There is no need to first pack this into a vector and then into arrayFedja Beader1-17/+4
TODO: are all these casts actually required? SMH **** mana/plus!101
2024-08-28Fix off-by-one causing archer attack mode to approach to within attack range - 1Fedja Beader3-17/+18
**** mana/plus!96
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-04 14:53:06 +0000