TombEngine/Documentation/doc/4 enums/Objects.ObjID.html

1444 lines
24 KiB
HTML
Raw Normal View History

2021-08-12 20:16:28 +01:00
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
2025-03-28 23:39:49 +01:00
<title>TombEngine 1.8.1 Lua API</title>
2021-08-12 20:16:28 +01:00
<link rel="stylesheet" href="../ldoc.css" type="text/css" />
</head>
<body>
<div id="container">
<div id="product">
<div id="product_logo"></div>
<div id="product_name"><big><b></b></big></div>
<div id="product_description"></div>
</div> <!-- id="product" -->
<div id="main">
<!-- Menu -->
<div id="navigation">
<br/>
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<h1>&nbsp;TombEngine</h1>
2021-08-12 20:16:28 +01:00
<ul>
<li><a href="../index.html">Index</a></li>
</ul>
2022-04-10 00:38:39 +01:00
<h2>1 Modules</h2>
2021-08-12 20:16:28 +01:00
<ul class="nowrap">
2022-12-09 22:08:16 +00:00
<li> <a href="../1 modules/Effects.html">Effects</a></li>
<li> <a href="../1 modules/Flow.html">Flow</a></li>
<li> <a href="../1 modules/Input.html">Input</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../1 modules/Inventory.html">Inventory</a></li>
<li> <a href="../1 modules/Logic.html">Logic</a></li>
<li> <a href="../1 modules/Objects.html">Objects</a></li>
<li> <a href="../1 modules/Sound.html">Sound</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../1 modules/Strings.html">Strings</a></li>
<li> <a href="../1 modules/Util.html">Util</a></li>
<li> <a href="../1 modules/View.html">View</a></li>
2021-08-23 19:19:36 +01:00
</ul>
2022-04-10 00:38:39 +01:00
<h2>2 Classes</h2>
2021-08-23 19:19:36 +01:00
<ul class="nowrap">
<li> <a href="../2 classes/Collision.Probe.html">Collision.Probe</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../2 classes/Flow.Level.html">Flow.Level</a></li>
<li> <a href="../2 classes/Flow.Settings.html">Flow.Settings</a></li>
2024-12-15 23:59:31 +01:00
<li> <a href="../2 classes/Flow.Statistics.html">Flow.Statistics</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../2 classes/Objects.AIObject.html">Objects.AIObject</a></li>
<li> <a href="../2 classes/Objects.Camera.html">Objects.Camera</a></li>
<li> <a href="../2 classes/Objects.LaraObject.html">Objects.LaraObject</a></li>
<li> <a href="../2 classes/Objects.Moveable.html">Objects.Moveable</a></li>
2022-12-30 16:33:26 +00:00
<li> <a href="../2 classes/Objects.Room.html">Objects.Room</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../2 classes/Objects.Sink.html">Objects.Sink</a></li>
<li> <a href="../2 classes/Objects.SoundSource.html">Objects.SoundSource</a></li>
<li> <a href="../2 classes/Objects.Static.html">Objects.Static</a></li>
2022-12-16 18:36:42 +00:00
<li> <a href="../2 classes/Objects.Volume.html">Objects.Volume</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../2 classes/Strings.DisplayString.html">Strings.DisplayString</a></li>
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<li> <a href="../2 classes/View.DisplaySprite.html">View.DisplaySprite</a></li>
2021-08-23 19:19:36 +01:00
</ul>
2022-04-10 00:38:39 +01:00
<h2>3 Primitive Classes</h2>
2021-08-23 19:19:36 +01:00
<ul class="nowrap">
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<li> <a href="../3 primitive classes/Flow.Fog.html">Flow.Fog</a></li>
<li> <a href="../3 primitive classes/Flow.Horizon.html">Flow.Horizon</a></li>
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<li> <a href="../3 primitive classes/Flow.InventoryItem.html">Flow.InventoryItem</a></li>
<li> <a href="../3 primitive classes/Flow.LensFlare.html">Flow.LensFlare</a></li>
<li> <a href="../3 primitive classes/Flow.SkyLayer.html">Flow.SkyLayer</a></li>
2025-03-15 01:01:05 +01:00
<li> <a href="../3 primitive classes/Flow.Starfield.html">Flow.Starfield</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../3 primitive classes/Color.html">Color</a></li>
<li> <a href="../3 primitive classes/Rotation.html">Rotation</a></li>
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<li> <a href="../3 primitive classes/Time.html">Time</a></li>
2023-05-31 21:48:00 +01:00
<li> <a href="../3 primitive classes/Vec2.html">Vec2</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../3 primitive classes/Vec3.html">Vec3</a></li>
</ul>
<h2>4 Enums</h2>
<ul class="nowrap">
<li> <a href="../4 enums/Collision.MaterialType.html">Collision.MaterialType</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../4 enums/Effects.BlendID.html">Effects.BlendID</a></li>
<li> <a href="../4 enums/Effects.EffectID.html">Effects.EffectID</a></li>
<li> <a href="../4 enums/Effects.StreamerFeatherMode.html">Effects.StreamerFeatherMode</a></li>
<li> <a href="../4 enums/Effects.ParticleAnimationType.html">Effects.ParticleAnimationType</a></li>
Customize global hardcoded parameters (#1495) * Initial commit * Update CHANGELOG.md * Tint flare smoke * Expose GetCustomizations * Added lensflare and flicker customization options for flare * Update LensFlare.cpp * Remove unnecessary code * Update lara_flare.cpp * Massive refactor to merge animations, settings and customizations * Add HUD customization options * Customize weapons * Fixed flare, renamed recoil to interval, fixed lensflare default * Occlude flare lensflares * Update Settings.cpp * Use alternate damage for lasersight mode * Added hair cust * Fix comment * Fix another comment * Fix link * Fix placeholder table names * Reorganize types * Add missing initializers for hair settings * Added physics cust * Clarify description * Update settings.lua * Update CHANGELOG.md * Add gun smoke, gun shells and ammo pickup counts * Fix naming ambiguity * Remove missing features from documentation * Fix comment * Fix parameter name, change default settings file * Fixed pitch black * Rollback DoDistanceFogForVertex * Add camera cust * Change binocular/lasersight toggle to color * Update lara_basic.cpp * Add time and statistics classes and script API for it * Fix comment * Use DoDamage on Lara helpers to register with statistics * Update Time.cpp * Fix documentation * Fix default flare timeout * Update Settings.lua * Add flare muzzle offset customization * Remove young Lara limitations * Fix lasersight color * Push full settings.lua * Update RendererCompatibility.cpp * Allow to customize root meshes, decopypaste hair and joint init code * Added sol Time operator overloads * Some changes to docs, add meaningful error for unknown fields * Use existing new index template, add gunflash color settings, add shotgun muzzle * Remove excessive usage of GetSettings() * Cleanups * Update Settings.lua * Clarify parameter name * Fix InitializeWeaponInfo * PR review code tidying * Fix bad merge * Update FlowHandler.cpp * Remove tabs for LDoc comments * Use different comment style to preserve formatting * Update lara_fire.cpp * Some cleanups * Fixed GetTimeUnits * Fix typo * Update Time.cpp --------- Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-15 19:24:49 +03:00
<li> <a href="../4 enums/Flow.ErrorMode.html">Flow.ErrorMode</a></li>
Freeze event and OnUseItem callbacks (#1463) * Add use item callbacks, add menu boilerplate code * Set up scripting API for game mode * Use word "break" instead of "menu" everywhere * Rudimentary implementation of BreakPhase * More progress * Doc update * Always active lensflare * Update CHANGELOG.md * Fix hair interpolation for spectator mode * Update target highlighter and other HUD elements while in break mode * Fix various problems * Don't try to update camera in spectator mode * Cleanup camera code * Rename break to freeze * Update FlowHandler.cpp * Update Flow.html * Update control.cpp * Rename method * Add displaystring owner to differentiate between freeze modes * Disable triggers and volumes in freeze mode * Update control.cpp * Rename enum * Update CHANGELOG.md * Implement full freeze, correct callback behaviour * Update RendererDrawMenu.cpp * Allow DumpGameScene to do partial pass * Remove hack * Introduce render mode enum to render scene without any postprocess * Tidying * Fix problems with items or renderer not updating before entering freeze mode * Fix rebase errors * Use interpolation factor getter instead of raw value everywhere * Update documentation * Fixed setting freeze mode from OnStart * Fixed freeze mode not working in OnStart event * Revert "Fixed freeze mode not working in OnStart event" This reverts commit 87f6fbdc6d776bb7813133a84c8ba9d0b1171f3b. * Bypass cinematic bars and fades for non-full render modes --------- Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Co-authored-by: Sezz <sezzary@outlook.com>
2024-11-20 23:54:39 +03:00
<li> <a href="../4 enums/Flow.FreezeMode.html">Flow.FreezeMode</a></li>
2023-12-26 20:47:08 +00:00
<li> <a href="../4 enums/Flow.GameStatus.html">Flow.GameStatus</a></li>
<li> <a href="../4 enums/Input.ActionID.html">Input.ActionID</a></li>
<li> <a href="../4 enums/Objects.AmmoType.html">Objects.AmmoType</a></li>
<li> <a href="../4 enums/Objects.HandStatus.html">Objects.HandStatus</a></li>
<li> <a href="../4 enums/Objects.WeaponType.html">Objects.WeaponType</a></li>
2023-12-26 20:47:08 +00:00
<li> <a href="../4 enums/Objects.MoveableStatus.html">Objects.MoveableStatus</a></li>
2022-12-09 22:08:16 +00:00
<li> <here>Objects.ObjID</here></li>
2022-12-30 16:33:26 +00:00
<li> <a href="../4 enums/Objects.RoomFlagID.html">Objects.RoomFlagID</a></li>
<li> <a href="../4 enums/Objects.RoomReverb.html">Objects.RoomReverb</a></li>
<li> <a href="../4 enums/Sound.SoundTrackType.html">Sound.SoundTrackType</a></li>
2024-11-16 22:07:57 +11:00
<li> <a href="../4 enums/Strings.DisplayStringOption.html">Strings.DisplayStringOption</a></li>
<li> <a href="../4 enums/Util.LogLevel.html">Util.LogLevel</a></li>
<li> <a href="../4 enums/View.AlignMode.html">View.AlignMode</a></li>
<li> <a href="../4 enums/View.CameraType.html">View.CameraType</a></li>
<li> <a href="../4 enums/View.PostProcessMode.html">View.PostProcessMode</a></li>
<li> <a href="../4 enums/View.ScaleMode.html">View.ScaleMode</a></li>
2021-08-12 20:16:28 +01:00
</ul>
<h2>5 Lua utility modules</h2>
<ul class="nowrap">
<li> <a href="../5 lua utility modules/CustomBar.html">CustomBar</a></li>
<li> <a href="../5 lua utility modules/Diary.html">Diary</a></li>
2022-12-09 22:08:16 +00:00
<li> <a href="../5 lua utility modules/EventSequence.html">EventSequence</a></li>
<li> <a href="../5 lua utility modules/Timer.html">Timer</a></li>
2024-12-16 21:33:37 +01:00
<li> <a href="../5 lua utility modules/Type.html">Type</a></li>
</ul>
2021-08-12 20:16:28 +01:00
</div>
<div id="content">
2022-04-10 00:38:39 +01:00
<h1>Enum <code>Objects.ObjID</code></h1>
2021-08-12 20:16:28 +01:00
<p>Constants for object IDs.</p>
<p>
</p>
2022-09-13 21:23:57 +01:00
<h2><a href="#Tables">Tables</a></h2>
2021-08-12 20:16:28 +01:00
<table class="function_list">
<tr>
2022-09-13 21:23:57 +01:00
<td class="name" ><a href="#Members">Members</a></td>
<td class="summary">Objects.ObjID constants.</td>
</tr>
<tr>
<td class="name" ><a href="#PickupConstants">PickupConstants</a></td>
<td class="summary">Objects.ObjID pickup constants.</td>
2021-08-12 20:16:28 +01:00
</tr>
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
<tr>
<td class="name" ><a href="#SpriteConstants">SpriteConstants</a></td>
<td class="summary">Objects.ObjID sprite constants.</td>
</tr>
2021-08-12 20:16:28 +01:00
</table>
<br/>
<br/>
2022-09-13 21:23:57 +01:00
<h2 class="section-header "><a name="Tables"></a>Tables</h2>
2021-08-12 20:16:28 +01:00
2022-09-13 21:23:57 +01:00
<dl class="function">
<dt>
<a name = "Members"></a>
<strong>Members</strong>
</dt>
<dd>
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
<p>Objects.ObjID constants. </p>
2021-08-12 20:16:28 +01:00
<p>The following constants are inside ObjID.</p>
<pre><code>LARA
LARA_EXTRA_ANIMS
PISTOLS_ANIM
UZI_ANIM
SHOTGUN_ANIM
REVOLVER_ANIM
CROSSBOW_ANIM
HK_ANIM
GRENADE_ANIM
ROCKET_ANIM
HARPOON_ANIM
2022-09-13 21:23:57 +01:00
FLARE_ANIM
2021-08-12 20:16:28 +01:00
LARA_SKIN
LARA_SKIN_JOINTS
LARA_SCREAM
LARA_CROSSBOW_LASER
LARA_REVOLVER_LASER
LARA_HOLSTERS
LARA_HOLSTERS_PISTOLS
LARA_HOLSTERS_UZIS
LARA_HOLSTERS_REVOLVER
LARA_SPEECH_HEAD1
LARA_SPEECH_HEAD2
LARA_SPEECH_HEAD3
LARA_SPEECH_HEAD4
ACTOR1_SPEECH_HEAD1
ACTOR1_SPEECH_HEAD2
ACTOR2_SPEECH_HEAD1
ACTOR2_SPEECH_HEAD2
Mirrors (#1519) * WIP TR4 style mirrors * Fixed broken previous commit * Added debris and effects drawing in mirrored rooms; Some optimizations for early skip non mirrored items; * Implemented mirrors in file format * Use default argument value for ReadCount * Use emplace_back and camera room number * Fixed items culling in mirror rooms; Changed file format for having also virtual room; * Cached reflection matrix of mirrors at load time; Fixed lighting in mirrored items; Added bad cull mode after mirrore debrises drawing; Added mirroring of dynamic lights; * Fixed ambient occlusion in mirrored rooms * Fixed random statics positions while shooting * Added logic for hiding selectively reflecting moveables and statics; Added enabled flag for disabling mirrros in the future with LUA; * Simplify renderer code, remove excessive if statements * Update level.cpp * Decopypaste more mirror-related code * More decopypasting, rename inline function, remove unneeded arg * Remove unnecessary inline, dont reflect room lights * Fixed billboards, reintroduce ReflectVectorOptionally * Fixed dynamic lights * Update RendererDraw.cpp * Fixed 3D sprites mirroring * Draw reflections also when Lara is in any of mirrored rooms, not only camera * Remove unrelated changes * Remove lambdas * Rename fields for consistency * Reorganize renderer code a little * Rename * Spawn mirrored dynamic lights in Lara rooms too * Update RendererDraw.cpp * Add option to reflect sprites * Update CHANGELOG.md * Fixed mirrors on savegame reloading * Fix Lara not mirroring when using binoculars * Continuation of previous fix * Fixed 3D non-sorted sprites mirroring * Fixed various binocular / lasersight issues * Fix meshswap, if object is not present * Don't perform binocular animations if binocular meshswap is not present * Rename CamOldPos and use more consistent type for it * Update title.bin * Fixed #1521 * Fixed #1522 * Interpolate Lara flare light, hide target highlighters in binos * Fix #1525 * Fixed postprocessing order and precompile shaders to speed-up loading * Fixed #1524 * Fixed silent crash if several Lara objects are present in level near dynamic light with shadow * Implement proper soft shadows * Disable self-shadowing for now, as it's causing visual glitches * Update RendererInit.cpp * Update CHANGELOG.md * Update CHANGELOG.md * Formatting pass * Revert "Formatting pass" This reverts commit 88a8ba24dea9cf7006920c8d7a52b6d047f6d749. * Reapply "Formatting pass" This reverts commit becd24da93a2eb33bf78b9be97f6dc6b25d6e744. * Update RendererFrame.cpp * Final formatting pass --------- Co-authored-by: MontyTRC89 <montyhammet@hotmail.it> Co-authored-by: Jakub <80340234+Jakub768@users.noreply.github.com> Co-authored-by: Sezz <sezzary@outlook.com>
2024-12-25 11:21:07 +03:00
LARA_BINOCULARS_MESH
2021-08-12 20:16:28 +01:00
LARA_EXTRA_MESH1
LARA_EXTRA_MESH2
LARA_WATER_MESH
LARA_PETROL_MESH
LARA_DIRT_MESH
LARA_CROWBAR_ANIM
LARA_TORCH_ANIM
2024-09-29 06:16:13 +02:00
HAIR_PRIMARY
HAIR_SECONDARY
2021-08-12 20:16:28 +01:00
SNOWMOBILE_LARA_ANIMS
SNOWMOBILE
QUAD_LARA_ANIMS
QUAD
SPEEDBOAT_LARA_ANIMS
SPEEDBOAT
KAYAK_LARA_ANIMS
KAYAK
UPV_LARA_ANIMS
UPV
MINECART_LARA_ANIMS
MINECART
JEEP_LARA_ANIMS
JEEP
MOTORBIKE_LARA_ANIMS
MOTORBIKE
RUBBER_BOAT_LARA_ANIMS
RUBBER_BOAT
2022-09-13 21:23:57 +01:00
LARA_BIGGUN_ANIM
2021-08-12 20:16:28 +01:00
BIGGUN
VEHICLE_SMASHABLE_FLOOR
VEHICLE_SMASHABLE_WALL
WOLF
BEAR
APE
SMALL_SPIDER
BIG_SPIDER
CROW
TIGER
EAGLE
RAPTOR
TYRANNOSAUR
COBRA
MONKEY
WHALE
2023-02-27 14:33:55 +00:00
COMPSOGNATHUS
2021-08-12 20:16:28 +01:00
FISH_EMITTER
RAT
BIG_RAT
CROCODILE
BAT
SPHINX
WILD_BOAR
HARPY
BIG_SCORPION
SMALL_SCORPION
BABOON_NORMAL
BABOON_INV
BABOON_SILENT
LITTLE_BEETLE
LOCUSTS
SHARK
HUSKIE
DOG
BATS_EMITTER
RATS_EMITTER
SPIDERS_EMITTER
LION
DOBERMAN
HAMMERHEAD
CROCODILE_GOD
LOCUSTS_EMITTER
SCUBA_HARPOON
SCUBA_DIVER
GOON_SILENCER1
GOON_SILENCER2
GOON_SILENCER3
BARRACUDA
WORKER_SHOTGUN
WORKER_MACHINEGUN
WORKER_DUAL_REVOLVER
WORKER_FLAMETHROWER
MONK1
MONK2
KNIFETHROWER
KNIFETHROWER_KNIFE
MERCENARY_UZI
MERCENARY_AUTOPISTOLS1
MERCENARY_AUTOPISTOLS2
SNOWMOBILE_GUN
SNOWMOBILE_DRIVER
2022-07-11 22:35:30 +01:00
FLAMETHROWER_BADDY
2021-08-12 20:16:28 +01:00
TRIBESMAN_WITH_AX
TRIBESMAN_WITH_DARTS
MP_WITH_STICK
MP_WITH_GUN
2022-07-11 22:35:30 +01:00
BADDY1
BADDY2
2021-08-12 20:16:28 +01:00
SAS_CAIRO
SAS_DYING
SAS_CAPTAIN
SAS_DRAG_BLOKE
GUIDE
VON_CROY
TROOPS
SAS
SWAT
SWAT_PLUS
GUARD1
GUARD_LASER
LARSON
PIERRE
MAFIA
MAFIA2
GUARD2
GUARD3
GLADIATOR
2022-09-13 21:23:57 +01:00
CYBORG
2021-08-12 20:16:28 +01:00
SNIPER
CHEF
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
KOLD
2021-08-12 20:16:28 +01:00
WINGED_MUMMY
CENTAUR_MUTANT
2022-09-13 21:23:57 +01:00
DOPPELGANGER
2021-08-12 20:16:28 +01:00
NATLA
GIANT_MUTANT
PROJ_SHARD
PROJ_BOMB
YETI
BIRDMONSTER
MARCO_BARTOLI
DRAGON_FRONT
DRAGON_BACK
DRAGON_BONE_FRONT
DRAGON_BONE_BACK
SPHERE_OF_DOOM
SPHERE_OF_DOOM2
SPHERE_OF_DOOM3
2023-05-31 21:48:00 +01:00
COWBOY
2021-08-12 20:16:28 +01:00
SPEAR_GUARDIAN
SPEAR_GUARDIAN_STATUE
SWORD_GUARDIAN
SWORD_GUARDIAN_STATUE
SHIVA
SHIVA_STATUE
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
WILLARD
2021-08-12 20:16:28 +01:00
CIVVY
MUTANT2
LIZARD
TONY_BOSS
TONY_BOSS_FLAME
PUNA_BOSS
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
SOPHIA_LEIGH_BOSS
2021-08-12 20:16:28 +01:00
LASER_BOLT
SKELETON
MUMMY
ENEMY_JEEP
HORSE
HORSEMAN
DEMIGOD1
DEMIGOD2
DEMIGOD3
SETHA
KNIGHT_TEMPLAR
AHMET
BIG_BEETLE
JEAN_YVES
WRAITH1
WRAITH2
WRAITH3
WRAITH4
LARA_DOUBLE
HYDRA
LASERHEAD
SCIENTIST
MERCENARY
WILLOWISP
INVISIBLE_GHOST
REAPER
BROWN_BEAST
ATTACK_SUB
IMP
IMP_ROCK
GUNSHIP
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
AUTO_GUN_VCI
2021-08-12 20:16:28 +01:00
ROMAN_GOD1
ROMAN_GOD2
LAGOON_WITCH
BOSS_SHIELD
BOSS_EXPLOSION_SHOCKWAVE
BOSS_EXPLOSION_RING
2023-05-31 21:48:00 +01:00
CLAW_MUTANT
WASP_MUTANT
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
TWIN_AUTO_GUN
2023-07-20 12:13:57 +01:00
SKATEBOARD
SKATEBOARD_KID
WINSTON
SEAL_MUTANT
2021-08-12 20:16:28 +01:00
SPRINGBOARD
ROLLING_SPINDLE
DISK_SHOOTER
DISK
WALL_MOUNTED_BLADE
STATUE_WITH_BLADE
COG
SPIKEBALL
FLOOR_4BLADES
CEILING_4BLADES
CATWALK_BLADE
SETH_BLADE
PLINTH_BLADE
SLICER_DICER
BIRD_BLADE
CHAIN
PLOUGH
STARGATE
SPIKY_FLOOR
SPIKY_WALL
SPIKY_CEILING
TEETH_SPIKES
JOBY_SPIKES
SENTRY_GUN
MAPPER
MOVING_BLADE
ELEMENT_PUZZLE
LIGHTING_CONDUCTOR
HAMMER
OBELISK
WHEEL_OF_FORTUNE
GAME_PIECE1
GAME_PIECE2
GAME_PIECE3
RAISING_COG
MINE
SCALES
ROME_HAMMER
FLAME
FLAME_EMITTER
FLAME_EMITTER2
FLAME_EMITTER3
BURNING_ROOTS
ROPE
FIREROPE
POLEROPE
ELECTRICAL_CABLES
BURNING_FLOOR
DARTS
DART_EMITTER
HOMING_DART_EMITTER
FALLING_CEILING
FALLING_BLOCK
FALLING_BLOCK2
CRUMBLING_FLOOR
TRAPDOOR1
TRAPDOOR2
TRAPDOOR3
FLOOR_TRAPDOOR1
FLOOR_TRAPDOOR2
CEILING_TRAPDOOR1
CEILING_TRAPDOOR2
SCALING_TRAPDOOR
ROLLINGBALL
ROLLINGBARREL
PROPELLER_H
PROPELLER_V
ONEBLOCK_PLATFORM
TWOBLOCK_PLATFORM
RAISING_BLOCK1
RAISING_BLOCK2
RAISING_BLOCK3
RAISING_BLOCK4
PUSHABLE_OBJECT1
PUSHABLE_OBJECT2
PUSHABLE_OBJECT3
PUSHABLE_OBJECT4
PUSHABLE_OBJECT5
PUSHABLE_OBJECT6
PUSHABLE_OBJECT7
PUSHABLE_OBJECT8
PUSHABLE_OBJECT9
PUSHABLE_OBJECT10
WRECKING_BALL
ZIPLINE_HANDLE
TORPEDO
CHAFF
ELECTRIC_FENCE
LIFT
TIGHT_ROPE
PARALLEL_BARS
XRAY_CONTROLLER
PORTAL
GEN_SLOT1
GEN_SLOT2
GEN_SLOT3
GEN_SLOT4
SEARCH_OBJECT1
SEARCH_OBJECT2
SEARCH_OBJECT3
SEARCH_OBJECT4
SARCOPHAGUS
ENEMY_PIECE
EXPANDING_PLATFORM
SQUISHY_BLOCK_HORIZONTAL
SQUISHY_BLOCK_VERTICAL
2024-03-25 23:38:05 +01:00
LASER_BEAM
2021-08-12 20:16:28 +01:00
MINE_DETECTOR
MAP
SECRET_MAP
SETH_DOOR
HORUS_STATUE
STATUE_PLINTH
CLASSIC_ROLLING_BALL
BIG_ROLLING_BALL
PUSHABLE_OBJECT_CLIMBABLE1
PUSHABLE_OBJECT_CLIMBABLE2
PUSHABLE_OBJECT_CLIMBABLE3
PUSHABLE_OBJECT_CLIMBABLE4
PUSHABLE_OBJECT_CLIMBABLE5
PUSHABLE_OBJECT_CLIMBABLE6
PUSHABLE_OBJECT_CLIMBABLE7
PUSHABLE_OBJECT_CLIMBABLE8
PUSHABLE_OBJECT_CLIMBABLE9
PUSHABLE_OBJECT_CLIMBABLE10
TRAIN
EXPLOSION
2022-11-18 15:34:45 +00:00
DAMOCLES_SWORD
2023-02-27 14:33:55 +00:00
ELECTRIC_CLEANER
SLAMMING_DOORS
SWINGING_BLADE
2025-03-11 23:52:11 +01:00
ELECTRIC_BALL
ELECTRIC_BALL_IMPACT_POINT
THOR_HAMMER_HANDLE
THOR_HAMMER_HEAD
MOVING_LASER
2021-08-12 20:16:28 +01:00
PUZZLE_ITEM1
PUZZLE_ITEM2
PUZZLE_ITEM3
PUZZLE_ITEM4
PUZZLE_ITEM5
PUZZLE_ITEM6
PUZZLE_ITEM7
PUZZLE_ITEM8
PUZZLE_ITEM9
PUZZLE_ITEM10
PUZZLE_ITEM11
PUZZLE_ITEM12
PUZZLE_ITEM13
PUZZLE_ITEM14
PUZZLE_ITEM15
PUZZLE_ITEM16
PUZZLE_ITEM1_COMBO1
PUZZLE_ITEM1_COMBO2
PUZZLE_ITEM2_COMBO1
PUZZLE_ITEM2_COMBO2
PUZZLE_ITEM3_COMBO1
PUZZLE_ITEM3_COMBO2
PUZZLE_ITEM4_COMBO1
PUZZLE_ITEM4_COMBO2
PUZZLE_ITEM5_COMBO1
PUZZLE_ITEM5_COMBO2
PUZZLE_ITEM6_COMBO1
PUZZLE_ITEM6_COMBO2
PUZZLE_ITEM7_COMBO1
PUZZLE_ITEM7_COMBO2
PUZZLE_ITEM8_COMBO1
PUZZLE_ITEM8_COMBO2
PUZZLE_ITEM9_COMBO1
PUZZLE_ITEM9_COMBO2
PUZZLE_ITEM10_COMBO1
PUZZLE_ITEM10_COMBO2
PUZZLE_ITEM11_COMBO1
PUZZLE_ITEM11_COMBO2
PUZZLE_ITEM12_COMBO1
PUZZLE_ITEM12_COMBO2
PUZZLE_ITEM13_COMBO1
PUZZLE_ITEM13_COMBO2
PUZZLE_ITEM14_COMBO1
PUZZLE_ITEM14_COMBO2
PUZZLE_ITEM15_COMBO1
PUZZLE_ITEM15_COMBO2
PUZZLE_ITEM16_COMBO1
PUZZLE_ITEM16_COMBO2
KEY_ITEM1
KEY_ITEM2
KEY_ITEM3
KEY_ITEM4
KEY_ITEM5
KEY_ITEM6
KEY_ITEM7
KEY_ITEM8
KEY_ITEM9
KEY_ITEM10
KEY_ITEM11
KEY_ITEM12
KEY_ITEM13
KEY_ITEM14
KEY_ITEM15
KEY_ITEM16
KEY_ITEM1_COMBO1
KEY_ITEM1_COMBO2
KEY_ITEM2_COMBO1
KEY_ITEM2_COMBO2
KEY_ITEM3_COMBO1
KEY_ITEM3_COMBO2
KEY_ITEM4_COMBO1
KEY_ITEM4_COMBO2
KEY_ITEM5_COMBO1
KEY_ITEM5_COMBO2
KEY_ITEM6_COMBO1
KEY_ITEM6_COMBO2
KEY_ITEM7_COMBO1
KEY_ITEM7_COMBO2
KEY_ITEM8_COMBO1
KEY_ITEM8_COMBO2
KEY_ITEM9_COMBO1
KEY_ITEM9_COMBO2
KEY_ITEM10_COMBO1
KEY_ITEM10_COMBO2
KEY_ITEM11_COMBO1
KEY_ITEM11_COMBO2
KEY_ITEM12_COMBO1
KEY_ITEM12_COMBO2
KEY_ITEM13_COMBO1
KEY_ITEM13_COMBO2
KEY_ITEM14_COMBO1
KEY_ITEM14_COMBO2
KEY_ITEM15_COMBO1
KEY_ITEM15_COMBO2
KEY_ITEM16_COMBO1
KEY_ITEM16_COMBO2
PICKUP_ITEM1
PICKUP_ITEM2
PICKUP_ITEM3
PICKUP_ITEM4
PICKUP_ITEM5
PICKUP_ITEM6
PICKUP_ITEM7
PICKUP_ITEM8
PICKUP_ITEM9
PICKUP_ITEM10
PICKUP_ITEM11
PICKUP_ITEM12
PICKUP_ITEM13
PICKUP_ITEM14
PICKUP_ITEM15
PICKUP_ITEM16
PICKUP_ITEM1_COMBO1
PICKUP_ITEM1_COMBO2
PICKUP_ITEM2_COMBO1
PICKUP_ITEM2_COMBO2
PICKUP_ITEM3_COMBO1
PICKUP_ITEM3_COMBO2
PICKUP_ITEM4_COMBO1
PICKUP_ITEM4_COMBO2
PICKUP_ITEM5_COMBO1
PICKUP_ITEM5_COMBO2
PICKUP_ITEM6_COMBO1
PICKUP_ITEM6_COMBO2
PICKUP_ITEM7_COMBO1
PICKUP_ITEM7_COMBO2
PICKUP_ITEM8_COMBO1
PICKUP_ITEM8_COMBO2
PICKUP_ITEM9_COMBO1
PICKUP_ITEM9_COMBO2
PICKUP_ITEM10_COMBO1
PICKUP_ITEM10_COMBO2
PICKUP_ITEM11_COMBO1
PICKUP_ITEM11_COMBO2
PICKUP_ITEM12_COMBO1
PICKUP_ITEM12_COMBO2
PICKUP_ITEM13_COMBO1
PICKUP_ITEM13_COMBO2
PICKUP_ITEM14_COMBO1
PICKUP_ITEM14_COMBO2
PICKUP_ITEM15_COMBO1
PICKUP_ITEM15_COMBO2
PICKUP_ITEM16_COMBO1
PICKUP_ITEM16_COMBO2
EXAMINE1
EXAMINE2
EXAMINE3
EXAMINE4
EXAMINE5
EXAMINE6
EXAMINE7
EXAMINE8
EXAMINE1_COMBO1
EXAMINE1_COMBO2
EXAMINE2_COMBO1
EXAMINE2_COMBO2
EXAMINE3_COMBO1
EXAMINE3_COMBO2
EXAMINE4_COMBO1
EXAMINE4_COMBO2
EXAMINE5_COMBO1
EXAMINE5_COMBO2
EXAMINE6_COMBO1
EXAMINE6_COMBO2
EXAMINE7_COMBO1
EXAMINE7_COMBO2
EXAMINE8_COMBO1
EXAMINE8_COMBO2
PUZZLE_HOLE1
PUZZLE_HOLE2
PUZZLE_HOLE3
PUZZLE_HOLE4
PUZZLE_HOLE5
PUZZLE_HOLE6
PUZZLE_HOLE7
PUZZLE_HOLE8
PUZZLE_HOLE9
PUZZLE_HOLE10
PUZZLE_HOLE11
PUZZLE_HOLE12
PUZZLE_HOLE13
PUZZLE_HOLE14
PUZZLE_HOLE15
PUZZLE_HOLE16
PUZZLE_DONE1
PUZZLE_DONE2
PUZZLE_DONE3
PUZZLE_DONE4
PUZZLE_DONE5
PUZZLE_DONE6
PUZZLE_DONE7
PUZZLE_DONE8
PUZZLE_DONE9
PUZZLE_DONE10
PUZZLE_DONE11
PUZZLE_DONE12
PUZZLE_DONE13
PUZZLE_DONE14
PUZZLE_DONE15
PUZZLE_DONE16
KEY_HOLE1
KEY_HOLE2
KEY_HOLE3
KEY_HOLE4
KEY_HOLE5
KEY_HOLE6
KEY_HOLE7
KEY_HOLE8
KEY_HOLE9
KEY_HOLE10
KEY_HOLE11
KEY_HOLE12
KEY_HOLE13
KEY_HOLE14
KEY_HOLE15
KEY_HOLE16
WATERSKIN1_EMPTY
WATERSKIN1_1
WATERSKIN1_2
WATERSKIN1_3
WATERSKIN2_EMPTY
WATERSKIN2_1
WATERSKIN2_2
WATERSKIN2_3
WATERSKIN2_4
WATERSKIN2_5
HAMMER_ITEM
CROWBAR_ITEM
BURNING_TORCH_ITEM
CLOCKWORK_BEETLE
CLOCKWORK_BEETLE_COMBO1
CLOCKWORK_BEETLE_COMBO2
SWITCH_TYPE1
SWITCH_TYPE2
SWITCH_TYPE3
SWITCH_TYPE4
SWITCH_TYPE5
SWITCH_TYPE6
SWITCH_TYPE7
SWITCH_TYPE8
SWITCH_TYPE9
SWITCH_TYPE10
SWITCH_TYPE11
SWITCH_TYPE12
SWITCH_TYPE13
SWITCH_TYPE14
SWITCH_TYPE15
SWITCH_TYPE16
SHOOT_SWITCH1
SHOOT_SWITCH2
SHOOT_SWITCH3
SHOOT_SWITCH4
AIRLOCK_SWITCH
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
UNDERWATER_WALL_SWITCH1
UNDERWATER_WALL_SWITCH2
UNDERWATER_CEILING_SWITCH1
UNDERWATER_CEILING_SWITCH2
2021-08-12 20:16:28 +01:00
TURN_SWITCH
COG_SWITCH
LEVER_SWITCH
JUMP_SWITCH
CROWBAR_SWITCH
PULLEY
CROWDOVE_SWITCH
2023-02-27 14:33:55 +00:00
MINECART_SWITCH
2021-08-12 20:16:28 +01:00
DOOR_TYPE1
DOOR_TYPE2
DOOR_TYPE3
DOOR_TYPE4
DOOR_TYPE5
DOOR_TYPE6
DOOR_TYPE7
DOOR_TYPE8
DOOR_TYPE9
DOOR_TYPE10
DOOR_TYPE11
DOOR_TYPE12
DOOR_TYPE13
DOOR_TYPE14
DOOR_TYPE15
DOOR_TYPE16
DOOR_TYPE17
DOOR_TYPE18
DOOR_TYPE19
DOOR_TYPE20
DOOR_TYPE21
DOOR_TYPE22
DOOR_TYPE23
DOOR_TYPE24
2022-09-13 21:23:57 +01:00
DOOR_TYPE25
DOOR_TYPE26
DOOR_TYPE27
DOOR_TYPE28
DOOR_TYPE29
DOOR_TYPE30
2021-08-12 20:16:28 +01:00
LIFT_DOORS1
LIFT_DOORS2
PUSHPULL_DOOR1
PUSHPULL_DOOR2
PUSHPULL_DOOR3
PUSHPULL_DOOR4
KICK_DOOR1
KICK_DOOR2
KICK_DOOR3
KICK_DOOR4
UNDERWATER_DOOR1
UNDERWATER_DOOR2
UNDERWATER_DOOR3
UNDERWATER_DOOR4
DOUBLE_DOORS1
DOUBLE_DOORS2
DOUBLE_DOORS3
DOUBLE_DOORS4
SEQUENCE_DOOR1
SEQUENCE_SWITCH1
SEQUENCE_SWITCH2
SEQUENCE_SWITCH3
STEEL_DOOR
GOD_HEAD
PISTOLS_ITEM
PISTOLS_AMMO_ITEM
UZI_ITEM
UZI_AMMO_ITEM
SHOTGUN_ITEM
SHOTGUN_AMMO1_ITEM
SHOTGUN_AMMO2_ITEM
REVOLVER_ITEM
REVOLVER_AMMO_ITEM
CROSSBOW_ITEM
CROSSBOW_AMMO1_ITEM
CROSSBOW_AMMO2_ITEM
CROSSBOW_AMMO3_ITEM
CROSSBOW_BOLT
HK_ITEM
HK_AMMO_ITEM
GRENADE_GUN_ITEM
GRENADE_AMMO1_ITEM
GRENADE_AMMO2_ITEM
GRENADE_AMMO3_ITEM
GRENADE
ROCKET_LAUNCHER_ITEM
ROCKET_LAUNCHER_AMMO_ITEM
ROCKET
HARPOON_ITEM
HARPOON_AMMO_ITEM
HARPOON
GOLDROSE_ITEM
BIGMEDI_ITEM
SMALLMEDI_ITEM
LASERSIGHT_ITEM
BINOCULARS_ITEM
SILENCER_ITEM
FLARE_ITEM
FLARE_INV_ITEM
COMPASS_ITEM
DIARY_ITEM
STOPWATCH_ITEM
2021-08-12 20:16:28 +01:00
MEMCARD_LOAD_INV_ITEM
MEMCARD_SAVE_INV_ITEM
PC_LOAD_INV_ITEM
2022-09-13 21:23:57 +01:00
PC_SAVE_INV_ITEM
DIARY_OPEN
2021-08-12 20:16:28 +01:00
INVENTORY_PASSPORT
INVENTORY_SUNGLASSES
INVENTORY_KEYS
INVENTORY_HEADPHONES
INVENTORY_POLAROID
SMOKE_EMITTER_WHITE
SMOKE_EMITTER_BLACK
SMOKE_EMITTER
EARTHQUAKE
BUBBLES
WATERFALLMIST
2021-08-12 20:16:28 +01:00
GUNSHELL
SHOTGUNSHELL
GUN_FLASH
GUN_FLASH2
COLOR_LIGHT
BLINKING_LIGHT
PULSE_LIGHT
STROBE_LIGHT
ELECTRICAL_LIGHT
LENS_FLARE
ENERGY_BUBBLES
PLANET_EFFECT
BUTTERFLY
AI_GUARD
AI_AMBUSH
AI_PATROL1
AI_MODIFY
AI_FOLLOW
AI_PATROL2
AI_X1
AI_X2
LARA_START_POS
TELEPORTER
LIFT_TELEPORTER
2023-07-20 12:13:57 +01:00
LASER_BARRIER
2021-08-12 20:16:28 +01:00
STEAM_LASERS
FLOOR_LASERS
KILL_ALL_TRIGGERS
TRIGGER_TRIGGERER
HIGH_OBJECT1
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
EMBER_EMITTER
2021-08-12 20:16:28 +01:00
SMASH_OBJECT1
SMASH_OBJECT2
SMASH_OBJECT3
SMASH_OBJECT4
SMASH_OBJECT5
SMASH_OBJECT6
SMASH_OBJECT7
SMASH_OBJECT8
SMASH_OBJECT9
SMASH_OBJECT10
SMASH_OBJECT11
SMASH_OBJECT12
SMASH_OBJECT13
SMASH_OBJECT14
SMASH_OBJECT15
SMASH_OBJECT16
BODY_PART
CAMERA_TARGET
WATERFALL1
WATERFALL2
WATERFALL3
WATERFALL4
WATERFALL5
WATERFALL6
WATERFALLSS1
WATERFALLSS2
FISHTANK
2023-07-20 12:13:57 +01:00
DOPPELGANGER_ORIGIN
CORPSE
WRAITH_TRAP
2025-03-11 23:52:11 +01:00
WATERFALL_EMITTER
FIREFLY_EMITTER
2021-08-12 20:16:28 +01:00
MESHSWAP1
MESHSWAP2
MESHSWAP3
MESHSWAP4
MESHSWAP5
MESHSWAP6
MESHSWAP7
MESHSWAP8
MESHSWAP9
MESHSWAP10
2022-07-11 22:35:30 +01:00
MESHSWAP_BADDY1
MESHSWAP_BADDY2
2021-08-12 20:16:28 +01:00
MESHSWAP_MAFIA2
MESHSWAP_IMP
MESHSWAP_HITMAN
MESHSWAP_ROMAN_GOD1
MESHSWAP_ROMAN_GOD2
2022-09-13 21:23:57 +01:00
MESHSWAP_MONKEY_MEDIPACK
MESHSWAP_MONKEY_KEY
MESHSWAP_WINSTON_ARMY_OUTFIT
2021-08-12 20:16:28 +01:00
ANIMATING1
ANIMATING2
ANIMATING3
ANIMATING4
ANIMATING5
ANIMATING6
ANIMATING7
ANIMATING8
ANIMATING9
ANIMATING10
ANIMATING11
ANIMATING12
ANIMATING13
ANIMATING14
ANIMATING15
ANIMATING16
ANIMATING17
ANIMATING18
ANIMATING19
ANIMATING20
ANIMATING21
ANIMATING22
ANIMATING23
ANIMATING24
ANIMATING25
ANIMATING26
ANIMATING27
ANIMATING28
ANIMATING29
ANIMATING30
ANIMATING31
ANIMATING32
ANIMATING33
ANIMATING34
ANIMATING35
ANIMATING36
ANIMATING37
ANIMATING38
ANIMATING39
ANIMATING40
ANIMATING41
ANIMATING42
ANIMATING43
ANIMATING44
ANIMATING45
ANIMATING46
ANIMATING47
ANIMATING48
ANIMATING49
ANIMATING50
ANIMATING51
ANIMATING52
ANIMATING53
ANIMATING54
ANIMATING55
ANIMATING56
ANIMATING57
ANIMATING58
ANIMATING59
ANIMATING60
ANIMATING61
ANIMATING62
ANIMATING63
ANIMATING64
ANIMATING65
ANIMATING66
ANIMATING67
ANIMATING68
ANIMATING69
ANIMATING70
ANIMATING71
ANIMATING72
ANIMATING73
ANIMATING74
ANIMATING75
ANIMATING76
ANIMATING77
ANIMATING78
ANIMATING79
ANIMATING80
ANIMATING81
ANIMATING82
ANIMATING83
ANIMATING84
ANIMATING85
ANIMATING86
ANIMATING87
ANIMATING88
ANIMATING89
ANIMATING90
ANIMATING91
ANIMATING92
ANIMATING93
ANIMATING94
ANIMATING95
ANIMATING96
ANIMATING97
ANIMATING98
ANIMATING99
ANIMATING100
ANIMATING101
ANIMATING102
ANIMATING103
ANIMATING104
ANIMATING105
ANIMATING106
ANIMATING107
ANIMATING108
ANIMATING109
ANIMATING110
ANIMATING111
ANIMATING112
ANIMATING113
ANIMATING114
ANIMATING115
ANIMATING116
ANIMATING117
ANIMATING118
ANIMATING119
ANIMATING120
ANIMATING121
ANIMATING122
ANIMATING123
ANIMATING124
ANIMATING125
ANIMATING126
ANIMATING127
ANIMATING128
LASERHEAD_BASE
LASERHEAD_TENTACLE
BRIDGE_FLAT
BRIDGE_TILT1
BRIDGE_TILT2
BRIDGE_TILT3
BRIDGE_TILT4
2022-09-13 21:23:57 +01:00
BRIDGE_CUSTOM
2021-08-12 20:16:28 +01:00
HORIZON
SKY_GRAPHICS
DEFAULT_SPRITES
MISC_SPRITES
CUSTOM_SPRITES
FIRE_SPRITES
SMOKE_SPRITES
SPARK_SPRITE
DRIP_SPRITE
EXPLOSION_SPRITES
2022-09-13 21:23:57 +01:00
MOTORBOAT_FOAM_SPRITES
2021-08-12 20:16:28 +01:00
RUBBER_BOAT_WAVE_SPRITES
SKIDOO_SNOW_TRAIL_SPRITES
KAYAK_PADDLE_TRAIL_SPRITE
KAYAK_WAKE_SPRTIES
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
BINOCULAR_GRAPHICS
LASERSIGHT_GRAPHICS
CAUSTIC_TEXTURES
BAR_BORDER_GRAPHICS
2022-09-13 21:23:57 +01:00
HEALTH_BAR_TEXTURE
AIR_BAR_TEXTURE
DASH_BAR_TEXTURE
SFX_BAR_TEXTURE
2025-03-11 23:52:11 +01:00
WATERFALL_SPRITES
FIREFLY_SPRITES
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
CROSSHAIR_GRAPHICS
SPEEDOMETER_GRAPHICS
CUSTOM_BAR_GRAPHICS
CUSTOM_AMMO_GRAPHICS
2025-03-11 23:52:11 +01:00
DIARY_SPRITES
DIARY_ENTRY_SPRITES
2021-08-12 20:16:28 +01:00
</code></pre>
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
2021-08-12 20:16:28 +01:00
2022-09-13 21:23:57 +01:00
2022-12-09 22:08:16 +00:00
2022-09-13 21:23:57 +01:00
</dd>
2021-08-12 20:16:28 +01:00
<dt>
2022-09-13 21:23:57 +01:00
<a name = "PickupConstants"></a>
<strong>PickupConstants</strong>
2021-08-12 20:16:28 +01:00
</dt>
<dd>
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
<p>Objects.ObjID pickup constants. </p>
2022-09-13 21:23:57 +01:00
<p>The following ObjID members refer to pickups.</p>
<pre><code>PUZZLE_ITEM1
PUZZLE_ITEM2
PUZZLE_ITEM3
PUZZLE_ITEM4
PUZZLE_ITEM5
PUZZLE_ITEM6
PUZZLE_ITEM7
PUZZLE_ITEM8
PUZZLE_ITEM9
PUZZLE_ITEM10
PUZZLE_ITEM11
PUZZLE_ITEM12
PUZZLE_ITEM13
PUZZLE_ITEM14
PUZZLE_ITEM15
PUZZLE_ITEM16
PUZZLE_ITEM1_COMBO1
PUZZLE_ITEM1_COMBO2
PUZZLE_ITEM2_COMBO1
PUZZLE_ITEM2_COMBO2
PUZZLE_ITEM3_COMBO1
PUZZLE_ITEM3_COMBO2
PUZZLE_ITEM4_COMBO1
PUZZLE_ITEM4_COMBO2
PUZZLE_ITEM5_COMBO1
PUZZLE_ITEM5_COMBO2
PUZZLE_ITEM6_COMBO1
PUZZLE_ITEM6_COMBO2
PUZZLE_ITEM7_COMBO1
PUZZLE_ITEM7_COMBO2
PUZZLE_ITEM8_COMBO1
PUZZLE_ITEM8_COMBO2
PUZZLE_ITEM9_COMBO1
PUZZLE_ITEM9_COMBO2
PUZZLE_ITEM10_COMBO1
PUZZLE_ITEM10_COMBO2
PUZZLE_ITEM11_COMBO1
PUZZLE_ITEM11_COMBO2
PUZZLE_ITEM12_COMBO1
PUZZLE_ITEM12_COMBO2
PUZZLE_ITEM13_COMBO1
PUZZLE_ITEM13_COMBO2
PUZZLE_ITEM14_COMBO1
PUZZLE_ITEM14_COMBO2
PUZZLE_ITEM15_COMBO1
PUZZLE_ITEM15_COMBO2
PUZZLE_ITEM16_COMBO1
PUZZLE_ITEM16_COMBO2
KEY_ITEM1
KEY_ITEM2
KEY_ITEM3
KEY_ITEM4
KEY_ITEM5
KEY_ITEM6
KEY_ITEM7
KEY_ITEM8
KEY_ITEM9
KEY_ITEM10
KEY_ITEM11
KEY_ITEM12
KEY_ITEM13
KEY_ITEM14
KEY_ITEM15
KEY_ITEM16
KEY_ITEM1_COMBO1
KEY_ITEM1_COMBO2
KEY_ITEM2_COMBO1
KEY_ITEM2_COMBO2
KEY_ITEM3_COMBO1
KEY_ITEM3_COMBO2
KEY_ITEM4_COMBO1
KEY_ITEM4_COMBO2
KEY_ITEM5_COMBO1
KEY_ITEM5_COMBO2
KEY_ITEM6_COMBO1
KEY_ITEM6_COMBO2
KEY_ITEM7_COMBO1
KEY_ITEM7_COMBO2
KEY_ITEM8_COMBO1
KEY_ITEM8_COMBO2
KEY_ITEM9_COMBO1
KEY_ITEM9_COMBO2
KEY_ITEM10_COMBO1
KEY_ITEM10_COMBO2
KEY_ITEM11_COMBO1
KEY_ITEM11_COMBO2
KEY_ITEM12_COMBO1
KEY_ITEM12_COMBO2
KEY_ITEM13_COMBO1
KEY_ITEM13_COMBO2
KEY_ITEM14_COMBO1
KEY_ITEM14_COMBO2
KEY_ITEM15_COMBO1
KEY_ITEM15_COMBO2
KEY_ITEM16_COMBO1
KEY_ITEM16_COMBO2
PICKUP_ITEM1
PICKUP_ITEM2
PICKUP_ITEM3
PICKUP_ITEM4
PICKUP_ITEM5
PICKUP_ITEM6
PICKUP_ITEM7
PICKUP_ITEM8
PICKUP_ITEM9
PICKUP_ITEM10
PICKUP_ITEM11
PICKUP_ITEM12
PICKUP_ITEM13
PICKUP_ITEM14
PICKUP_ITEM15
PICKUP_ITEM16
PICKUP_ITEM1_COMBO1
PICKUP_ITEM1_COMBO2
PICKUP_ITEM2_COMBO1
PICKUP_ITEM2_COMBO2
PICKUP_ITEM3_COMBO1
PICKUP_ITEM3_COMBO2
PICKUP_ITEM4_COMBO1
PICKUP_ITEM4_COMBO2
PICKUP_ITEM5_COMBO1
PICKUP_ITEM5_COMBO2
PICKUP_ITEM6_COMBO1
PICKUP_ITEM6_COMBO2
PICKUP_ITEM7_COMBO1
PICKUP_ITEM7_COMBO2
PICKUP_ITEM8_COMBO1
PICKUP_ITEM8_COMBO2
PICKUP_ITEM9_COMBO1
PICKUP_ITEM9_COMBO2
PICKUP_ITEM10_COMBO1
PICKUP_ITEM10_COMBO2
PICKUP_ITEM11_COMBO1
PICKUP_ITEM11_COMBO2
PICKUP_ITEM12_COMBO1
PICKUP_ITEM12_COMBO2
PICKUP_ITEM13_COMBO1
PICKUP_ITEM13_COMBO2
PICKUP_ITEM14_COMBO1
PICKUP_ITEM14_COMBO2
PICKUP_ITEM15_COMBO1
PICKUP_ITEM15_COMBO2
PICKUP_ITEM16_COMBO1
PICKUP_ITEM16_COMBO2
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
EXAMINE1
EXAMINE2
EXAMINE3
EXAMINE4
EXAMINE5
EXAMINE6
EXAMINE7
EXAMINE8
EXAMINE1_COMBO1
EXAMINE1_COMBO2
EXAMINE2_COMBO1
EXAMINE2_COMBO2
EXAMINE3_COMBO1
EXAMINE3_COMBO2
EXAMINE4_COMBO1
EXAMINE4_COMBO2
EXAMINE5_COMBO1
EXAMINE5_COMBO2
EXAMINE6_COMBO1
EXAMINE6_COMBO2
EXAMINE7_COMBO1
EXAMINE7_COMBO2
EXAMINE8_COMBO1
EXAMINE8_COMBO2
2022-09-13 21:23:57 +01:00
HAMMER_ITEM
CROWBAR_ITEM
BURNING_TORCH_ITEM
PISTOLS_ITEM
PISTOLS_AMMO_ITEM
UZI_ITEM
UZI_AMMO_ITEM
SHOTGUN_ITEM
SHOTGUN_AMMO1_ITEM
SHOTGUN_AMMO2_ITEM
REVOLVER_ITEM
REVOLVER_AMMO_ITEM
CROSSBOW_ITEM
CROSSBOW_AMMO1_ITEM
CROSSBOW_AMMO2_ITEM
CROSSBOW_AMMO3_ITEM
HK_ITEM
HK_AMMO_ITEM
GRENADE_GUN_ITEM
GRENADE_AMMO1_ITEM
GRENADE_AMMO2_ITEM
GRENADE_AMMO3_ITEM
ROCKET_LAUNCHER_ITEM
ROCKET_LAUNCHER_AMMO_ITEM
HARPOON_ITEM
HARPOON_AMMO_ITEM
GOLDROSE_ITEM
BIGMEDI_ITEM
SMALLMEDI_ITEM
LASERSIGHT_ITEM
BINOCULARS_ITEM
SILENCER_ITEM
FLARE_ITEM
FLARE_INV_ITEM
COMPASS_ITEM
DIARY_ITEM
STOPWATCH_ITEM
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
MEMCARD_LOAD_INV_ITEM
MEMCARD_SAVE_INV_ITEM
2022-09-13 21:23:57 +01:00
PC_LOAD_INV_ITEM
PC_SAVE_INV_ITEM
</code></pre>
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
</dd>
<dt>
<a name = "SpriteConstants"></a>
<strong>SpriteConstants</strong>
</dt>
<dd>
<p>Objects.ObjID sprite constants. </p>
<p>The following ObjID members refer to sprites.</p>
<pre><code>SKY_GRAPHICS
DEFAULT_SPRITES
MISC_SPRITES
CUSTOM_SPRITES
FIRE_SPRITES
SMOKE_SPRITES
SPARK_SPRITE
DRIP_SPRITE
EXPLOSION_SPRITES
MOTORBOAT_FOAM_SPRITES
RUBBER_BOAT_WAVE_SPRITES
SKIDOO_SNOW_TRAIL_SPRITES
KAYAK_PADDLE_TRAIL_SPRITE
LASERSIGHT_GRAPHICS
CAUSTIC_TEXTURES
BAR_BORDER_GRAPHICS
HEALTH_BAR_TEXTURE
AIR_BAR_TEXTURE
DASH_BAR_TEXTURE
SFX_BAR_TEXTURE
2025-03-11 23:52:11 +01:00
WATERFALL_SPRITES
FIREFLY_SPRITES
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
CROSSHAIR_GRAPHICS
SPEEDOMETER_GRAPHICS
CUSTOM_BAR_GRAPHICS
CUSTOM_AMMO_GRAPHICS
2025-03-11 23:52:11 +01:00
DIARY_SPRITES
DIARY_ENTRY_SPRITES
Squashed commit of the following: commit 8ea54ea7d4cfd1963f21a6949a201e212d8ebc64 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:34:57 2025 +0100 Fix merge commit 566b694c9d79d8e7a9e78af3f16c28d14ece139b Merge: 935b26bd6 e97c47315 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:33:43 2025 +0100 Merge branch 'develop' into pr/1496 commit 935b26bd669088d2bd3dd809ac25752f5e7cf18c Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue Mar 11 23:31:57 2025 +0100 Use script to generate object list, also migrate flatbuffer to powershell script commit a6ec51e9d49be96db17a672600e715d505de73e6 Merge: 7bf0ffef6 676762e11 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:53:23 2024 +0100 Merge branch 'develop' into mod commit 676762e11591543ea9cfc3fd4ecf3287f488dd9f Merge: ae0488410 5597750c2 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Dec 29 12:48:24 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7bf0ffef6c6b459d7adb5acb2400b26174a8a452 Merge: b876f347c ae0488410 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:59:22 2024 +0100 Merge branch 'develop' into mod commit ae0488410206b385785da3712839058407ca359c Merge: e1c61aca0 8fb4668df Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Dec 26 11:58:28 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit b876f347c7e74a78ba8333283553697743fef58d Merge: 0669b6f01 e1c61aca0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:24:15 2024 +0100 Merge branch 'develop' into mod commit e1c61aca03132c465dcdd13870175e19cb2fb025 Merge: f557f0081 88bbe4862 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:23:31 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 0669b6f0123bec4d01fc436f98d736296fa6afb1 Merge: f978ad1b5 f557f0081 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 18 19:21:52 2024 +0100 Merge branch 'develop' into mod commit f557f00815cb4ee110502fbe96d8409ef93b6964 Merge: 34beccfcc ae7924797 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Mon Dec 16 18:45:13 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 34beccfccc2864473e557a75ea52df29bb4f3408 Merge: 6516a8b87 2f6114deb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Dec 13 20:23:25 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 6516a8b87b29491d89cc083d4078cb9128232bca Merge: babdad1a7 e674b8526 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Dec 11 15:48:14 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit f978ad1b53f6a4516b9efb3aae1ad2028d5e6114 Merge: 96663d564 babdad1a7 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:37:39 2024 +0100 Merge branch 'develop' into mod commit babdad1a74bca4e9b1ce8422f9b678e1aeed41e1 Merge: c3a97f411 d96bf4ba8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sat Dec 7 08:35:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 96663d564602c7291182ea03b97c0729965a3d9c Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 13:35:50 2024 +0100 add SpriteConstants commit 89c27fc19da81ac6c624b1478b3e0e52aa089dbe Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:59 2024 +0100 Revert "conversion error" This reverts commit f811117458d3747c53be3c7cb8ae85338d26092b. commit 3dd8e76d8bad14500cdfbeb89e5be05d56997b14 Merge: 4195bc042 c3a97f411 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:50:48 2024 +0100 Merge branch 'develop' into mod commit c3a97f4113cdbf818fde0f106cd744670db8259c Merge: 4af4d14db db7f86485 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Nov 28 12:49:21 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4af4d14db88e61ddf516be3516163538bdfaa542 Merge: 5e87ac32e 27d3ca7bb Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:23:35 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 4195bc042ab3cfc1af415409967e044904922cc9 Merge: f81111745 5e87ac32e Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:20:32 2024 +0100 Merge branch 'mod' of https://github.com/davidmarr/TombEngine into mod commit f811117458d3747c53be3c7cb8ae85338d26092b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:17:53 2024 +0100 conversion error commit 5e87ac32e6c69700fd5c484e1cc6ecde405b44de Merge: ef1a7d2d0 19be42911 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:38 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 7643d190829c91d49cf159a44991d1d863c0b6a9 Merge: 202c94f02 d256fe1ef Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:15:03 2024 +0100 Merge branch 'MontyTRC89:master' into mod commit ef1a7d2d0fbed410dc7364b7e431f92bb537a773 Merge: 9e94324e9 202c94f02 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Nov 24 13:04:23 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit 9e94324e93ea14e779385720690f580fcdfdf594 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:19:10 2024 +0100 Revert "function description LevelFuncs.OnUseItem" This reverts commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f. commit 2478afca68f1e0ce11c610f07da6c6588cc4f35f Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:18:56 2024 +0100 function description LevelFuncs.OnUseItem commit 37be06150ec8e3ec02a95d58fdd2201f2081746b Merge: c7c3451c1 222e67e49 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Nov 8 20:01:48 2024 +0100 Merge branch 'MontyTRC89:develop' into develop commit d256fe1efe9474bac52620d21d26c15a53c23efc Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Sun Nov 3 22:19:11 2024 +0000 Update bug_report.yaml commit 710f04596bc6e8fa2d7a588bf9fc223f98d1858a Merge: 1affcce9b 0b5ea0db7 Author: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Sun Nov 3 18:37:17 2024 +0100 Merge branch 'develop' commit 1affcce9b95727ab110e77e55538835465442cba Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:18:34 2024 +0000 Update CHANGELOG.md commit fae8744e4bc950f962a4824e8a6e1ff485a08be7 Author: Jakub <80340234+Jakub768@users.noreply.github.com> Date: Sun Nov 3 14:16:05 2024 +0000 Update CHANGELOG.md commit 815498ec8a7791716bb7b3dfa1996ceebdcbd6ae Merge: d81fce22a c3365f3a3 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 13:51:09 2024 +0000 Merge branch 'develop' commit d81fce22ada44cbb40720a4905e48c83adf1e92d Merge: 30e053dc9 a962a17f6 Author: Jakub <kubabilinski03@gmail.com> Date: Sun Nov 3 12:35:58 2024 +0000 Merge branch 'develop' commit 30e053dc935646a3c8d900b2adbd90b107995048 Author: Nemoel-Tomo <tomo_669@hotmail.com> Date: Wed Oct 30 18:00:21 2024 +0100 Update AUTHORS.md - Tomo (general coding, special FX coding, bug fixing) commit c7c3451c1c7476b342f33ec8f2b1a32710719b25 Merge: 4fc411abe e4098c458 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Oct 25 14:44:24 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit 4fc411abe9a8885e3d3376e015047caec2ea9eae Merge: bfcd93f52 f7a22ea1a Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Sun Oct 20 21:38:01 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit bfcd93f52c02796c6cb1e9365a1f69ba894d98af Merge: bdea82d74 deec54ff8 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Wed Oct 9 19:59:14 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit eca79130a0acef2c4371054ef0ef40367a1c905a Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:45:21 2024 +0100 Update bug_report.yaml commit 7fee647c84fab993fc7ba7df7747d6238e41193b Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com> Date: Tue Sep 3 09:44:53 2024 +0100 Update to bug report form commit bdea82d742d185c8d2228a4bf8bb59c946117190 Merge: c3b4ecf9b 60b9055d0 Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Fri Aug 30 12:56:53 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit c3b4ecf9b6fc349f9242e84fc4869ba8c5702d31 Merge: b107327f0 37f056bfa Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Tue Aug 13 22:46:38 2024 +0200 Merge branch 'MontyTRC89:develop' into develop commit b107327f0a8e8b50447b92ffb9288366ab3ab02b Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:19:30 2024 +0200 Update CHANGELOG.md commit 25aaba63163a6816bc5be831815a1140c52c8fcf Author: davidmarr <116632612+davidmarr@users.noreply.github.com> Date: Thu Jul 25 13:16:58 2024 +0200 Update VolumeObject.cpp fixed Volume:GetActive() method
2025-03-11 23:38:35 +01:00
</code></pre>
2021-08-12 20:16:28 +01:00
2022-12-09 22:08:16 +00:00
2021-08-12 20:16:28 +01:00
</dd>
</dl>
</div> <!-- id="content" -->
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="https://github.com/hispidence/TEN-LDoc">TEN-LDoc</a> (a fork of <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a>)</i>
2021-08-12 20:16:28 +01:00
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
</html>