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

217 commits

Author SHA1 Message Date
Lwmte
282927ffda Fix #344 2021-11-08 17:28:04 +03:00
Lwmte
64f1be7c37 Cleanup savegame and sound code 2021-10-31 23:55:17 +03:00
Lwmte
8e42d77243 Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
MontyTRC89
e4329c4974 Merge branch 'errors' 
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
 2021-10-28 11:06:02 +02:00
MontyTRC89
e5c8c1010e Merge branch 'entities_fixings' 
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/TombEngine.vcxproj.filters
 2021-10-28 10:43:09 +02:00
Lwmte
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
Lwmte
9a6031eeba Remove anachronisms, go to level W2 2021-10-28 00:08:55 +03:00
MontyTRC89
5c829c5c23 Renamed little bettes to scarabs; Added statics, cameras, scarabs, spiders, rats, bats to savegames 2021-10-15 10:28:32 +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
82c968662e get rid of bitwise menuing 2021-10-13 15:10:48 -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
MontyTRC89
174183ad20 Working on new savegames, first prototype load and save (missing UI) 2021-10-11 10:44:28 +02:00
Lwmte
5938d2d9ca Merge branch 'master' into surface_angle_detection 2021-10-09 05:02:15 +03:00
Lwmte
19b12f42dc Draw true spheres 2021-10-09 05:01:39 +03:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02:00
Lwmte
f68dd226a1 Get nearest surface angle for blocks properly 2021-10-06 23:26:46 +03:00
Lwmte
9bf683c608 Always hide debug visuals in release mode 2021-10-04 03:19:22 +03:00
Lwmte
b46e0466c3 Cleanup smoke particles on level load, add some logging to level load 2021-10-04 03:09:32 +03:00
Lwmte
1524ca27d6 Restore little rats and bats drawing 2021-10-02 21:38:24 +03:00
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
MontyTRC89
7a4b9aed5f Refactored rope files; Fixed ID_POLE_ROPE; 2021-09-30 05:10:30 +02:00
MontyTRC89
f35d6e80d0 Merge branch 'entities_fixings' 
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
 2021-09-29 05:35:17 +02:00
MontyTRC89
5a378b213f Fixing ropes and added debug ropes drawing 2021-09-28 13:01:28 +02:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
0f8ecf03b5 Use mutators for drawing spikes, raising and expanding blocks 2021-09-24 15:44:44 +03:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
8158b5a8df Improved flame emitter 3; Added legacy way for drawing darts, waiting for mesh; 2021-09-24 05:34:44 +02:00
MontyTRC89
6cf4db33f1 Merge branch 'entities_fixings' 
# Conflicts:
#	TR5Main/Game/item.h
#	TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
#	TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
#	TR5Main/Objects/TR4/Trap/tr4_blade.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Trap/tr4_mine.cpp
#	TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
#	TR5Main/TombEngine.vcxproj.filters
 2021-09-20 06:15:39 +02:00
Lwmte
e70b87ca90 Merge branch 'master' into coll_info_reorganize 2021-09-19 23:47:31 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Raildex
90f449b4a4 Fixed Crash with non-existent statics 2021-09-19 15:21:14 +02:00
MontyTRC89
a8114abe66 Fixed rotation matrix of ID_TEETH_SPIKES 2021-09-19 06:23:45 +02: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
81af7bea10 Move wind to weather controller 2021-09-15 11:13:47 +03:00
Lwmte
6645840f32 Properly draw UI rects 2021-09-14 19:53:09 +03:00
Lwmte
17ff197dc7 Merge branch 'coll_info_reorganize' into sky_fix 2021-09-14 12:08:05 +03:00
Lwmte
03e225f82d Move sky out of renderer 2021-09-14 12:05:36 +03:00
Lwmte
257b5d8e0a Fix undefined return bugs 2021-09-13 23:44:52 +03:00
Lwmte
eb2f33217c Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-13 23:15:02 +03:00
Lwmte
b8bb8562a3 Merge branch 'master' into sky_fix 2021-09-13 09:50:25 +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
86d585263e Merge branch 'static_mesh_fixes' into sky_fix 2021-09-10 18:43:12 +03:00
Lwmte
f8d9edeb81 Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-10 13:49:45 +03:00
Lwmte
b9ff80220e Move all sky stuff to renderer 2021-09-09 13:30:49 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00