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

161 Commits

Author SHA1 Message Date
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
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
46a0cf6206 Build 918 2013-07-05 15:28:19 -07: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
f03a837642 Add more functionality to the bink stubs to make them behave more like the previous implementation did when built without BINK_SDK_AVAILABLE.
In particular, the intro movie now exits immediately again rather than staying indefinitely.

The important difference is to send the completion callback in plBinkPlayer::NextFrame(), i.e. act as if we had reached the end of the movie.

Storing the filename is to keep plClient::IHandleMovieMsg() from deleting and recreating the plBinkPlayer on every message.

The changed return values are just to better match the previous behavior and probably don?t matter.
2012-12-18 15:49:41 +01:00
30d140b8a0 stub out plClient Bink support 2012-12-15 23:58:34 -05:00
7a47e52ac6 Rework PhysX collision flutter bug workaround
To better handle erroneous trigger events under the new timing method, use the number
of times the simulation has actually advanced instead of the number of evals received.

Cleaned up a bit.
2012-11-12 03:28:53 +11:00
2c06d3b2d3 Only apply height correction to human avatars. 2012-11-12 01:40:30 +11:00
79377e2b95 Clear achieved linear velocity on disabled avatars. 2012-11-11 23:48:51 +11:00
3d14321f26 Clear impact velocity on WalkingStrategy Reset.
Fixes landing behaviours incorrectly firing after a brain transition.
2012-11-11 22:59:04 +11:00
d638355955 Track mouse ups/downs for releasing purposes 2012-11-03 01:22:56 -04:00
03ecfe00b4 Increase height correction to match graphical representation
Provides more accurate interaction with detectors when the avatar is moving up or down.
Also decreases the severity of the PhysX trigger hull bug in some detectors.
This change doesn't affect world collisions.
2012-10-26 18:13:22 +11:00
860b071bb2 Clear linear velocity after each update. 2012-10-26 18:03:40 +11:00
d02cde1703 Disabled avatar updates
Only update disabled avatars between steps if in a subworld and then don't interpolate their position.
2012-10-26 17:36:04 +11:00
32ba4e06e2 Fix controlled flight bug
fControlledFlight state should be handled outside of the physics step.
2012-10-26 10:48:30 +11:00
a617803fd0 Capture the mouse on clicks
This hack prevents the cursor from leaving the window when panning the
camera or changing directions quickly. This is important for those with
high mouse sensitivities.
2012-10-23 23:21:50 -04:00
ae8d1d39bb Fix intermittent spawn bug
Flush the transform when avatars are explicitly spawned on load. e.g. Ahnonay quabs.
2012-10-23 14:22:22 +11:00
b5296d614f Fix warping an avatar triggers all detectors along the path
When explicitly moving an avatar over the given threshold, teleport the underlying
actor most of the way before moving the controller.
2012-10-23 13:45:21 +11:00
87b8dfae09 Fix subworld transition bug
Use the actual global location, not the interpolated location when moving
between subworlds. Rebuild the controller cache.
2012-10-22 12:57:16 +11:00
025fb1fb02 Improve simulation timing at low frame rates.
Increased kDefaultMaxDelta to 0.15.
Added a small bias to combat a truncation issue.
2012-10-13 21:21:33 +11:00
431bb5ff90 Merged in Skoader/cwe-ou/window-size (pull request #18)
Fix improperly calculated window size in initial Windowed mode.

User visible effect: This changeset removes an (in)visible grid of seams or blurriness in the client window. They are most noticeable when moving the cursor over them.

Window shouldn't have a resizing border.
2012-10-13 00:47:35 +02:00
1d309e3ce5 Merged in Skoader/cwe-ou/window-cursor (pull request #21, update for #17)
Free the cursor

Allows the cursor to leave the client window and disables mouse recentering at load time.
2012-10-13 00:33:55 +02:00
78bfdad9c4 Merged in cwalther/cwe/cursors2 (pull request #10)
Improved Cursors

This is the second attempt at getting the following improvements to the Uru mouse cursors into CWE-ou:

* fix the blurriness
* add a subtle shadow to fix cursors being invisible on light backgrounds
* cleaner, more regular appearance

A (slightly outdated) picture for comparison is at http://forums.openuru.org/viewtopic.php?t=558&p=4265#p4265 , and anyone who has played on Gehn, TOC, or any other shard using the H'uru client has already seen the new cursors.

In order to do this properly, in a way that will continue to work in a cross-platform future, a lot of work done by Deledrius in the H'uru fork is included: He added PNG support to Plasma and introduced a client resource manager that loads resources such as the cursors, but also voice chat indicators and the loading linking book animation, which were also replaced by higher-quality recreations, fromfile instead of from Windows resources. resource.data

This also opens the way for other applications of PNG, such as saving the local copies of KI pictures in a lossless format instead of the heavily compressed JPEG we currently have.

Note: the new code requires a newer version of libpng than included with the CWE sources. Like other library dependencies, this must be installed separately. Instructions for that are at http://wiki.openuru.org/index.php?title=Build_the_client_with_MSVC_2003#Build_steps .
2012-10-13 00:28:09 +02:00
368d757bf8 Merged in Lyrositor/cwe-ou/jpeg (pull request #15)
Fix various JPEG issues.

These three commits fix various issues with JPEG images in Uru.
2012-10-13 00:14:10 +02:00
ca58d0e701 Merged in Lyrositor/cwe-ou/clickables-afk (pull request #14)
Allow clickables to function while sitting or AFK.

Fix from Hoikas. Original pull request: https://github.com/H-uru/Plasma/pull/176
2012-10-13 00:10:46 +02:00
a3592d9a0a Merged in Skoader/cwe-ou/msvc10 (pull request #11)
Update for Visual Studio 2010

Update for MSVC10 as briefly discussed in the forums.

This was done over several commits to make it easier to identify the changes that were required and to assist the review process. It adds VC10 project files for the client, most of the Plasma apps and the required Plasma libraries.

Dependencies. The new projects are configured to find 3rd party libraries in the same locations as the 2003 projects with the following exceptions - VS2010 doesn't like the old speex lib in the repository, and will instead look in - xiph/include/speex and xiph/lib. And the ogg and vorbis libraries are also expected to be in the same directory - xiph/include/ogg, xiph/include/vorbis and xiph/lib.

Project Configurations. Configurations have been setup for debug and release builds of the both the internal and external live client.
2012-10-13 00:08:52 +02:00
3cf35d0bc0 Merged in Lyrositor/cwe-ou (pull request #12)
Fixed console documentation

Fixed console documentation. Prompting for brief HTML documentation no longer appends a new group to the previous one (see https://github.com/H-uru/Plasma/issues/170). This has been tested both by myself and by H'uru members.
2012-10-13 00:04:54 +02:00
76ee9975b7 Window shouldn't have a resizing border.
This removes the WS_THICKFRAME & WS_MAXIMIZEBOX window styles in windowed mode.
2012-10-02 12:11:30 +10:00
264bc3355a Fix horizontal mouse-look while standing still. 2012-09-28 22:44:23 +02:00
7f3d416290 Fix no cursor when not the top level window.
WM_MOUSEMOVE messages were only processed when the window was active.
2012-09-27 22:40:37 +10:00
ec29c270e4 Fix clicking on the title bar does not activate the window. 2012-09-27 22:32:41 +10:00
357d4aa7d1 Fix no cursor on window frame and title bar.
Remove mouse capture and handle visibility via WM_SETCURSOR messages instead of
window activation events.
2012-09-27 22:25:38 +10:00
23f4d22b9b Make Python.Cheat little bit safer 2012-07-24 23:40:43 +02:00
c3589e3fc4 Remove Python.RunFile 2012-07-24 21:17:51 +02:00
91a4f8ab3e Update MSVC10 projects. 2012-07-01 20:52:45 +02:00
48ded426a9 Merge msvc10 into cursors2 2012-06-24 16:01:01 +02:00
eba0968808 Avoid truncated window size after going from fullscreen to a window of the same size.
Must set the window size after the display resolution, otherwise Windows may clamp it to a smaller size than specified.
2012-06-17 00:38:07 +02:00