Merge branch 'develop' into sezz/los-refactor-from-modern-controls

This commit is contained in:
Lwmte 2025-04-19 09:31:06 +02:00
commit 21ddcc412c
6 changed files with 35 additions and 23 deletions

View file

@ -1,5 +1,5 @@
name: Bug report
description: Create a report to help us understand and diagnose your issue. Your contribution is welcomed and valued!
description: Create a report to help us understand and diagnose your issue. Your contribution is welcomed and valued! It is highly recommended that you are using the latest version before submitting a bug report.
title: "[ bug Report ]"
labels: Awaiting Triage
@ -8,17 +8,19 @@ body:
- type: markdown
attributes:
value: |
Please follow this document in order to report a bug
Please follow this document in order to report a bug. It is highly recommended that you are using the latest version before submitting a bug report.
- type: dropdown
attributes:
label: TombEngine version
description: |
Please select the TombEngine Version from the dropdown list.
Please select the TombEngine Version from the dropdown list.
options:
- Development Build
- v1.5.0.2 (Latest Release)
- v1.4
- v1.8.0 (latest version)
- v1.7.1
- v1.7.0
- v1.5
validations:
required: true
@ -29,6 +31,7 @@ body:
Please select the Tomb Editor version used from the dropdown list.
options:
- Development Build
- v1.8.0 (latest version)
- v1.7.2
- v1.7.1
- v1.7.0

View file

@ -17,6 +17,7 @@ This is the credit list of **all** the people who contributed to TombEngine in a
- Sezz (player state refactoring, general coding, code cleanups, bug fixing, assets)
- Squidshire (Hispidence) (Lua implementation, bug fixing)
- Stranger1992 (sound asset refactoring and organisation, assets)
- TrainWreck (asset coding and Lua enhancements)
- TokyoSU (entity and vehicle decompilation)
- Tomo (general coding, special FX coding, bug fixing)
- Troye (general coding, refactoring)
@ -49,4 +50,4 @@ This is the credit list of **all** the people who contributed to TombEngine in a
- JoeyQuint (Standing 180° turn, monkey swing 180° turn)
### TombEngine Marketing
- Stranger1992 (This website, Facebook, Instagram, Youtube, Twitter, and Twitch.
- Stranger1992 (Tomb Engine website, Discord, Facebook, Instagram, Youtube, X, and Twitch)

23
LICENSE
View file

@ -1,16 +1,23 @@
MIT License
Modified MIT License (for non-commercial use only)
Copyright (c) 2025 TombEngine Team
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
of this software and associated documentation files (the “Software”), to use,
copy, modify, merge, publish, and distribute copies of the Software, and to
permit persons to whom the Software is furnished to do so, for non-commercial
purposes only, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
1. Commercial use of the Software — including, but not limited to, selling,
renting, leasing, or using it in a product or service for which you receive
compensation (monetary or otherwise) — is strictly prohibited.
2. The Software may be combined with proprietary or closed-source third-party
components, provided those components are available for non-commercial use,
and the resulting product is not used for commercial purposes.
3. The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

View file

@ -8,9 +8,7 @@
- Support for high framerate, antialiasing, mipmapping, and SSAO.
- Full diagonal geometry support.
- Uncapped map size.
- A streamlined player control scheme..
Contributions are welcome. If you would like to participate in development to any degree, whether that be through suggestions, bug reports, or code, join our [Discord server](https://discord.gg/h5tUYFmres).
- A streamlined player control scheme.
*Tomb Engine* is used in conjunction with *Tomb Editor*. The repository can be found [here](https://github.com/MontyTRC89/Tomb-Editor).
@ -36,6 +34,9 @@ Steps:
Once done, you should be able to build a level with *Tomb Editor* and run it in *TEN*.
# Disclaimer
This community project is unaffiliated with Core Design, Eidos Interactive, or Embracer Group AB. *Tomb Raider* is a registered trademark of Embracer Group AB. *Tomb Engine* is not for sale. The code is open-source to encourage contributions and for study purposes. We are not responsible for illegal uses of this source code. This source code is released as-is and continues to be maintained by non-paid contributors in their free time.
# Contributions
Contributions are welcome. If you would like to participate in development to any degree, whether that be through suggestions, bug reports, or code, join our [Discord server](https://discord.gg/h5tUYFmres).
# Disclaimer
Tomb Engine uses modified MIT license for non-commercial use only. For more information, see [license](LICENSE). Tomb Engine is unaffiliated with Core Design, Eidos Interactive, or Embracer Group AB. *Tomb Raider* is a registered trademark of Embracer Group AB. Tomb Engine source code is open to encourage contributions and for study purposes. Tomb Engine team is not responsible for illegal use of this source code alone or in combination with third-party assets or components. This source code is released as-is and continues to be maintained by non-paid contributors in their free time.

View file

@ -746,7 +746,7 @@ enum GAME_OBJECT_ID : short
ID_INVENTORY_SUNGLASSES,
ID_INVENTORY_KEYS,
ID_INVENTORY_HEADPHONES,
ID_INVENTORY_POLAROID,
ID_INVENTORY_PHOTO,
ID_SMOKE_EMITTER_WHITE = 1020,
ID_SMOKE_EMITTER_BLACK,

View file

@ -1,7 +1,7 @@
#pragma once
// This file is generated automatically, do not edit it.
// Last generated on 17/03/2025.
// Last generated on 18/04/2025.
#include <unordered_map>
#include <string>
@ -746,7 +746,7 @@ The following constants are inside ObjID.
INVENTORY_SUNGLASSES
INVENTORY_KEYS
INVENTORY_HEADPHONES
INVENTORY_POLAROID
INVENTORY_PHOTO
SMOKE_EMITTER_WHITE
SMOKE_EMITTER_BLACK
SMOKE_EMITTER
@ -1986,7 +1986,7 @@ static const std::unordered_map<std::string, GAME_OBJECT_ID> GAME_OBJECT_IDS {
{ "INVENTORY_SUNGLASSES", ID_INVENTORY_SUNGLASSES },
{ "INVENTORY_KEYS", ID_INVENTORY_KEYS },
{ "INVENTORY_HEADPHONES", ID_INVENTORY_HEADPHONES },
{ "INVENTORY_POLAROID", ID_INVENTORY_POLAROID },
{ "INVENTORY_PHOTO", ID_INVENTORY_PHOTO },
{ "SMOKE_EMITTER_WHITE", ID_SMOKE_EMITTER_WHITE },
{ "SMOKE_EMITTER_BLACK", ID_SMOKE_EMITTER_BLACK },
{ "SMOKE_EMITTER", ID_SMOKE_EMITTER },