Lwmte
48a9a1d52a
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92
Further code organizing
2021-09-08 18:19:06 +03:00
Raildex
2ee57e5891
Renamed "generalPtr" of LaraInfo to "interactedItem"
...
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +02:00
Raildex
b422cafc79
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_struct.h
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/collide.h
# TR5Main/Game/control.h
# TR5Main/Game/effect.h
# TR5Main/Game/effect2.cpp
# TR5Main/Game/flipeffect.cpp
# TR5Main/Game/floordata.h
# TR5Main/Game/hair.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/newinv2.cpp
# TR5Main/Game/spotcam.cpp
# TR5Main/Objects/Effects/tr4_bubbles.cpp
# TR5Main/Objects/TR1/Entity/tr1_ape.cpp
# TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
# TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
# TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
# TR5Main/Objects/TR2/Entity/tr2_shark.cpp
# TR5Main/Objects/TR2/Entity/tr2_spider.cpp
# TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
# TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
# TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
# TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
# TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
# TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
# TR5Main/Objects/TR3/Entity/tr3_trex.cpp
# TR5Main/Objects/TR3/Vehicles/kayak.cpp
# TR5Main/Objects/TR3/Vehicles/minecart.cpp
# TR5Main/Objects/TR4/Entity/tr4_bat.cpp
# TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
# TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_dog.cpp
# TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
# TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
# TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
# TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_troops.cpp
# TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Vehicles/motorbike.cpp
# TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
# TR5Main/Objects/TR5/Entity/tr5_imp.cpp
# TR5Main/Objects/TR5/Entity/tr5_larson.cpp
# TR5Main/Objects/TR5/Entity/tr5_lion.cpp
# TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
# TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
# TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
# TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
# TR5Main/Renderer/Renderer11Draw2D.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02:00
Raildex
44c454318f
Cleaned up several buffers to use fixed arrays
...
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02:00
Raildex
f7080f56c9
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Raildex
59987a69a7
Refactored several info types into separate files
2021-08-29 10:19:47 +02:00
Raildex
c6fcf8b248
Renamed creature.h to creature_info.h
2021-08-29 10:04:49 +02:00
Lwmte
0b7c3d4a20
Merge branch 'master' into legacy_trigger_refactor
2021-08-28 21:38:58 +03:00
Raildex
dabbeb88db
Fixed Include Hell for Creature Info
2021-08-28 12:16:03 +02:00
MontyTRC89
d0da243f73
Refactored switches
2021-08-28 06:37:22 +02:00
Lwmte
1f68fd812b
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
d394bcc39f
Completely get rid of TriggerIndex
2021-08-20 15:26:12 +03:00
hispidence
02ee34a786
The explicit cast to void * made this line resolve to an assignment to an rvalue, but removing it fixes it.
2021-07-23 21:54:57 +01:00
MontyTRC89
98c62c58bb
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2021-07-14 05:30:04 +02:00
hispidence
54e14ccb3f
Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short.
2021-07-11 16:55:20 +01:00
MontyTRC89
1effeed738
Refactored cameras, sinks and sound sources; Added sound sources playback;
2021-07-10 06:55:37 +02:00
MontyTRC89
a507e9e1be
Moved GameScriptPosition, GameScriptRotation and GameScriptColor classes in separate files
2021-06-29 05:28:17 +02:00
MontyTRC89
a4d3ec9d26
Switched audio tracks from int index to string; Added Tracks.lua loading support;
2021-06-26 07:36:54 +02:00
MontyTRC89
a4467c2a4b
Moving to stringed keys for game strings
2021-06-19 07:11:22 +02:00
Trxye
c0ca04a806
clean up ring inventory code; fix KillItem();
2021-05-26 01:58:30 -05:00
asasas9500
10a3d9167a
Fix line endings
2020-12-21 13:16:29 -03:00
asasas9500
82d9dc4bea
Separate bridge floor and ceiling; Fix pushables
2020-11-11 15:01:45 -03:00
asasas9500
547b643232
Merge branch 'master' into NoShifts
2020-08-25 19:25:28 -03:00
Woops
6ada970725
Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes.
2020-08-16 16:01:58 -05:00
Raildex
a3433e16cb
Deactivated Pool memory
...
@TODO: Fix Pool
Changed pointers for ChunkIds to smart pointers
2020-08-11 19:18:36 +02:00
MontyTRC89
689ec226e7
Frames refactoring
2020-07-25 18:02:35 +02:00
MontyTRC89
83bba01a99
Moving all globals of level under LEVEL struct; Fixed severe performance issue;
2020-07-21 09:56:47 +02:00
MontyTRC89
2d72803342
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-07-11 21:29:49 +02:00
MontyTRC89
9867a6d24c
Pathfinding refactoring
2020-07-11 21:16:04 +02:00
Raildex
09071a2b88
Merge branch 'master' into memory
...
# Conflicts:
# TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
MontyTRC89
36fe66d617
Hairs done on GPU now
2020-07-07 07:32:33 +02:00
Raildex
5ef674b577
Made Game_Malloc a template with a count parameter
2020-07-05 22:19:06 +02:00
MontyTRC89
7ff7397fa7
New level format: meshes
2020-07-03 07:05:33 +02:00
MontyTRC89
5b8c90b688
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-06-26 07:06:51 +02:00
MontyTRC89
d8bf82eab1
New FLOOR_INFO struct; Refactoring rooms part I
2020-06-26 07:06:18 +02:00
Raildex
b635f4df13
Fixed std namespace collisions
...
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
TokyoSU
900235c967
Implemented Baboon
...
- Fixed AIObject not being initialized !
- Fixed ITEM_DEACTIVATED (cause im french and ITEM_DESACTIVATED is more appropriate)
2020-06-04 12:49:08 +02:00
TokyoSU
e355827ee5
Fixed Repo, Fixed Savegame Struct Missing
2020-05-30 17:58:09 +02:00
TokyoSU
b615a98c46
(Broken) Deleted Global Folder
...
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
TokyoSU
937038cf2f
Fix Savegame Puzzle
2020-05-27 19:37:01 +02:00
TokyoSU
963706c3af
Partially finished Entity Folder Refactoring
...
- Less Compile Time
- ObjectInfo now use std::function.
- added isPickup and isPuzzleHole in ObjectInfo.
- Renamed EVIL_LARA to LARA_DOPPELGANGER (DOPPELGANGER in xml)
- Removed TR1 Larson/Pierre and TR1 Raptor.
2020-05-27 19:07:34 +02:00
TokyoSU
29f0724693
New project format ( #206 )
...
* Starting Reformat the project
- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time
* Refactoring the Project
- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.
* Update Some Code Before Switching to Master
* Finished the NewProjectFormat Template
- need to finish entity in the master later.
* Added Monty NewFileFormat
* Fixed Monty NewFileFormat Include
* Revert "Fixed Monty NewFileFormat Include"
This reverts commit ebf0afca10
2020-05-27 09:21:20 +02:00
MontyTRC89
22ccaa2c5a
Merge branch 'master' into scripting
2020-04-30 21:52:16 +02:00
asasas9500
4dc0169461
Improve Lua scripting
2020-04-28 12:24:10 -03:00
MontyTRC89
fdc3ff9996
Refactored OBJET_INFO to ObjectInfo
2020-04-27 15:28:54 +02:00
MontyTRC89
5f63d6acba
Merged LARA_INFO and LaraExtraInfo into LaraInfo
2020-04-27 14:01:00 +02:00
MontyTRC89
f3bb956927
First EXE build successfully
2020-04-24 19:15:05 +02:00
MontyTRC89
9a78144600
Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib;
2020-04-22 14:12:10 +02:00
MontyTRC89
cbe9f362b6
Fixed chase camera; Moved Camera in DLL;
2020-04-12 06:50:43 +02:00
