4
3
forked from H-uru/moul-assets
Commit Graph

319 Commits

Author SHA1 Message Date
c7077991b2 Use CreateKickableSounds.py to fix nb01 firemarbles.
This is a completely automated pass over nb01.prp with
CreateKickableSounds.py from Hoikas/moul-utils using the
nb01Marbles.json file. This is a good thing becuase the results are
completely reproducible and some rather misleading object naming is
cleaned up.
2021-07-14 16:43:57 -04:00
ad072b4a33 Revert "Fix Neighborhood Marbles2 physical sounds."
This reverts commit 2de6ebd7f0. The
intention is to run a script over the PRP to automate this process and
cleanup some of the strange object naming in the PRPs.
2021-07-14 15:53:58 -04:00
a1c30eb1e9 Re-export Fan02 clothing with PNG icons. 2021-07-13 17:06:16 -04:00
cc463afb10 Collapse Kadish_kdshVaultIntrYeeshaAdditions.
This collapses Sirius's additions pages into:
- Kadish_District_kdshVaultIntrYeesha
- Kadish_District_Textures

as appropriate. All Kadish files have been re-saved to ensure ObjIDs
remain consistent.
2021-07-08 14:52:02 -04:00
3288a2e39b Merge remote-tracking branch 'origin/master' into KadishButterflies 2021-07-08 14:49:00 -04:00
27257b2834 Merge pull request #36 from DoobesURU/SereneParticles
Add Serene Particle Effects
2021-07-06 22:52:35 -04:00
e4ce4179d8 Re-export KI max file due previous commit including stale PRPs.
The release notes dialog was using the old Tahoma font GUI skin instead
of Arial.
2021-07-06 18:32:32 -04:00
3e7ea8e2e7 Prevent falling down the bakery ladder.
- [RopeLadder03_TOP01] Extended the collision of the upper ladder region
  to ensure players cannot walk up to the edge and drop down,
  potentially getting stuck inside of the ladder's proxy collision.
2021-07-06 15:04:42 -04:00
3899a168db Fix falling-in-place issue in Er'cana Canyon.
- [PlantProxy27] Adjusted collision such that the avatar can walk or
  jump between it and PlantProxy26 without getting stuck between two
  parallel vertical planes.
2021-07-06 15:04:42 -04:00
a1468380a3 Don't halt harvester car when the harvester stops.
- [ResponderModifier] cRespHrvstrStop - remove forced halt to the
  harvester car. The python script controls when the car stops.
  Unconditionally forcing it to stop will prevent script controlled
  actions from completing, causing state desynch.
2021-07-06 15:04:34 -04:00
bd2e1e6cf3 Add Serene bug noise
The OGG file for the bug flock.
2021-07-06 14:43:53 -04:00
0461823ea9 Add Serene Particle Effects
Re-adds Serene's snow and bugs by Ehren
2021-07-06 14:43:44 -04:00
85c47984c4 Fix Er'cana Harvester car responders.
- [ResponderModifier] cRespCallCar - Removed the forced ramp lowering,
  which could result in the ramps lowering while the car and harvester
  are decoupled. This would allow players to walk off the ramps and fall
  out of the Age.
2021-07-05 20:26:49 -04:00
900a5db723 Merge pull request #55 from Hazado/RemoveKadishMoonElevatorSubworld
Kadish moon elevator subworld no longer interacts with player
2021-07-05 14:56:05 -04:00
2de6ebd7f0 Fix Neighborhood Marbles2 physical sounds.
These already existed in the PRP files but were not hooked up correctly.
This adds all missing connections and fixes the way some objects were
parented.

- [PhysicalSndGroup] cSfxPhysSnd-Marble0[1-4]_0 added references to
  random sound mods for the physical sfx.
- [CoordinateInterface] SfxMarble-(Hit|Roll)Emit0[1-4] changed parent
  object to MarblePhy0[1-4] as appropriate and set the parent transform
  offset to 0,0,0. Previously, this was parented to a root object that
  did not move.

