Lwmte
42bb372f63
Remove unused globals and move others from control.cpp to needed source files
2021-09-15 21:09:09 +03:00
Lwmte
4186dfe685
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
Nils
7f774d04b3
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
Lwmte
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Nils
58eda862e3
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
MontyTRC89
109b7d6e18
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine ; Renamed namespaces;
...
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
Lwmte
16c36be7de
Reorder renderer operations, redo debug output (use F10-F11 to switch pages), add debug sphere/box drawing
2021-08-06 11:12:34 +03:00
Lwmte
fd844d5d6b
Remove poisoning by medkits
2021-08-02 14:44:28 +03:00
MontyTRC89
6b5a932ff8
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +02:00
asasas9500
4521994088
Remove function markers
2021-02-03 01:50:59 -03:00
asasas9500
d4c6cc4a97
Fix line endings
2020-12-21 13:16:29 -03:00
Woops
8df350b072
uncomment hotkeys
2020-08-10 13:01:53 -05:00
Sebastian Zych
6a3700345e
Updated animation and state names to follow a consistent system.
2020-08-04 20:32:07 +10:00
Woops
a6d98b615b
bring back weapon hotkeys
2020-06-19 15:27:11 -05:00
TokyoSU
ee59d27517
(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
9c1c4517d7
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
Wuups
17e0e5d9e8
Fix heal sound not triggering if small medi doesn't top off Lara's health
2020-05-07 12:05:52 -05:00
Montagna Marco
46f2db3481
Merged LARA_INFO and LaraExtraInfo into LaraInfo
2020-04-27 14:01:00 +02:00
Montagna Marco
85e462f6a2
First EXE build successfully
2020-04-24 19:15:05 +02:00
Montagna Marco
4cc46789e9
Decompiled input
2020-04-23 19:22:01 +02:00
TokyoSU
937b026d25
Revert "Improved some lara function"
...
This reverts commit dfc8023b68
2019-12-16 19:04:28 +01:00
TokyoSU
dfc8023b68
Improved some lara function
2019-12-16 17:11:24 +01:00
TokyoSU
4bd18f7f18
Now release mode is compatible
2019-12-15 16:19:01 +01:00
TokyoSU
3670fddc71
Added Sophia
...
- deleted all the __cdecl except for the #define function. because /Gd enable the __cdecl for function by default.
- added the commented code in FireWeapon for TR3 entity (some function is missing)
2019-12-02 14:49:19 +01:00
Montagna Marco
09c2957f4f
Merged branches
2019-12-02 09:11:21 +01:00
MontyTRC89
5a2842f89d
Refactoring
2019-04-29 13:10:58 +02:00
MontyTRC89
fce3ca3b5f
Fixed keyboard handling
2019-04-28 20:19:27 +02:00
MontyTRC89
881f08b475
Added keys names; Added new strings; Fixed rings titles; Started working on controls setup; Added load and save of keys;
2019-04-27 18:22:30 +02:00
MontyTRC89
da2804d997
Improving setup dialog; Working on sunglasses object;
2018-12-30 11:41:48 +01:00
MontyTRC89
e6114af969
First commit
2018-08-19 09:46:58 +02:00
