Lwmte
27c4dee8b2
Merge branch 'master' into errors
2021-10-28 11:28:24 +03:00
Troye
aff27bd805
removed slot resets; fix save/load while hanging;
2021-10-15 17:41:15 -05:00
MontyTRC89
51cc21338e
Linked all the coded for loading and saving
2021-10-15 05:55:22 +02: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
Troye
9f0a37847d
Preserve load/save slot selection through inventory menu; exit inv if user saves;
2021-10-13 23:02:24 -05:00
Troye
37d59d9384
exit display settings menu when hit apply
2021-10-13 15:15:02 -05:00
Troye
82c968662e
get rid of bitwise menuing
2021-10-13 15:10:48 -05:00
Troye
b8ef83dd83
menuing
2021-10-13 12:24:04 -05:00
Troye
def1169966
Implement LoadSave UI; Fix Grenade ammo selection; Fix pause flicker; fix infinite shotgun ammo;
2021-10-12 15:05:07 -05:00
Troye
af287cdf6d
InventoryClass;
2021-10-12 04:15:22 -05:00
Troye
acc4281555
purge ring inventory;
2021-10-12 00:26:46 -05:00
Lwmte
c4edbe3f26
Fixes
2021-10-08 16:45:45 +03:00
Troye
552352dd21
W1
2021-09-25 16:03:28 -05:00
Lwmte
e6fc5aba77
Cleanup
2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282
Added newlines
2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad
Fixed duplicated ITEM_INFO definition
2021-09-24 07:53:42 +02:00
Lwmte
cefc60c7ea
Move around some files
2021-09-19 23:41:26 +03:00
Lwmte
8d86c2e97d
Rename draw.cpp to animation.cpp which makes more sense, some more edits
2021-09-16 05:06:03 +03:00
Lwmte
d8aa65260f
Make Lara targetable again
2021-09-16 03:56:04 +03:00
Lwmte
1d0ceb0ff4
Fix more stuff
2021-09-16 01:12:19 +03:00
Lwmte
68923228dd
Remove unused globals and move others from control.cpp to needed source files
2021-09-15 21:09:09 +03:00
Lwmte
257b5d8e0a
Fix undefined return bugs
2021-09-13 23:44:52 +03:00
Lwmte
744325bea2
Revert "Fix regressions"
...
This reverts commit c1fc33ab52
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52
Fix regressions
2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868
Merge branch 'doors_refactoring'
...
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02:00
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
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
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02: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
wolfcheese
8ecef928fc
Removed inappropriate object number conversion when listing inventory items
2021-08-12 15:59:50 -04:00
hispidence
63d5f56b22
Big audio & audio settings cleanup.
...
Remove "Sound Enabled" setting, as it would disable BASS if used, leading to a load of warning messages and missing sounds when re-enabled.
Currently-playing track(s) now get quieter/louder when using the music volume slider in the audio settings menu.
Encapsulate GlobalMusicVolume and GlobalFXVolume in functions (at the time of writing this is only strictly necessary for music volume, since SetVolumeMusic needs to also set the volume of currently-playing tracks).
Make "apply" button return to the previous menu, as it does with keyboard controls.
Replace a printf call with a TENLog call.
2021-08-12 00:38:15 +01:00
hispidence
0974fc091c
Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
...
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01:00
Lwmte
407373d193
Remove poisoning by medkits
2021-08-02 14:44:28 +03:00
Lwmte
e013ed4e24
Fix binoculars mode engaging other states
2021-08-02 12:35:17 +03:00
MontyTRC89
916d22759b
Merge remote-tracking branch 'origin/lara_info'
...
# Conflicts:
# TR5Main/Game/Lara/lara_flare.h
# TR5Main/Scripting/GameLogicScript.cpp
2021-07-14 05:48:42 +02:00
hispidence
b93b6aca71
Use GetInventoryCount in have_i_got_object as it works the same way.
2021-07-11 17:10:35 +01:00
Troye
8dc41f1f0f
fix control selection screens
2021-07-08 17:57:08 -05:00
MontyTRC89
a455a091c0
Removed test code; Removed scripts from project (they will be created by LD); Added some missing strings for inventory; Added scripting for puzzles; Removed some old code for scripting;
2021-06-23 05:58:24 +02:00
MontyTRC89
dc5db910f2
Added translations support and fixed some bugs with strings
2021-06-20 06:33:44 +02:00
MontyTRC89
a6b3916d72
Merge conflicts
2021-06-19 07:14:38 +02:00
MontyTRC89
a4467c2a4b
Moving to stringed keys for game strings
2021-06-19 07:11:22 +02:00
Trxye
55b517010d
diary bs
2021-06-15 14:09:49 -05:00
Trxye
a1b49f75bf
move options_table to the inventory list; implement rotation flags
2021-06-11 02:47:23 -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
Trxye
846308a641
implement inv obj rotations
2021-06-07 04:23:30 -05:00
Trxye
ef5041c5e0
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2021-06-06 15:01:52 -05:00
Trxye
53647806e4
implement examines; add inventory scale support; fix rocket and harpoon ammo not showing;
2021-06-06 15:01:46 -05:00