The other three marbles in the clock area will require the creation of
new objects and will be done in another commit.
2021-07-05 13:34:58 -04:00
7b933c5b85 Merge pull request #56 from Hoikas/bendy-bridge
Fix solid bendy bridge in Teledahn.
2021-07-05 11:54:50 -04:00
3ad4afdf12 Add Mass for physics reasons
[Generic Physical - Glow_TileDecalElevator] Mass set to 1
2021-07-04 20:06:30 -07:00
d062f314da Fix solid bendy bridge in Teledahn.
[PXPhysical] Bendy Bridge
Changed the member group from kGroupDynamic to kGroupStatic. The
previous setting is for kickables (which this bridge is not). PhysX does
not allow for non-kinematic dynamic bodies to have triangle mesh bounds.
Because of the improper member group, we were forcing PhysX to treat the
triangle mesh bounds as a convex hull, making the whole bridge solid.

Or, as Simulation.0.log says:
```
WARNING: 'BendyBridge' is a dynamic triangle mesh; this is not supported
in PhysX 4... forcing to convex hull, sorry.
```
2021-07-04 20:08:37 -04:00
c1c2becd22 Merge pull request #26 from Hoikas/url-loc
URL Confirmation Dialog Localization
2021-07-04 19:28:50 -04:00
ba82364880 Fix Camera Angles
[Generic Physical - CamRegElevShaft02] Subworld set to <plKey NULL="True" />
[Generic Physical - ElevatorCameraBlocker] Subworld set to <plKey NULL="True" />
[Generic Physical - EntryStaticCamRegion] Subworld set to <plKey NULL="True" />
[Generic Physical - proxyTerrainMeshForElevatorCam] Subworld set to <plKey NULL="True" />
[Generic Physical - proxyTerrainMeshForElevatorCam01] Subworld set to <plKey NULL="True" />
2021-07-04 13:22:56 -07:00
22f503760b Kadish moon elevator subworld no longer interacts with player
Kadish_District_kdshGlowInTheDark.prp
[Scene Node - Kadish_kdshGlowInTheDark] Added Scene Object "ElevatorDetector"
[Scene Object - ElevatorShaftColumn] Added simulation interface "ElevatorShaftColumn"
[Scene Object - ElevatorDetector] Created. Added simulation interface "ElevatorDetector", and Coordinate Interface "ElevatorDetector". Added to Modifiers  the RidingAnimatedPhysicalDetector "RideAnimatedPhysicalRegion01"
[Coordinate Interface - SubWorld_New] Scene Object "ElevatorDetector" added to children
[Coordinate Interface - ElevatorDetector] Created. Local to world set to xyz 722.179993/-120.223999/-64.274498 and World to Local set to xyz -722.179993/120.223999/64.274498
[Simulation Interface - ElevatorDetector] Created
[Simulation Interface - ElevatorShaftColumn] Created
[Generic Physical - ElevShaftProxy] Adjusted downwards to provide collisions where needed.
     New Verts are below
    <hsVector3 X="740.1274414" Y="-112.9572144" Z="-50.40106583" />
    <hsVector3 X="737.4561768" Y="-108.4223251" Z="-50.40106583" />
    <hsVector3 X="737.4561768" Y="-108.4223175" Z="-120.0982208" />
    <hsVector3 X="740.1274414" Y="-112.9572144" Z="-120.0982208" />
    <hsVector3 X="732.1929932" Y="-108.4683685" Z="-50.40106201" />
    <hsVector3 X="732.1929932" Y="-108.4683685" Z="-120.0982208" />
    <hsVector3 X="737.5355225" Y="-117.538147" Z="-50.40106201" />
    <hsVector3 X="737.5355225" Y="-117.538147" Z="-120.0982208" />
    <hsVector3 X="729.6012573" Y="-113.0491867" Z="-50.40106583" />
    <hsVector3 X="729.6012573" Y="-113.0491867" Z="-120.0982132" />
    <hsVector3 X="732.272522" Y="-117.5840759" Z="-50.40106583" />
    <hsVector3 X="732.272522" Y="-117.5840759" Z="-120.0982132" />
    <hsVector3 X="737.7039795" Y="-117.9446487" Z="-123.0609131" />
    <hsVector3 X="731.9250488" Y="-117.9446564" Z="-123.0609131" />
    <hsVector3 X="740.1270142" Y="-112.9570007" Z="-123.0609131" />
    <hsVector3 X="737.4559937" Y="-108.4219971" Z="-123.0609131" />
    <hsVector3 X="731.9250488" Y="-107.9351883" Z="-123.0609131" />
    <hsVector3 X="729.0355225" Y="-112.9399185" Z="-123.0609131" />

