Commit Graph

74 Commits

Author SHA1 Message Date
Nikolay Korolev
74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev
88b4c7b50b merge 2021-08-08 15:34:02 +03:00
aap
3f3e258d77 CVisibilityPlugins, CRenderer, some fixes 2021-07-29 19:59:34 +02:00
aap
77ca9c593f fix postfx fix 2021-06-24 21:32:43 +03:00
Sergeanur
519218572a Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
2021-04-09 04:31:46 +03:00
aap
7c42ed6edb fix postfx fix 2021-02-28 19:04:15 +01:00
aap
ce604c77ba fix postfx 2021-02-28 15:30:13 +01:00
aap
df1ad8e122 fix postfx 2021-02-28 15:29:58 +01:00
Sergeanur
f6910d35f7 Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/render/Font.cpp
2021-02-26 11:07:32 +02:00
aap
b88cf7b939 make debug render groups optional 2021-02-19 18:41:47 +01:00
aap
9a7fa47857 make debug render groups optional 2021-02-19 18:41:31 +01:00
aap
11bc8ea602 update librw; render groups only if extension supported 2021-02-18 20:31:53 +01:00
aap
6245a17e16 update librw; render groups only if extension supported 2021-02-18 20:31:46 +01:00
aap
3457ff48ce d3d9 debug render groups 2021-02-18 13:08:29 +01:00
aap
253021866c d3d9 debug render groups 2021-02-18 13:08:22 +01:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
erorcun
5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
Sergeanur
ff057838ec Merge branch 'miami' into lcs
* miami:
  Fix backface culling of cutscene objects
  more renames
  anim velocity union
  rename m_vehEnterType -> m_vehDoor
  Port cmake improvements to miami
  some loose ends
  move TODO to Readme
  Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 14:56:25 +02:00
erorcun
57201187de Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 14:22:31 +03:00
erorcun
542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03:00
aap
48ce6151f9 fix building with PED_SKIN 2021-01-12 18:55:21 +01:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Sergeanur
b9e97ab79d Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
Sergeanur
f75460fc1d Reorder CEntity functions into their original order 2020-12-29 13:55:15 +02:00
erorcun
57098a77ec Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default 2020-12-26 12:10:04 +03:00
aap
f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
Sergeanur
a259b6b8ab TexturePools
# Conflicts:
#	src/core/Game.cpp
#	src/rw/RwHelper.cpp
2020-12-01 22:54:19 +02:00
Sergeanur
9461998304 TexturePools 2020-12-01 22:12:46 +02:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
aap
546ed0ff07 changes to RW layer so loading foreign files works 2020-11-11 09:42:30 +01:00
aap
3665a82418 Merge pull request #792 from withmorten/master
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
#	src/core/Frontend.cpp
2020-10-31 19:21:10 +02:00
aap
6eef54e3fc Merge pull request #792 from withmorten/master
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
2020-10-31 17:06:25 +01:00
withmorten
e95516032f fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version text 2020-10-29 19:18:46 +01:00
aap
e97366c023 implemented extra model flags for backface culling and alpha test from mobile 2020-10-29 19:11:47 +01:00
erorcun
de09a80a35 Messages fix and update librw 2020-10-25 01:21:18 +03:00
erorcun
d0e80e8c97 librw update 2020-10-24 23:56:21 +03:00
erorcun
92ae468e00 Messages and CameraSize fix 2020-10-24 21:56:04 +03:00
erorcun
a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00
aap
764af8735c rw stuff done & other small things 2020-08-20 12:53:17 +02:00
aap
40185161b8 Merge pull request #670 from Fire-Head/miami
Miami Shadows
2020-08-07 10:18:35 +02:00
Fire-Head
224fd77641 NULL -> nil 2020-07-31 21:21:58 +03:00
Sergeanur
86cc86ac12 Merge remote-tracking branch 'origin/master' into miami 2020-07-29 15:35:25 +03:00
Sergeanur
acdc52116e Merge branch 'master' into miami
# Conflicts:
#	src/animation/RpAnimBlend.cpp
#	src/audio/oal/stream.cpp
#	src/audio/sampman.h
#	src/control/Pickups.cpp
#	src/core/Collision.cpp
#	src/core/Collision.h
#	src/core/FileLoader.cpp
#	src/core/FileMgr.cpp
#	src/core/FileMgr.h
#	src/core/Streaming.cpp
#	src/core/Streaming.h
#	src/core/SurfaceTable.h
#	src/modelinfo/VehicleModelInfo.h
#	src/peds/Ped.cpp
#	src/rw/RwHelper.cpp
#	src/rw/RwHelper.h
#	src/skel/glfw/glfw.cpp
#	src/skel/platform.h
#	src/text/Text.cpp
#	src/text/Text.h
#	src/vehicles/CarGen.cpp
#	src/vehicles/Heli.cpp
2020-07-29 15:34:57 +03:00
aap
e13d80a4eb rename shit 2020-07-29 14:31:34 +02:00
Sergeanur
6b92e9e12b Dual pass rendering for RW 3.3 2020-07-29 15:24:42 +03:00
Sergeanur
581cb5edfa The real pickup reflection fix 2020-07-29 14:56:06 +03:00
Fire-Head
f2f19ccea3 Update RwHelper.cpp 2020-07-29 12:41:53 +03:00