1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Commit Graph

64 Commits

Author SHA1 Message Date
023850de47 VS2003: Add missed fix to eliminate plLocalization::GetLocalizationCodes() on VS2003 2020-08-12 17:36:41 -06:00
f3c0a81b0b VS2003: changes for older compiler
- nullptr not defined, use nil
- remove unused VCXPROJ with wrong name plMoviePlayer
- std::begin, std::end not defined, conditionally include code for plLocalization::GetLanguageCodes()
      on _MSC_VER >= 1800
- add PLASMA_USE_WEBM to appropriate VS projects
- fix library references to opus, vpx and speex
2020-08-12 16:28:42 -06:00
14e3118aaa Change appearance of UruLiveIntro (Yeesha) movie to post-avatar setup
Also small whitespace cleanup
2020-08-11 21:21:03 -06:00
f7bc877285 Patch from Adam Fix movie playback in Opening Sequence
- copy fMoviePath in plMoviePlayer::SetFileName() rather than use existing pointer
- fix inability of xOpeningSequence.py to play movie.  File path provided not persistent.
2020-08-11 21:11:11 -06:00
b233409580 Patches contributed by Adam to resolve movie playback:
- vcxproj file issues (local paths, Debug configurations)
- defer movie playback until mouse plate properly sized
- correct conditional and type for plMoviePlayer::Start() reference fVideoTrack
- fix typing to call plPlanarImage::Yuv420ToRgba() causing color artifacting
2020-08-11 10:17:46 -06:00
401fedd610 Updates to C++ typing, integrate movie playing into plClient.
This version compiles, but does not render movies.  WIP.
(Has some rearranged message registration in StartInit() for testing)
2020-08-10 11:09:26 -06:00
4b3f16a912 First effort to port HUru MKV/WEBM Movie Player to Minkata
Type restructuring for C++98 and build configuration updates.
This version compiles successfully, but without webm libraries yet linked in.
2020-08-07 10:04:58 -06:00
8c8bf4223d Promote needed type changes from cyMisc.h 2020-07-01 20:58:52 -06:00
a117e47b5e Change the fSecs field of plUnifiedTime from UInt32 to time_t. (cherry picked from commit 9adb8efd5d)
This fixes various date formatting problems when building on a system where time_t is 64-bit (e.g. Visual Studio 2010), and, as a bonus, extends the range past 2038 on such systems.

The wire protocol is left at 32-bit for now, we might change that to 64 when other reasons to break compatibility have accumulated.
2020-07-01 15:17:08 -06:00
f1ed7f4b7d Fix crazy camera stack issues (cherry picked from commit 6ece5e6341)
Author: Adam Johnson <AdamJohnso@gmail.com>
Date:   Fri Feb 8 00:15:56 2013 -0500

    Fix crazy camera stack issues

    Turns out, it was an artifact of us suspending the simulation during links
    and partly because of Cyan's late adding of the avatar controller to the
    sim. Now, we add the avatar as soon as the age data is loaded. This causes
    the camera stack to be populated with whatever garbage PhysX decides on,
    then xJourneyClothsGen2 is free to set the real stack after we get all the
    SDL from the server.

    Verified to fix Teledahn oddness and not display a regression in Kemo.
2020-04-15 10:53:31 -06:00
340a538c96 Fix Player and CGZ marker games (Cherry picked from b4e1dc352e)
Date:   Thu Jan 19 00:59:56 2012 -0500

    Fix player and CGZ marker games
