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

200 Commits

Author SHA1 Message Date
21e2a6de7b Fix MSVC7 warnings. 2014-08-23 21:10:55 +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
3825317e5e Link shadowed text rendering to the plDynamicTextMap::kFontShadowed flag.
Conveniently enough, this existing but unimplemented flag is already set mostly the way we want it in the current PRPs.
2013-07-04 20:13:03 -04:00
b343e389ab Implement shadowed text rendering.
Intended to make KI text (player list and chat) better readable on light and patterned backgrounds. In this WIP, all text on GUI controls is rendered shadowed.
2012-01-25 22:16:19 +01:00
e02141055a Use premultiplied alpha for plDynamicTextMaps on GUI controls.
This fixes the irregular dark fringes around light text when not exactly pixel-aligned that are caused by independent interpolation of color and alpha. It also makes calculations simpler for things to come.
2011-12-30 15:10:47 +01:00
1f0277e3e0 Pixel-accurately clip characters to the available space instead of omitting whole characters that stick out.
In addition to being a prerequisite for shadowed text, this also fixes an issue sometimes seen at the bottom of the mini KI player list where characters with a descender were missing.
2014-04-03 22:17:45 +02:00
db5e451622 Fix #303 2013-07-04 18:14:58 -04: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
189c9b0221 Merge MOULa build 918 from Cyan
Too many changes to describe in detail, see commits on parent branch build918chunks.
Some of them break buildability outside of Cyan, to be fixed in subsequent commits.

