2
3
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 14:37:41 +00:00
Commit Graph

484 Commits

Author SHA1 Message Date
516c0f7ed0 Merge H-uru GIT PR356: PNG support for mipmap 2020-01-12 10:40:58 -07:00
651ca61b4c Change Huru 'nullptr' to NULL in plMipmap.cpp 2020-01-11 16:41:47 -07:00
cc9e2331ee Merge in PR#49: Vs2010
Adjustments to MSVC10Projects to build under VS2010
2020-01-11 15:02:44 -07:00
73895318e9 Change Huru 'nullptr' to NULL in plMipmap.cpp 2019-11-21 14:48:53 -07:00
3a62c231d2 Merge H-uru GIT PR356:
Adam Johnson committed 48ad646 on 15 Jan 17
Manually merge #356 Merge remote-tracking branch 'deledrius/plMipmap_png'
2019-11-21 13:54:54 -07:00
4239d7a046 Add plFileEncrypt, plFileSecure, and plPythonPack projects to "MSVC10Projects" AllClient.sln 2019-11-03 19:26:29 -08:00
d173a5230f Remove pfCCR project files from "MSVC10Projects" and remove project from AllClient.sln. 2019-11-03 19:24:17 -08:00
8706a86725 Add missing PhysX Cooking include directory to plPhysX project in "MSVC10Projects". 2019-11-03 19:21:04 -08:00
8418dd54a5 Merge in H'Uru/Plasma PR 533 (PR#47) 2019-10-26 10:07:33 -06:00
4ab5fe5fed Merge rarified/gameserverportfix (PR#43)
Add Doxygen work directory to .hgignore
2019-10-26 10:05:52 -06:00
148e81b6e9 plClient uses filters instead of AdditionalDependencies in the linker properties (unlike plPageOptimizer). 2019-10-26 03:51:24 -05:00
06a696c725 Forgot to add NxCooking.lib to linker for plClient and plPageOptimizer projects. Adding it. 2019-10-26 01:35:22 -05:00
a49cb6eb1f Backport of H'Uru/Plasma PR533 - Implement a generic hull/trimesh collider format.
PhysX requires all of its actors to have cooked mesh data. This cooked
data is unfortunately not compatible with other versions of PhysX outside
of the minor branch. The format is also largely unknown. Therefore, it is
relevant to allow CWE prps to include an engine agnostic physical format
to reduce our dependencies on proprietary libraries.

All PhysX blobs thankfully begin with the magic string NXS\x01, so we now
abuse that by adding our own format that begins with the magic string
HSP\x01. These blobs are cooked on the fly while already cooked blobs are
passed directly on to PhysX.


Original commit: 392c5f5cad
author = "Adam Johnson <AdamJohnso@gmail.com>
2019-10-25 02:43:37 -05:00
0d518e3465 Merged branch to PR #42 including login hash from mdeforest 2019-03-31 16:31:06 -06:00
92e95d5a99 Add function NetCliAuthGetCurrentConnPort() to plNglGame to provide current Auth
server port to Game client connection code.

For use where non-default port is being used for Auth/Game servers.
2019-03-16 14:34:19 -06:00
8960d0b406 Merged in mdeforest/changed-password-hashing-to-try-sha1-fir-1492090943988 (Pull Request #42) 2017-05-15 15:30:16 -06:00
c888e43c73 Cleaned up password hashing to try SH1 then SH0. More comments and easier to modify. 2017-05-12 11:28:11 -07:00
947a64c05f Changed password hashing to try SHA-1 first and if that doesn't work then try SHA-0. This should allow shard owners to chose either SHA-1 or SHA-0 for their password hash without interfering with other shards. And allow them to change their password hash without requiring everyone to reset their passwords.
This also allows for future expansion of new hash techniques to be added, of course the more hash techniques added the more delay at login for the lowest on the totem pole.
I have tested this against the MOULa shard that uses SHA-0 and it works, there is a slight flash of the "Connecting dialog" as it re-tries sending the login but if the user saves the password, there is no flash and no delay.
2017-04-13 13:42:50 +00:00
627825dab2 Merged in mac_fife's nonemail_password_has (pull request #40) 2017-03-22 14:56:19 -06:00
207bf3d62e Make all account types use the same password hash. Precursor to restoring MOULa account creation. 2017-03-18 19:09:16 +00:00
791886bdab Merged in cwalther/cwe/launcherstatusmessagecrash (pull request #38)
Don't crash the launcher when the HTTP request for getting the server status message fails

This should fix the crash in UruLauncher.exe after starting UruExplorer.exe, reported by Treehugger at http://forums.openuru.org/viewtopic.php?p=8976#p8976 . It is the same issue as addressed in pull request #31 for the login dialog.

Untested because testing it is hard when the launcher patches itself out.
2017-02-18 16:21:28 +01:00
b74e9f47bb Don't crash when the HTTP request for getting the server status message fails.
Same thing as 82d9c3a57879, more or less.
2017-02-17 22:54:30 +01:00
1ab6781402 Merged in cwalther/cwe/setpublic (pull request #35)
Let ptVault.setAgePublic accept ptVaultAgeInfoNode in addition to ptAgeInfoStruct

In this case it now also works for non-owners of the age. Previously it only worked for owners because the ageInfoStruct does not contain the vault node ID, so it needed to be looked up somewhere, and that was in the AgesIOwnFolder.

Prerequisite for hood auto-bump (MOULSCRIPT-ou PR #22).

From H-uru/Plasma#461.
2015-04-03 23:10:31 +02:00
d8a5f03e9c Merged in cwalther/cwe/textrendering (pull request #36)
Shadowed Chat and Player List Text

This implements the (existing but unimplemented) plDynamicTextMap::kFontShadowed flag, making the text of the mini KI (player list and chat) better readable on light and patterned backgrounds.

For best results, an additional Python change is recommended: MOULSCRIPT-ou PR #23.

From H-uru/Plasma#392.
2015-04-03 23:09:00 +02:00
2abd744ba6 Merged in ian_mcintosh/cwe-ou/lostlogins (pull request #33)
Fix for forgotten logins when removable media attached.

Incorporated suggestions from PR #32 which this replaces. Moved CloseHandle as suggested.

Addresses JIRA CWE-37 Corrects incorrect assignment of drive letter to the drive actually being interrogated and ignores removable drive types such as CD/DVD and USB Flash and HDs.

Alternative solution that moves login credentials to the registry is being prepared by Deledrius - H-uru/Plasma PR#448 may be a better long term fix - I'm simply offering what I have.
2015-04-03 23:08:09 +02:00
2e73c3667a Merged in cwalther/cwe/statusmessagecrash (pull request #31)
Don't crash when the HTTP request for getting the server status message fails

This fixes the crash that keeps Windows 7 users out of the game when support.cyanworlds.com is down, reported with some regularity e.g. at http://mystonline.com/forums/viewtopic.php?f=40&t=27352 .

Apparently on Windows 7, unlike on Windows XP and contrary to its documentation, WinHttpReadData() does not zero its lpdwNumberOfBytesRead argument when called with an invalid request, so the lack of error checking here bites.
2015-04-03 23:07:05 +02:00
4eb7810d81 Merged in Lyrositor/cwe-ou/scroll-position (pull request #26)
Add functions to fix KI Chat scrolling issue.

These two Python/Plasma functions are used in the moul-scripts fix for the scrolling KI Chat issue.

It must be pulled in before https://bitbucket.org/OpenUru_org/moulscript-ou/pull-request/19
2015-04-03 23:03:29 +02:00
0b9bcc3e91 Merged in cwalther/cwe/bink-stub-2 (pull request #37)
Fix stuck-in-intro-cave bug

This reintroduces the plBinkPlayer stub removed in 8a1346b in order to fix the bug where a new player is stuck in the intro cave with the rotating wall until it occurs to them to press the esc key.

I have not spent much effort on checking that this is the correct and minimal change but it appears to work for me.

This is a quick fix, the definitive solution will be to port VP9/Opus support from https://github.com/H-uru/Plasma/pull/458.
2015-04-03 23:02:21 +02:00
343c6ffbda Reintroduce plBinkPlayer stub
and reenable as much USE_BINK_SDK stuff as empirically needed to get the Yeesha intro movie cave to disappear on its own, as before merging Cyan's Build 918.

Not the cleanest way, but I'm trying to minimize effort spent on this until we can get the proper solution, VP9 video support, from https://github.com/H-uru/Plasma/pull/458 .
2015-02-13 22:42:13 +01:00
c68640f76c winmain.cpp edited online with Bitbucket 2014-12-25 22:52:25 +00:00
ce5719c83f Let ptVault.setAgePublic accept ptVaultAgeInfoNode in addition to ptAgeInfoStruct.
In this case it now also works for non-owners of the age. Previously it only worked for owners because the ageInfoStruct does not contain the vault node ID, so it needed to be looked up somewhere, and that was in the AgesIOwnFolder.
2014-12-25 00:26:39 +01:00
c71e8fbee0 Fix for forgotten logins when removable media attached. Incorporated suggestion from previous PR #32 on OpenUru_org/CWE-ou 2014-10-14 18:45:30 +01:00
21e2a6de7b Fix MSVC7 warnings. 2014-08-23 21:10:55 +02:00
8b62863419 Don't crash when the HTTP request for getting the server status message fails. 2014-08-15 20:19:38 +02:00
9c609b9fd8 Modulate text shadow opacity by the alpha of the text color to make the player lists fade properly.
Also, the text of the faded-out player list is re-rendered with alpha == 0 every time the mouse enters its area, do a little less needless work in that case.
2014-06-07 18:22:41 +02:00
d1c86267b3 Const getters 2014-04-25 12:17:47 +02:00
6b2dedf547 Make font flags available to Python in PlasmaConstants. 2014-04-12 10:22:07 +02:00
192e4a252c Fix comment Hoikas 2014-04-25 11:57:33 +02:00
c0b63e4237 Fix ptGUIControl.setFontFlags().
Previous revision didn't work, many controls retained their shadows because they never got the new flags from the color scheme and put them into the dynamic text map. I haven't checked if any more of the many control classes are affected, but those that we need in the KI right now are covered.
2014-04-10 22:59:37 +02:00
020f8a1ba0 Move methods to pyGUIControl to pyGUIControlTextBox. 2014-04-09 11:21:28 +02:00
39ff487ca8 add python api to set flags
Clean up unwanted changes caused by IDE extension -.-

Reworked implementation
2014-04-01 16:38:12 +02:00
a0bbef1819 Undo the kRenderJustXForceLeft bugfix of 4 commits back.
The fix (adding adjustment of fRenderInfo.fDestPtr) made kRenderJustXForceLeft behave as intended (left-aligning the edge of the bitmap rather than the side bearing of the first character) but cuts off shadows in some places (e.g. at the left edges of "BUDDIES" and "NEIGHBORS" in the mini KI). To ensure enough space for the shadow, and considering that all content was developed and visually optimized with the bug in place, it seems better to preserve the buggy behavior and make kRenderJustXForceLeft work exactly like kRenderJustXLeft.
2014-04-06 17:19:42 +02:00
5f5dd2745f Restore include paths and libraries for WinHttp and Ogg/Vorbis, eliminated by the conflict resolution in 8a7d72003333
Should work for Cyan too because plClient uses the same libraries.

I wonder what the purpose of the Release_Patcher configuration is and whether we should be using that one, which already has all this stuff (with slight differences).
2014-01-02 12:36:17 +01:00
6ebf8ae3a3 Restore the OU changes to AllClient-ou.sln that were lost in AllClient.sln 8a7d72003333/e7bb0959f189
- Remove plCyDebug and NetDiag which we don't have (from ef365800375c)
- Remove pfCCR which we no longer have (since 791583dea277)
- Add plUruLauncher and plClientPatcher (from ef365800375c)
- Add plFileEncrypt, plFileSecure, plPythonPack (from f3497c6d7f6d)

I also took the liberty of restoring the post-build copy step for plFileEncrypt and plFileSecure. If Cyan doesn't want that, we can probably put it in a separate project that is only part of AllClient-ou.sln but not AllClient.sln.
2014-01-02 11:24:15 +01:00
9ea22b7f65 Copy AllClient.sln to AllClient-ou.sln
(separate commit since when copying and modifying in the same commit, hg doesn't seem to show differences)
2014-01-02 10:48:37 +01:00
015acf9c7f Link DX libraries using library search paths rather than by their full paths, as for some reason Cyan appears to have them in DX9.0c/Lib while we have them in DX9.0c/Lib/x86. See also e7bb0959f189. 2014-01-01 23:55:31 +01:00
5a10e2095a Link eax.lib and eaxguid.lib using #pragma comment(lib) rather than naming them in the linker options (brought back by e7bb0959f189). This is evil, but in the absence of more appropriate features (vsprops) in VS 2003 allows us to avoid separate projects or configurations for the cases with/without EAX and all the duplication that would bring with it.
Needs testing by someone who has EAX.
2014-01-01 23:36:09 +01:00
8096f8b77d Restore parts of pfCCR that are still needed by other projects, undoing part of 791583dea277:
- plCCRMgr.h which is still needed by plAvatarMgr.cpp (plCCRError only - if there is more in this file at Cyan, that definition should be split out into a separate header)
- Stubs for pyCCRMgr{|Glue|Glue2}.cpp which are still part of the pfPython project as well as pfCCRConsoleCommands.cpp which is still part of the pfConsole project. This is under the assumption that these files still exist with nontrivial contents at Cyan - if not, they could just be removed from the projects. Requires adjustment by Cyan to build with PLASMA_CCR_RELEASE.
- Put more missing includes and calls under #ifdef PLASMA_CCR_RELEASE
2014-01-01 21:14:13 +01:00
68f59ef839 Restore OpenAL include paths that were eliminated by the conflict resolution in 8a7d72003333.
Should have no influence when building with EAX_SDK_AVAILABLE.
2014-01-01 18:17:23 +01:00
b0b8ed6306 Remove preprocessor definition EAX_SDK_AVAILABLE, undoing most of 52c6f0317f79
Those who have the EAX SDK should indicate this on the command line by adding /DEAX_SDK_AVAILABLE to environment variable CL.

Trying to keep common project files and configurations between OU and Cyan for now, we'll see how that goes.
2014-01-01 12:25:56 +01:00