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

322 Commits

Author SHA1 Message Date
37434040a3 Update SDK-binary for new installall.bat script 2021-01-01 13:22:00 -07:00
70f968ec7a Merge branch 'rarified/sdk-reorg-1' 2020-12-31 15:15:59 -07:00
f66df98794 Jenkins can't cope with submodule name different than the <path>
in the superproject.

Change .gitmodules entry "SDK-binary" to "MOULOpenSourceClientPlugin/SDK-binary"
2020-12-31 15:14:54 -07:00
5b9ae0d6e4 Merge branch 'rarified/unify-line-endings' 2020-12-31 14:23:18 -07:00
22f3ab2bff Adjust .gitattributes
Remove .hgignore (no longer in Mercurial)
2020-12-31 14:22:36 -07:00
b411f5e886 Merge branch 'rarified/update-moul-patchbase' 2020-12-29 11:16:44 -07:00
e24cbd91ec Update Cyan shard server addresses to remove from OU build patch file. 2020-12-29 11:15:22 -07:00
bcecd851b6 Merge branch 'rarified/sdk-reorg-1' 2020-12-29 11:04:27 -07:00
405bc40785 Merge branch 'master' into rarified/sdk-reorg-1
Propogate SDK-binary submodule into branch.
2020-12-29 10:33:55 -07:00
4b86c6e123 Add submodule reference to SDK-binary (VS2010) 2020-12-29 10:31:16 -07:00
70018d4cd1 Remove submodule reference for cleanup. 2020-12-23 09:51:58 -07:00
9d9788b99a Reorganization Phase 2: update solution files for new references. 2020-12-19 10:18:42 -07:00
c50edd2ea7 Reorganization of SDK placement and references for CWE-ou
Phase 1: reorganize StaticSDK directories to better reflect
  origin of each SDK, platform, etc.  Add SDK-binary as submodule.
2020-12-19 10:16:13 -07:00
c5bbb0541f Merge branch 'rarified/vs2010_default' 2020-11-03 15:48:01 -07:00
26560983d2 Code changes to build with VS2010 without patching.
This commit will follow the tag VS2003_FINAL which is the last commit
that will compile under VS2003 without changes.

This incorporates all source code changes known to be necessary to build
CWE with VS2010.
2020-11-03 15:45:09 -07:00
83146700d2 Merge branch 'rarified/findpagevalidate' VS2003_FINAL 2020-08-19 15:46:52 -06:00
870f6352b5 More fixes to plResManager::FindPage() - it appears invalid pages can exist on
the fAllPages list.

Validate each one when the list(set) is walked before operating on it.
2020-08-19 15:45:00 -06:00
6416015302 Merge branch 'rarified/movieplayer' 2020-08-14 15:33:26 -06:00
d97b9e4681 Added flexiblity... Two movie hooks, PreBranding.webm and PostBranding.webm
so if desired a video can be designated to play at either point in the startup
sequence.
2020-08-14 15:31:51 -06:00
3cfc3da9ca Merge branch 'rarified/movieplayer' 2020-08-13 14:25:52 -06:00
d45a2fa45b Another fix to plClient.vcxproj; Change "Debug" to "Release" in a few library
locations for Release_Internal
2020-08-13 14:25:04 -06:00
af91c3e382 Merge branch 'rarified/movieplayer' 2020-08-13 13:19:22 -06:00
e7b9663837 VS2010: Unify library paths and names for various build configurations 2020-08-13 13:18:43 -06:00
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