Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-01 09:18:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2095 commits 64 branches 10 tags 487 MiB
Commit graph

32 commits

Author SHA1 Message Date
Lwmte
1284d34f68 Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
6645840f32 Properly draw UI rects 2021-09-14 19:53:09 +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
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
0f5ca8e55e Use lasersight overlay in lasersight mode 2021-08-21 04:13:42 +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
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
Lwmte
2bdb851092 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
Raildex
485638988a Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics 2021-08-04 10:21:45 +02:00
Raildex
915b438f5a Reduced Vertex Count for Bars from 9 to 5 
Added define for PI for shaders
Added Primes to Vertex Hash generation
Fixed Debris
 2021-08-02 13:16:51 +02:00
Raildex
ddc88e9419 Refactor Renderer 2020-10-11 16:47:36 +02:00
Raildex
94eabe8918 Using Smart Pointers 2020-08-09 22:15:32 +02:00
Raildex
b58d18ade2 Refactored functions 2020-08-09 15:25:56 +02:00
Raildex
4006a33ed6 Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
Raildex
2a15e48b5f Refactored Updating Constant Buffers 
Half Lambertian Lighting
 2020-07-01 21:13:07 +02:00
Raildex
3cd6100562 Merge branch 'master' into renderdatarefactor 
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
 2020-06-27 19:48:50 +02:00
Raildex
e5ead31064 Putting Renderer into namespace 
made g_Renderer a global object
 2020-06-21 14:27:12 +02:00
Raildex
1d07a7952e RAII texture2D 2020-06-21 11:51:46 +02:00
Raildex
2b4d1ca2e8 resolving namespace std conflicts 2020-06-18 15:54:08 +02:00
Raildex
d7a949c06a Refactored Index/Vertex Buffer 
Now uses ComPtr
 2020-06-16 15:11:30 +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.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
 2020-05-27 09:21:20 +02:00
MontyTRC89
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +02:00
MontyTRC89
30997878af Moved many camera vars in DLL 2020-04-12 07:08:22 +02:00
MontyTRC89
6c49ffda12 Fixed objects not lighted in flyby and binoculars/lisersight view; Added experimental aiming point in lasersight; 2020-03-23 06:59:21 +01:00
Raildex
7b0376a550 Added Music and Sound Volume Bars. 
TODO: Method to manually set the Position at runtime
 2020-01-14 17:58:07 +01:00
Raildex
b46fc96e6f Tweaked glass Overlay, Added colors for dash bar 2020-01-13 22:16:07 +01:00
Raildex
e1c6905367 Added Percentage to the Bars 2020-01-13 22:15:54 +01:00
Raildex
8c3e7e3d33 cherry pick merge conflict 2020-01-13 22:13:32 +01:00
Raildex
c0c1cc60aa New HUD Buffer, new RendererHUDBar struct 2020-01-13 22:10:45 +01:00
Raildex
d2f44aaae2 Splitted Renderer into multiple source files 2020-01-08 20:57:33 +01:00