Lwmte
|
17864c7f94
|
Remove old project name mentions everywhere
|
2021-11-07 12:50:55 +03:00 |
|
Lwmte
|
be27494dc8
|
Remove unused hardcoded vars from LaraInfo
|
2021-11-04 19:25:23 +03:00 |
|
MontyTRC89
|
4c3583c1ed
|
Merge remote-tracking branch 'origin/inventory_class' into savegame
# Conflicts:
# TR5Main/Game/savegame.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/input.cpp
|
2021-10-15 05:23:04 +02:00 |
|
MontyTRC89
|
29d4f54976
|
Added Lara and missing fields; Testing savegames;
|
2021-10-14 17:26:10 +02:00 |
|
Lwmte
|
7203a4ee51
|
Re-enable custom animations
|
2021-10-08 01:46:29 +03:00 |
|
Lwmte
|
d8aa65260f
|
Make Lara targetable again
|
2021-09-16 03:56:04 +03:00 |
|
Lwmte
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
3fe6211e4e
|
Further organizing
|
2021-09-08 18:31:35 +03:00 |
|
Lwmte
|
f293735d11
|
Move all effect source files to separate directory, rename effect2 to effects
|
2021-09-08 18:07:48 +03:00 |
|
MontyTRC89
|
713b52b616
|
Merge pull request #322 from MontyTRC89/generalPtr
Renamed "generalPtr" of LaraInfo to "interactedItem"
|
2021-09-08 16:43:33 +02:00 |
|
Raildex
|
f62f900fb0
|
Added new Tightrope behaviour
You can use Left and Right to control lara's balance
Lara will gradually lose balance
When lara stops, her balance regenerates
|
2021-09-05 14:49:00 +02: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 |
|
Lwmte
|
6d9cf3c214
|
Fix namespace case
|
2021-08-30 18:03:21 +03:00 |
|
Lwmte
|
21df1e84f1
|
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
|
2021-08-29 23:53:58 +03:00 |
|
Raildex
|
2621fa8f0d
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|
Raildex
|
dabbeb88db
|
Fixed Include Hell for Creature Info
|
2021-08-28 12:16:03 +02:00 |
|
Lwmte
|
e082d8d435
|
Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct
|
2021-08-28 10:29:48 +03:00 |
|
Lwmte
|
b8c3b67f10
|
Move collision and FX functions from effect.cpp
|
2021-08-26 15:54:52 +03:00 |
|
MontyTRC89
|
0ed8181cda
|
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
|
2021-08-20 05:25:51 +02:00 |
|
hispidence
|
53b971c033
|
Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings.
|
2021-07-18 15:22:15 +01:00 |
|
Troye
|
f5ec4695ef
|
Add more anims to NewAnims; Fix lean
|
2021-07-09 19:41:56 -05:00 |
|
Troye
|
88407761b1
|
clean up larainfo; add anim bools'
|
2021-07-08 14:15:14 -05:00 |
|
Trxye
|
55b517010d
|
diary bs
|
2021-06-15 14:09:49 -05:00 |
|
Trxye
|
9a54e9a124
|
implement extra pickup items & examines
|
2021-06-11 01:06:43 -05:00 |
|
Trxye
|
0c6f3de5b7
|
fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory;
|
2021-06-10 14:40:28 -05:00 |
|
MontyTRC89
|
00a5c93eb4
|
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
|
2021-06-06 06:49:58 +02:00 |
|
MontyTRC89
|
b3f1f246e1
|
Partially fixed ID_GUIDE; Restored flipeffects processing; Fixed LARA_INFO struct for flipeffect 30 Lara location;
|
2021-06-06 06:49:49 +02:00 |
|
Trxye
|
61db16c17e
|
implement waterskins
|
2021-06-05 15:27:19 -05:00 |
|
Trxye
|
3edfe48af6
|
decompile clockwork beetle;
|
2021-05-27 16:07:57 -05:00 |
|
Raildex
|
2138df91c3
|
Fixing Ammo
|
2021-01-26 10:28:08 +01:00 |
|
Raildex
|
d45db30cd9
|
Ammo struct to better represent Ammo
|
2021-01-25 13:58:23 +01:00 |
|
Sezz
|
0b6721058f
|
Revert "Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset."
This reverts commit cde394c3f4.
|
2020-09-26 05:06:08 +10:00 |
|
Sezz
|
cde394c3f4
|
Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset.
|
2020-09-26 03:28:30 +10:00 |
|
asasas9500
|
547b643232
|
Merge branch 'master' into NoShifts
|
2020-08-25 19:25:28 -03:00 |
|
Woops
|
ade98fec65
|
Lara refactor: move basic movements to lara_basic, take care of the other functions.
|
2020-08-14 17:54:25 -05:00 |
|
asasas9500
|
78b32c0c2e
|
Merge branch 'LaraRefactor' into NoShifts
|
2020-08-07 22:30:45 -03:00 |
|
asasas9500
|
dddafb494f
|
Move Lara related files to Lara folder
|
2020-08-07 20:27:00 -03:00 |
|