2020-04-12 14:55:14 -06: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
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
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
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
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
46a0cf6206 Build 918 2013-07-05 15:28:19 -07:00
c6016223f2 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.
2012-11-19 17:46:30 -05: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
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
48ded426a9 Merge msvc10 into cursors2 2012-06-24 16:01:01 +02:00
68ba122afe Build 912 2012-06-14 17:09:15 -07:00
5cdd8f90fd Merge default into msvc10 2012-05-28 13:11:16 +10:00
8b8e39685a Merged in cwalther/cwe/notify_int (mainly by boq) (https://foundry.openuru.org/fisheye/cru/CWE-12)
Allow plNotify variable events to carry integers in addition to floats

This fixes crashes when trying to upload a KI note with an odd vault node id > 2^24 to an imager, and allows for future cleanup of other plNotifyMsg uses.

To be accompanied by moulscript 886c4.
2012-05-18 21:08:59 +02:00
8ba666ee6c Merged in cwalther/cwe/cypythonide (pull request #8)
Wrap uses of the missing CyPythonIDE with #ifdef HAVE_CYPYTHONIDE

This fix is needed to build an internal client (without /DPLASMA_EXTERNAL_RELEASE).

It is designed to match the corresponding fix in H-uru/Plasma (b76fd10 etc.).
2012-05-18 21:07:16 +02:00
35775dd701 Merged in "Fix an Aspect Ratio Assumption" (http://foundry.openuru.org/fisheye/cru/CWE-11)
Fix an Aspect Ratio Assumption
2012-05-18 20:52:47 +02:00
b0cbd18f2c Merged in dst (http://foundry.openuru.org/fisheye/cru/CWE-8)
DST Fix

Original implementation by Adam Johnson, with some bug fixes by Christian Walther.

Includes a fix for plUnifiedTime::SetGMTime not working correctly when the given time falls into local DST.
2012-05-18 20:49:59 +02:00
743419d9e5 Better centering and header consistency. 2012-05-13 09:14:47 -04:00
5951a11e86 Add static keyword back. 2012-05-13 08:51:32 -04:00
46810aa990 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). 2012-05-11 17:21:40 -04:00
b2f8d8c0f0 Minor adjustments to avoid needless trivial differences to H-uru/Plasma. 2012-05-01 11:17:52 +02:00
bf6d2a4459 Always copy terminating NULL when pasting 2012-04-27 21:50:33 +02:00
bc74371c57 Update2 for MSVC10
Add missing type specifiers.
2012-04-22 12:50:08 +10:00
626da5ae70 Update1 for MSVC10
Capitalize the ref macro in hsTypes.h due to a name collision.
2012-04-22 12:22:32 +10:00
e583bf6d74 Also handle Python long integers in addVarNumber. 2012-04-09 09:50:40 +02:00
350295425a Allow int in plNotify
---
 .../Plasma/FeatureLib/pfPython/plPythonFileMod.cpp |   11 ++-
 Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp    |   10 ++
 Sources/Plasma/FeatureLib/pfPython/pyNotify.h      |    2 +
 .../Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp    |   68 +++++++++++++++-
 .../Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp    |   87 +++++++++++++++++--
 Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h  |   14 +++-
 6 files changed, 175 insertions(+), 17 deletions(-)
2012-04-09 01:29:47 +02:00
ccefcfdb13 Fix an aspect ratio assumption 2012-04-03 12:55:02 -04:00
a9cb4723d0 Fix KI daylight saving time calculation.
The previous implementation had the following bugs:
- DST was truncated to end of October
- DST start was off by one week in years where March 1st is a Monday
- DST start was off by one second (1:59:59 -> 2:00:00 -> 3:00:01 instead of the correct 1:59:59 -> 3:00:00 -> 3:00:01)

Tested against tzdata 2009g.
2012-03-31 20:13:58 +02:00
423e0c2142 Use George Bush style (2007) DST begin/end dates 2012-03-28 16:36:37 -04:00
a99ed37f23 Missing null checks and small style fixes 2012-03-04 18:55:44 +01:00
9bd019fbf3 plClipboard 2012-03-04 11:57:45 +01:00
1cac4f85da Fix a potential crash in pyVaultImageNode.
Fixes a crash which can occur when attempting to fetch
an unsupported image type.
2012-02-09 23:47:22 -08:00