Merge conflicts in some .sln and .vcproj files all resolved by taking the Cyan version.
2014-01-02 23:43:54 +01:00
9743c73a44 Remove Bink stubs in anticipation of cyantific debinkification 2014-01-02 23:34:39 +01:00
f50eaba306 Remove some apparently needless differences to Cyan's projects (from ef365800375c) 2014-01-02 23:31:38 +01:00
e0b363f3a2 Merge Cyan's monolithic Build 918 commit and its broken down version.
No differences to either parent to indicate that the two are identical.
2013-12-31 16:57:05 +01:00
7bc602870d Build 918 chunk 17: Define EAX_SDK_AVAILABLE
MarkD: My thought was for the long term was to put most of the differences in the project and solution configurations, so there would be less differences in the sources. EAX is a good example - I put the #define for EAX_SDK_AVAILABLE in the projects that used it with the thinking that the fans would create new projects that would not have EAX_SDK_AVAILABLE and would create and use a different configuration in the AllClient solution. Cyan would use the "Release" config and the fans use something like "Release-ou" to build with. But maybe there are just too many differences.
2013-12-31 16:21:33 +01:00
e37277050d Build 918 chunk 16: Remove Bink references from projects, enclose uses of video functionality in #ifdef USE_BINK_SDK
MarkD: We felt that the fan de-BINKing did not go far enough.
CW: I suspect (haven't tested yet) that it's the cause of the bug that we see on MOULa but did not on Minkata where the rotating wall behind the missing Yeesha intro video stays indefinitely, with no obvious way out for the player, until it occurs to them to use the ESC key
MarkD: Ah. I think you are right. An oversight that can be easily corrected - maybe in the python code so that Ian can see the rotating wall for a few seconds and then auto continue on.
2013-12-31 16:10:39 +01:00
a270bbbe5c Build 918 chunk 15: Miscellaneous odds and ends 2013-12-31 15:55:52 +01:00
660f19a72a Build 918 chunk 14: Change dx9.0csdk and dx8.1sdk paths to DX9.0c 2013-12-31 15:48:49 +01:00
f2dd437321 Build 918 chunk 13: Define NX_PHYSICS_SDK_VERSION 2013-12-31 15:42:46 +01:00
47b02dfc68 Build 918 chunk 12: Change CLASS_C_SUBNET_MASK
MarkD: Used in the server code.
2013-12-31 15:41:01 +01:00
0525163e56 Build 918 chunk 11: Unconditionally enable LogMsgDebug()
MarkD: This is used in the server code.
2013-12-31 15:35:35 +01:00
2cabf18bfa Build 918 chunk 10: Remove pfCCR 2013-12-31 15:32:02 +01:00
31fd3e28c7 Build 918 chunk 9: Remove empty folders plGClip, Cypython, PythonLib 2013-12-31 15:27:27 +01:00
071410a4d8 Build 918 chunk 8: Add OpenSSL include folder, replace libcrypto.a by libeay32.lib
CW: This probably has to do with changing from dynamic to static linking of OpenSSL.
2013-12-31 15:22:48 +01:00
a72cbd9248 Build 918 chunk 7: Add project plPluginJPEG and use it in AllDlls.sln
Copy of plJPEG with added preprocessor definition IJL_SDK_AVAILABLE.

CW: I'm guessing that's the workaround for the missing JPEG textures issue we found during the 918 update verification.
MarkD: Exactly.
2013-12-31 14:47:01 +01:00
bb96412ffc Build 918 chunk 6: Use libjpeg instead of IJL 2013-12-31 14:32:37 +01:00
c30992af4d Build 918 chunk 5: Adjustments to updated zlib+libpng 2013-12-31 12:49:08 +01:00
ff38a5f9d2 Build 918 chunk 4: Build number, release notes 2013-07-27 18:18:01 +02:00
1ba92e5a66 Build 918 chunk 3: Add plClientResMgr where forgotten in CWE-ou 2013-07-27 18:16:57 +02:00
ece6e6c063 Build 918 chunk 2: update from CWE-ou 2013-07-27 16:57:46 +02:00
c8611a072b Build 918 chunk 1: Revert MsDevProjects to (almost) the state of build 906 (0a67197a0c11)
Except for the addition of the plClipboard project, the partial CWE-ou state that was mistakenly taken into CWE in "Build 912" (a757a1fda0a3) was never actually used to build MOULa products.
2013-07-24 22:22:58 +02:00
46a0cf6206 Build 918 2013-07-05 15:28:19 -07:00
3b89e66d2d Tag begin and end of the submission to Cyan 2013-04-25 12:58:11 +02:00
f44eea59b9 Merged in cwalther/cwe/window-cursor (pull request #25)
Free the cursor, update

Updates to pull request #21 by Hoikas that fix the issue that quick mouse moves while walking/looking by mouse could get the cursor out of the window and break the continuous turning.

From H-uru PR #221 "Window fixes".
2013-04-12 20:41:04 +02:00
499432b4f0 Merged in Lyrositor/cwe-ou/exploit-fix (pull request #24)
Fix remote code execution through Python.Cheat and Python.RunFile

An exploit fixed by boq. Original pull request: https://github.com/H-uru/Plasma/pull/218
This somewhat modifies the syntax used for running Python.Cheat; it's still easier to use it directly in Python, though.
2013-04-12 20:39:04 +02:00
bb044d2932 Merged in Skoader/cwe-ou/avatar-spawn (pull request #22)
Fix intermittent spawn bug

This fixes missing quabs in Ahnonay.
2013-04-12 20:16:30 +02:00
96ae8a88ed Merged in Skoader/cwe-ou/avatar-physics (pull request #20)
Avatar physics update

A significant and much needed cleanup of the avatar physics code. It resolves numerous issue with and greatly simplifies the physx character controller implementation.

While there is still room for improvement, this is a good starting point.

Avatars now jump consistently, regardless of cpu speed. Fixes unexpected camera transitions with entering/exiting some subworlds. (Teledahn elevator) Fixes a jitter in animated subworlds. (Er'cana harvester) Dynamic controllers are correctly positioned on the ground. (Jalak) Much improved interaction with dynamic physicals.

Other physics related issues may or may not be addressed.
2013-04-12 20:15:35 +02:00
2d38c34b3c Merged in cwalther/cwe/bink-stub (pull request #27)
Port of H-uru #236 and #237. This adds stubs for the removed Bink files, to make things compile and run again, with just enough functionality to replicate the previous behavior when built without BINK_SDK_AVAILABLE, i.e. movies are treated as zero-length.
2013-01-20 22:26:06 +11:00