mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-05-09 11:52:19 +00:00
Code Issues Projects Releases Wiki Activity
4602 commits 3 branches 0 tags 56 MiB
Commit graph

177 commits

Author SHA1 Message Date
Sergeanur 519218572a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
 2021-04-09 04:31:46 +03:00
aap 6122f6980b fix new renderer 2021-02-28 19:07:46 +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
withmorten 781617d484 add NoMovies ini option, rename gDrawVersionText, always save ini after loading 2021-02-18 22:55:26 +01:00
aap 996772faf2 add debug render groups 2021-02-18 12:21:52 +01:00
Sergeanur e38467ef3a Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	premake5.lua
#	src/animation/AnimManager.cpp
#	src/animation/AnimationId.h
#	src/audio/MusicManager.cpp
#	src/audio/audio_enums.h
#	src/control/Script7.cpp
#	src/core/FileLoader.cpp
#	src/core/re3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/postfx.cpp
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_PS.hlsl
#	src/extras/shaders/make_hlsl.cmd
#	src/extras/shaders/obj/colourfilterVC_PS.cso
#	src/extras/shaders/obj/colourfilterVC_PS.inc
#	src/extras/shaders/obj/colourfilterVC_frag.inc
#	src/peds/PedFight.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Particle.cpp
#	src/render/WaterCannon.cpp
#	src/skel/win/gtavc.ico
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
 2021-02-16 18:08:19 +02:00
aap 65f9917b65 clean up debug menu 2021-02-13 14:22:34 +01:00
erorcun 035f0010d8 fix 2021-02-12 21:26:03 +03:00
Filip Gawin 0c60ceeb33 Cmake version for hash 2021-02-12 21:09:46 +03:00
erorcun 2c784d979a Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 21:09:23 +03:00
Sergeanur 9e22eaf798 Fix RW34 2021-02-12 08:06:34 +02:00
aap 879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
aap 031df36935 CColModel 2021-02-09 17:45:02 +01:00
erorcun 810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
Sergeanur 9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
aap ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
withmorten feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
aap ce77e80414
Merge pull request #963 from Nick007J/lcs 
all LCS script commands
 2021-01-22 00:59:20 +01:00
aap de10f0dda6
Merge pull request #975 from aap/lcs 
loadscreens, not accurate
 2021-01-22 00:59:13 +01:00
Sergeanur 06d8860d42 Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
 2021-01-22 01:58:38 +02:00
aap f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
aap e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
Nikolay Korolev 4703ec5164 sync 2021-01-17 16:03:37 +03:00
Fire-Head d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +03: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
aap 1b55a9956f some loose ends 2021-01-13 12:31:33 +01:00
Fire-Head 3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00
Fire-Head 096db533a6 rem gMakeResources 2021-01-13 00:09:40 +03:00
Fire-Head 3648ef4687 lcs particle 2021-01-13 00:07:24 +03:00
Sergeanur 8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr 
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
 2021-01-12 13:22:44 +02:00
aap 383142bcbe some useless code 2021-01-11 20:20:08 +01:00
Sergeanur a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
aap ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
aap 0ee87d7b46 env map rendering 2021-01-10 11:59:57 +01:00
aap 03c5fdef43 moved new renderer; implemented leeds building rendering 2021-01-09 19:20:32 +01:00
aap a99457ee29 fix phones 2021-01-08 13:51:31 +01:00
aap 37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +01:00
Sergeanur 30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
Sergeanur 42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
aap 426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
erorcun 9afcc355ff Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:26:00 +03:00
aap 013e9b9992 fix backface culling 2020-12-27 19:53:10 +01:00
aap 688e277e89 fix mblur stencil 2020-12-26 13:02:30 +01:00
aap fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
aap f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap 036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
aap fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00