Nils
01bf1881b3
Fixed duplicated ITEM_INFO definition
2021-09-24 07:53:42 +02:00
MontyTRC89
e36072ca86
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
c3b69e0373
Merge branch 'master' into coll_info_reorganize
2021-09-19 23:47:31 +03:00
Lwmte
afa0504c6c
Move around some files
2021-09-19 23:41:26 +03:00
Nils
6306d58a3a
Fixed Crash with non-existent statics
2021-09-19 15:21:14 +02:00
MontyTRC89
5d1fc06344
Fixed rotation matrix of ID_TEETH_SPIKES
2021-09-19 06:23:45 +02:00
Lwmte
99ab563ee7
Rename draw.cpp to animation.cpp which makes more sense, some more edits
2021-09-16 05:06:03 +03:00
Lwmte
b3f4589b4a
Move wind to weather controller
2021-09-15 11:13:47 +03:00
Lwmte
50473171f8
Properly draw UI rects
2021-09-14 19:53:09 +03:00
Lwmte
7d17cce5df
Merge branch 'coll_info_reorganize' into sky_fix
2021-09-14 12:08:05 +03:00
Lwmte
083776ab78
Move sky out of renderer
2021-09-14 12:05:36 +03:00
Lwmte
91c11645d5
Fix undefined return bugs
2021-09-13 23:44:52 +03:00
Lwmte
40b4d8e51e
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-13 23:15:02 +03:00
Lwmte
8fadb92950
Merge branch 'master' into sky_fix
2021-09-13 09:50:25 +03:00
MontyTRC89
865202b33c
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
fa9f75cadf
Merge branch 'static_mesh_fixes' into sky_fix
2021-09-10 18:43:12 +03:00
Lwmte
8d2292c2c8
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-10 13:49:45 +03:00
Lwmte
ff6b52b754
Move all sky stuff to renderer
2021-09-09 13:30:49 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +03:00
MontyTRC89
df2ebebbc8
Fixed compile error
2021-09-08 16:47:16 +02:00
MontyTRC
0e529ecba0
Merge branch 'master' into bitshifts_2
2021-09-08 16:20:28 +02:00
MontyTRC89
14152a0b4f
Refactored doors in multiple files
2021-09-05 06:05:00 +02:00
Nils
54857431be
Fixed Crashing Inventory
2021-08-31 18:24:32 +02:00
Troye
6aabe62297
revert to bitshits in Game folder; handle lack of inv objects;
2021-08-30 15:13:18 -05:00
Lwmte
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
56c71d1fe6
Separate volume code from TestTriggers, fix DoRayBox bounds
2021-08-30 15:35:00 +03:00
MontyTRC89
556b8b90a9
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
...
# Conflicts:
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-08-28 06:45:36 +02:00
MontyTRC89
d3e6bfc7dd
Refactored switches
2021-08-28 06:37:22 +02:00
Lwmte
04931cfdff
Fix crash if caustics are missing
2021-08-27 17:01:54 +03:00
MontyTRC89
45213a595f
Fixed drawing of little beetles
2021-08-23 05:49:47 +02:00
MontyTRC89
327a21489f
Refactoring ID_LITTLE_BEETLES
2021-08-22 06:08:02 +02:00
MontyTRC89
109b7d6e18
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine ; Renamed namespaces;
...
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
MontyTRC89
aa706f010c
Fixed locusts; First try of namespaces for objects;
2021-08-19 14:17:21 +02:00
hispidence
ee8f580002
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
5b432b133b
Fix git mess
2021-08-06 12:21:16 +03:00
Lwmte
0bc21337fb
Add alternate way to make a debug box
2021-08-06 12:18:28 +03:00
Lwmte
16c36be7de
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
Nils
ca583d15ff
Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics
2021-08-04 10:21:45 +02:00
Lwmte
5b9bcc2715
Fix several silly mistakes with std::vector
2021-08-03 01:30:44 +03:00
Lwmte
256d4efe6e
Fix crash if meshswap is not present
2021-08-02 19:20:58 +03:00
Lwmte
71dd879ee8
Fix #236
2021-08-02 17:16:23 +03:00
Nils
95bec0e3b0
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
90f595b55c
Remove gnFrameCounter which is seemingly the same as GlobalCounter
2021-08-02 11:25:53 +03:00
Lwmte
054dafeeac
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
Lwmte
95bd4f7466
Use refraction as before but accounting for vertex weight factor
2021-08-01 11:39:02 +03:00
Lwmte
e0b504ff00
Draw vertex colors for moveables too
2021-07-30 14:45:18 +03:00
hispidence
d61b38647b
Compile fix; forgot to commit this last time.
2021-07-30 11:44:00 +01:00
MontyTRC89
3836ed7a26
Fixed volumes and added debug message
2021-07-15 10:56:03 +02:00
Troye
7b0025a1c9
FLARE_AGE constant; fix dynamic light intensity; fix release builds
2021-07-13 22:29:47 -05:00