[Generic Physical - Floor] Removed Faces so elevator could be entered when it lowers
    Removed Faces below
    <Triangle>120 123 124</Triangle>
    <Triangle>124 122 116</Triangle>
    <Triangle>120 124 116</Triangle>
    <Triangle>115 120 116</Triangle>

[Generic Physical - Glow_TileDecalElevator] Subworld set to <plKey NULL="True" /> and "kPhysAnim" added to Props
[Generic Physical - XRgnBottom] Bounds set to "kProxyBounds" and Top Faces removed.
[Generic Physical - XRgnTop] Bounds set to "kProxyBounds" and Top and Bottom Faces removed.
[Generic Physical - ElevatorDetector] Created
[Generic Physical - ElevatorShaftColumn] Created
[plRidingAnimatedPhysicalDetector - RideAnimatedPhysicalRegion01] Created. Enter Msg and Exit Msg Senders set to scene object "ElevatorDetector"
2021-07-03 22:00:11 -07:00
403463b99e Fix text scaling in the release notes dialog.
- ReleaseNotesTextBox
[GUIMultiLineEdit01] Enabled "Maintain size across resolutions"
Changed skin to use 8pt Arial font.
2021-07-03 20:08:00 -04:00
249fa1e52d Fixes First Week Reward Clothing
Wrong shirt was assigned in python file mod for first week shirt. This fixes that issue.

[Python File Mod - cPythFirstWeekShirtTakable - 4] Changed to "FReward_Launch"
[Python File Mod - cPythFirstWeekShirtTakable - 5] Changed to "MReward_Launch"
2021-07-02 09:42:32 -07:00
bf176060a7 Merge pull request #47 from Hoikas/clothingjson
Add GlobalClothing_Fan02 (Mysterium 2021 shirts)
2021-06-30 12:42:41 -04:00
cfe2f3ca5a s/Gay Zero/GZ Pride/ 2021-06-27 15:38:31 -04:00
2acf09c31f Change sortOrder to prevent default-clothing stomping. 2021-06-27 13:26:12 -04:00
0238a41d75 Roll icons back to DXT compression (one level). 2021-06-26 06:23:00 -04:00
6a54ce87b7 Correct Fan02 clothing icon/texture quality bug.
This is just a re-convert with a patch to CreateClothingPRP.py that
ensures icons only have one level. If there are multiple levels,
changing the texture quality will cause certain assumptions in the ACA
python to be invalidated, resulting in junked UI.
2021-06-25 21:14:36 -04:00
4fd458f99e Fix Mysterium female LS positioning. 2021-06-23 13:14:00 -04:00
e25be22ad0 Shorten the names of Mysterium rewards.
I seem to have forgotten that SDL `STRING32` variables have a fixed
length of 32 bytes. Sigh. So we must limit our names to this. Therefore,
I have renamed the shirts to "LSMysterium2021" and "SSMysterium2021".
The SDL string "LSMysterium2021;SSMysterium2021" will use up the
entirety of the 32 byte string buffer.
2021-06-23 01:24:40 -04:00
6ffc1317da Add fan-Age linking panels to the Nexus book machine.
Adds linking panels for:
- ChisoPreniv
- Fehnir's House
- GoMePub New
- VeeTsah
- Vothol
2021-06-09 16:31:52 -04:00
fbc3e9e597 Improved Nexus floor reflections. 2021-06-09 16:31:33 -04:00
bbb400a862 Myst Online Intangible Assets 2021-06-07 18:42:13 -04:00
23b65e3cfd Add Gay Zero shirt JSON and regenerate clothing. 2021-06-05 18:35:39 -04:00
f517968b00 Add Mysterium 2021 T-Shirt sources and PRPs.
These PRPs are generated from the JSON source by the script
CreateClothingPRP.py, originally by @Deledrius. The specific fork used
to generate these files can be found at
https://github.com/Hoikas/moul-utils.
2021-06-05 00:06:12 -04:00
242cfb3063 Merge branch 'H-uru:master' into KadishButterflies 2021-05-26 22:40:39 -07:00
f0021f97aa SDL Visibility fix for Yeesha Page 2 in Gahreesen
[Python File Mode - PythYeeshaPage02Vis_0] Created xAgeSDLBoolShowHide for Yeesha Page 2 in Gahreesen Prison Room
[Scene Object - YeechaPage02Decal] Added Python File Mod - PythYeeshaPage02Vis_0 to Modifiers
[Scene Object - YeeshaClickProxy] Added Python File Mod - PythYeeshaPage02Vis_0 to Modifiers
[Scene Object - YeeshaPage02] Added Python File Mod - PythYeeshaPage02Vis_0 to Modifiers
2021-05-20 12:21:49 -07:00
74c992831a Kadish Butterflies from Pots, now also in Moula
PRP provided by Siruis - http://forums.openuru.org/viewtopic.php?p=10053#p10053
Opened in PRPShop and saved as Moula PRP

