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

399 Commits

Author SHA1 Message Date
2238f279b8 Merge branch 'rarified/movieplayer' 2020-08-13 11:49:52 -06:00
7385171b8a Fix wrong version when enabling fLangCodes for VS2010/VS2003
Added one more #ifdef for fLangCodes around fLangCodes declaration
2020-08-13 11:49:20 -06:00
d330e0fe5f Merge branch 'rarified/movieplayer' 2020-08-12 19:43:56 -06:00
eead82f0fc VS2003: fix #if condition precedence 2020-08-12 19:42:48 -06:00
b1d009a619 Merge branch 'rarified/movieplayer' 2020-08-12 18:05:49 -06:00
023850de47 VS2003: Add missed fix to eliminate plLocalization::GetLocalizationCodes() on VS2003 2020-08-12 17:36:41 -06:00
faae658d57 Restore movie playback features (adapted from H'uru)
Merge branch 'rarified/movieplayer'
2020-08-12 16:30:45 -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
bf27010d11 Fix type warning in virtual function stack for plWin32Sound::ISetActualVolume()
- const declaration in argument list didn't match plSound::ISetActualVolume()
2020-08-11 10:26:42 -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
33a1e301f7 Forgot to add VS projects for pfMoviePlayer 2020-08-10 13:43:41 -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
5aca792056 Merge branch 'rarified/findpagevalidate' 2020-07-26 09:09:41 -06:00
3feb3aa3c1 Fix optimization in FindPage() that might attempt to use a plPageInfo class
before checking it is valid.
2020-07-26 09:06:15 -06:00
b0f48722b6 Merge branch 'hoikas/keycollector-1' 2020-07-19 10:03:05 -06:00
f30b909909 Fix a bug related to trashed keys. (cherry picked from H'uru e2b5786988)
It appears that the hsTArray memory management really sucks for smart
pointers like plKey. The crash mentioned at
http://forum.guildofwriters.org/viewtopic.php?f=117&t=6291 went away
immediately after switching plKeyCollector to an std::set.
2020-07-19 10:01:48 -06:00
8a6bb5cace Merge branch 'hoikas/scenenodes-1' 2020-07-13 16:49:21 -06:00
50855e48ed Allow PXPhysicals to change scene nodes (cherry picked from H'uru 1b6f315186)
If this isn't done, the client will crash on exit when markers have been
loaded at some point in the game
2020-07-13 16:48:14 -06:00
eb66f05cc7 Merge branch 'rarified/purefunctiondebug' 2020-07-12 06:50:11 -06:00
4e5b51b405 _set_invalid_parameter_handler() apparently not available in VS2003
Conditionally include for VS2010+
2020-07-12 06:47:34 -06:00
5b7eb4375c Merge branch 'rarified/purefunctiondebug' 2020-07-11 19:56:19 -06:00
0568563776 Remove trap for avoiding debugger on client.
Add exception handlers for pure function call traps
  (Cherry picked from 3fe3a1d H-uru/Plasma "Catch moar crashes")
2020-07-11 19:50:03 -06:00
0e44781d78 Merge branch 'rarified/VS2010-enable-pdb' 2020-07-05 14:12:29 -06:00
21d6ddd391 Update VS2010 build files to always generate PDB & MAP files for debugging,
all configurations.
2020-07-05 14:11:31 -06:00
07b57f758f Merge branch 'cwalther/timetypes-1' 2020-07-01 21:02:57 -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
68bbea08a1 Merge branch 'hoikas/keyleaks-1' 2020-06-30 16:27:03 -06:00
cd97be9ac7 Fix bad patch transcription: void BeginShutdown() plgDispatch.h 2020-06-30 16:07:23 -06:00
49e4283807 Fix the "Crash on Exit" bug (cherry picked from commit b4f6ccaa88)
We were throwing away the Dispatcher before all the keys (namely, leaked
keys) were unloaded. See the comment in plResManager for more details.
2020-06-30 10:06:51 -06:00
149a8877ce Fix broken VC project files missing last </project> line (without line ending) 2020-05-18 09:34:28 -06:00
7f89504ca4 Update VS2010 projects to remove hard-coded BUILD_TYPE C++ definition so
environment CL variable can define build type.
2020-05-17 09:49:53 -06:00
6fa845bebd Revert "Add Jenkinsfile for Pipeline builds."
This reverts commit 124b354097.
2020-05-15 15:01:38 -06:00
4e3ad5196d Merge branch 'master' of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata 2020-05-15 15:01:10 -06:00
69f1fa22b5 Merge New Patcher from H'uru with DependsManifest for running installers
for prerequisites before updating.

Merge branch 'hoikas/newpatcher-1'
2020-05-15 14:59:00 -06:00
b77f98c0ae Add Microsoft's new VC++ runtime filename prefix.
(cherry picked from commit def697d67444e798b45ff8b9eff91561543ed989)
2020-05-15 14:55:07 -06:00
115d308d10 Improve installer process handling.
(cherry picked from commit ad728785ba31b02ad4d518ec4f9a6508ca27b96d)
2020-05-15 14:55:07 -06:00
34a800333f Don't update the patcher first.
(cherry picked from commit d0a13d0ee5c647053a540543670fb1215af9c1b2)
2020-05-15 14:55:07 -06:00
d1f28306fe Fix some straggling issues in plSelfPatcher.
- Fixed the status thread waiting many seconds before requesting the status for the first time.
- Fixed msi execution by removing the workaround for mapped network drives. That seems like a corner-case not worth worrying about anyway.
- Fixed total bytes being updated too late, causing interesting download progress.

(cherry picked from commit a893d74a209b44c683552358dedb6c85f9924bf8)
2020-05-15 14:55:07 -06:00
60b108a6b7 Rewrite SelfPatcher to include the ability to install updates.
To register an update for install, there are three options:
- List any executable or msi file in the [External|Internal]Patcher manifest.
- As above, but in the *optional* DependencyPatcher manifest.
- Flag a file with the bit flag 0x10 in either of the above manifests.

This also fixes a bug that caused the status thread to deadlock in certain situations, causing the launcher to get stuck open.

(cherry picked from commit e0e918084395f93170abcea2853ad25ae3012385)
2020-05-15 14:55:06 -06:00
e86e5c8bdd Allow computing md5 hashes from hsStream derived classes
(cherry picked from commit e43cb685365bfc4498b681168bab0b1357ae208c)
2020-05-15 14:55:06 -06:00
638682ee39 Prevent VS from trolling us with spaces.
(cherry picked from commit 9d5566ba24f2a41ac3e70efce965cf8e0901422f)
2020-05-15 14:55:06 -06:00
124b354097 Add Jenkinsfile for Pipeline builds. 2020-05-13 14:19:49 -06:00
beb715ba6e Merge branch 'hoikas/physx-step-offset-fix-1' 2020-05-03 09:35:36 -06:00
078e2f075c Bump the step offset by a tenth of a foot. (Cherry picked from commit cc15367781)
This should keep the avatar from getting stuck on some stupid stuff such
as on the pellet machine. A real fix would be to tweak the data, but we
cannot do that.
2020-05-03 09:34:55 -06:00
eb483b7c1b Merge branch 'hoikas/win10-fcu-mouse-fix' 2020-04-16 13:36:37 -06:00
c8ef3908ef Update Win10 FCS Mouse fix to apply to later Win version (cherry picked from commit 1bc5d9b80fe28bca8f7071f561681eeb6d98e0b2)
Author: Adam Johnson <AdamJohnso@gmail.com>
Date:   Sat May 12 17:07:33 2018 -0400

    Cursor bug is still present in Windows 10 April 2018 Update
2020-04-16 13:35:31 -06:00