Lwmte
|
f01ad441d3
|
Squashed commit of the following:
commit 8ea54ea7d4
Author: Lwmte <3331699+Lwmte@users.noreply.github.com>
Date: Tue Mar 11 23:34:57 2025 +0100
Fix merge
commit 566b694c9d
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 935b26bd66
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 a6ec51e9d4
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 676762e115
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 7bf0ffef6c
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 ae04884102
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 b876f347c7
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 e1c61aca03
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 0669b6f012
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 f557f00815
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 34beccfccc
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 6516a8b87b
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 f978ad1b53
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 babdad1a74
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 96663d5646
Author: davidmarr <116632612+davidmarr@users.noreply.github.com>
Date: Thu Nov 28 13:35:50 2024 +0100
add SpriteConstants
commit 89c27fc19d
Author: davidmarr <116632612+davidmarr@users.noreply.github.com>
Date: Thu Nov 28 12:50:59 2024 +0100
Revert "conversion error"
This reverts commit f811117458.
commit 3dd8e76d8b
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 c3a97f4113
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 4af4d14db8
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 4195bc042a
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 f811117458
Author: davidmarr <116632612+davidmarr@users.noreply.github.com>
Date: Sun Nov 24 13:17:53 2024 +0100
conversion error
commit 5e87ac32e6
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 7643d19082
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 ef1a7d2d0f
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 9e94324e93
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 2478afca68.
commit 2478afca68
Author: davidmarr <116632612+davidmarr@users.noreply.github.com>
Date: Fri Nov 8 20:18:56 2024 +0100
function description LevelFuncs.OnUseItem
commit 37be06150e
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 d256fe1efe
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Sun Nov 3 22:19:11 2024 +0000
Update bug_report.yaml
commit 710f04596b
Merge: 1affcce9b 0b5ea0db7
Author: Lwmte <3331699+Lwmte@users.noreply.github.com>
Date: Sun Nov 3 18:37:17 2024 +0100
Merge branch 'develop'
commit 1affcce9b9
Author: Jakub <80340234+Jakub768@users.noreply.github.com>
Date: Sun Nov 3 14:18:34 2024 +0000
Update CHANGELOG.md
commit fae8744e4b
Author: Jakub <80340234+Jakub768@users.noreply.github.com>
Date: Sun Nov 3 14:16:05 2024 +0000
Update CHANGELOG.md
commit 815498ec8a
Merge: d81fce22a c3365f3a3
Author: Jakub <kubabilinski03@gmail.com>
Date: Sun Nov 3 13:51:09 2024 +0000
Merge branch 'develop'
commit d81fce22ad
Merge: 30e053dc9 a962a17f6
Author: Jakub <kubabilinski03@gmail.com>
Date: Sun Nov 3 12:35:58 2024 +0000
Merge branch 'develop'
commit 30e053dc93
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 c7c3451c1c
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 4fc411abe9
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 bfcd93f52c
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 eca79130a0
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Tue Sep 3 09:45:21 2024 +0100
Update bug_report.yaml
commit 7fee647c84
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Tue Sep 3 09:44:53 2024 +0100
Update to bug report form
commit bdea82d742
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 c3b4ecf9b6
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 b107327f0a
Author: davidmarr <116632612+davidmarr@users.noreply.github.com>
Date: Thu Jul 25 13:19:30 2024 +0200
Update CHANGELOG.md
commit 25aaba6316
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 |
|