No other changes made

Tested in game and seems like it worked.
Someone with CC Kadish Vault will need to do a comparison, as I dont have access to it at the moment

Co-authored-by: Jrius <2261279+Jrius@users.noreply.github.com>
2021-05-14 19:14:46 -07:00
c9cdd851f1 Fix flat convex hull in the Neighborhood that caused crashes.
- [VidCamScreensaver] Changed to kExplicitBounds
2021-05-06 13:04:23 -04:00
485907efa0 Merge pull request #31 from Hoikas/moar-clock-stuff
Fix clock globe turning backwards.
2021-05-05 14:10:10 -04:00
bf4edd770c Merge pull request #23 from DoobesURU/GreatTreePub-3-13-21
Great Tree Pub March 2021 Updates
2021-05-05 14:09:52 -04:00
29f66f30f6 Merge pull request #20 from DoobesURU/TrebivdilMOULa
Add Tre'bivdil to MOULa
2021-05-05 14:09:46 -04:00
fdca992a41 Merge pull request #22 from DoobesURU/SereneMOULa
Add Serene to MOULa
2021-05-05 14:09:40 -04:00
9518a1db3c Merge pull request #25 from DoobesURU/VotholMOULa
Add Vothol Gallery to MOULa
2021-05-05 14:09:33 -04:00
4dbdaf6db6 Fix render issues with user-created GZ Markers
This is accomplished by changing the RenderLevel on the DSpans from
0x40000000 (BlendRendMajorLevel) to 0x80000001 (LateRendMajorLevel + 1).

Partly addresses GitHub issue #18.
2021-04-20 23:38:43 -07:00
c78dea92ac Fix cross-page references in Neighborhood.
The previous commit apparently reordered the key IDs in the Textures
PRP, so this commit should bring everyone else up to date.
2021-04-17 11:53:33 -05:00
d9b398c64f Update Neighborhood clock textures.
- [Layer #2267] Changed the texture to the new cube map.
- [nb01clockrefl*0.hsm] Newly rendered cube map for the clock lens.
- [nb01clocknumbers*40#0.hsm] Updated to use the 2048x128 source image
  from the MOUL textures dump instead of the resized 1024x128 version
  from Plasma MAX. This increases the clarity of the numbers in the
  lens.
2021-04-16 22:53:40 -05:00
ac59ffdcdf Fix half offset issue in Neighborhood clock.
- [nbClockGlobe_(Entire Animation)_anim_0] Rotated all keyframes such
  that the animation starts and stops at 0/25 instead of the first half
  pahrtahvotee. Propogated this half p adjustment to all other
  keyframes.
- [Map #2266_anim_nb01TimeOfDay] Fixed layer offset keyframes such that
  the animation starts and stops at 0/25 instead of the first half
  pahrtahvotee.
2021-04-16 22:00:48 -05:00
4e0a538169 Fix clock globe turning backwards.
- [nbClockGlobe_(Entire Animation)_anim_0] Add two more keyframes to the
  animation to ensure the globe turns in the same direction at all
  times.
2021-04-15 19:31:04 -04:00
a9e0199c1b Tre'bivdil LAST fix
Removed weird object in the sky
2021-04-13 15:28:47 -04:00