Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-08 03:28:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2140 commits 65 branches 10 tags 504 MiB
Commit graph

98 commits

Author SHA1 Message Date
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
b6d55c4ddc Use different sprites for left/right foot 2021-09-14 01:22:08 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +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
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
561119ef09 Clean up some warnings. 2021-08-12 22:10:05 +01:00
Lwmte
77ab74bc3e Fix gunflash drawing 2021-08-06 13:41:37 +03:00
Lwmte
83b1ed8bf0 Fix #273 2021-08-02 19:42:07 +03: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
Lwmte
ed9fc47d27 Fix blending modes issue (#281) 
Only for rooms and some objects but not for Lara or most effects
 2021-08-01 15:54:54 +03:00
MontyTRC89
906703b1ab Merge branch 'AnimTextures'; Fixed doors init; 
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
 2021-05-25 05:58:44 +02:00
MontyTRC89
e748a0c947 Fixed cylindrical billboards 2021-04-16 14:34:40 +02:00
MontyTRC89
4ae7d54e6b Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
7a93fb25fa Fixed energy arcs 2021-04-16 06:46:54 +02:00
MontyTRC89
14e9a09598 Temporary fixes to AI; Decompiling energy arcs WIP; 2021-04-13 06:08:33 +02:00
Raildex
d57c2f65c9 Animated Texture progress 
Refactored Bucket Rendering
 2021-03-14 16:30:37 +01:00
Raildex
ddc88e9419 Refactor Renderer 2020-10-11 16:47:36 +02:00
Raildex
ac61f71386 Refactored framework.h 
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
 2020-09-29 21:43:56 +02:00
Raildex
3e8930ef50 Fixed Spark direction 2020-09-29 17:16:27 +02:00
Raildex
85b4a2ff1c Added parameter to SetupRIpple to specifiy sprite 2020-09-21 15:20:59 +02:00
Raildex
0335034673 NonPremultiplied Alphablending for rooms and horizon 2020-09-18 11:41:20 +02:00
Raildex
dde82ac151 Updated DirectXTK 
Fixed Smoke Sequence
m_spritesToDraw is now vector<RendererSpriteToDraw> instead of vector<RendererSpriteToDraw*>
 2020-09-18 08:57:50 +02:00
Raildex
9dc7ab6d18 Added Boat foam, Skidoo snow trail 2020-09-15 08:10:38 +02:00
MontyTRC89
5c381bd888 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main; Weapons fixes; 2020-08-16 06:58:47 +02:00
MontyTRC89
971800fc94 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +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
f3d8b9130c Merge branch 'master' into renderdatarefactor 
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
 2020-07-26 08:58:44 +02:00
Raildex
4006a33ed6 Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
Raildex
89882e8e42 Normal Mapping first test 2020-07-18 14:53:26 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
MontyTRC89
538dbb3682 Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
Raildex
88b23f4ecd Merge branch 'master' into renderdatarefactor 
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Renderer/Renderer11Frame.cpp
#	TR5Main/Renderer/Renderer11Lara.cpp
 2020-07-03 10:09:13 +02:00
MontyTRC89
7ff7397fa7 New level format: meshes 2020-07-03 07:05:33 +02:00
Raildex
2a15e48b5f Refactored Updating Constant Buffers 
Half Lambertian Lighting
 2020-07-01 21:13:07 +02:00
Raildex
14368db3c6 Semi-working cubemapping. 
improved camera functions
 2020-07-01 08:46:07 +02:00
Raildex
b0fb8f11a3 Merge branch 'master' into renderdatarefactor 
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
 2020-06-29 15:02:18 +02:00
MontyTRC89
eaf358f6ae Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
Raildex
ee4e2cdb5a Re-added Primitive batch for "3D sprites" 2020-06-28 21:42:45 +02:00
Raildex
e24ff68b75 Rendering Sprites without Primitive Batch 2020-06-28 20:30:56 +02:00
MontyTRC89
71f307a356 New file format: rooms geometry 2020-06-28 15:51:33 +02:00
Raildex
0bfeb84b45 Changed m_moveableObjects and m_staticObjects to vector<optional> 2020-06-28 11:12:52 +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