Commit Graph

109 Commits

Author SHA1 Message Date
Nikolay Korolev
453f8c05a4 script revision p1 2021-08-29 19:32:22 +03:00
aap
5f7de20cde modelinfo bits 2021-08-24 19:16:17 +02:00
Sergeanur
19dd95a1cb Merge branch 'miami' into lcs
* miami:
  Pool fixes + peds not forming circle fix
2021-05-18 08:12:47 +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
erorcun
62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
erorcun
a311f643f9 Fixes 2021-02-28 15:50:51 +03: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
erorcun
ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +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
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
225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Sergeanur
af09cb06f5 Merge branch 'miami' into lcs
* miami:
  Use original names
2021-01-08 21:53:42 +02:00
Sergeanur
faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
aap
8be0567924 little fixes 2021-01-08 13:51:42 +01:00
aap
37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +01:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Sergeanur
4f9bfb4387 Fix missing ifdef 2021-01-04 21:55:41 +02:00
Sergeanur
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Sergeanur
7959b7fd1f NO_ISLAND_LOADING ported from re3 2020-12-27 18:26:30 +02:00
aap
fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
aap
4b9fb631fc added a few registered pointers and memory debug 2020-11-30 23:44:58 +01:00
aap
a8035b6466 moved some stuff to MemoryMgr 2020-11-28 17:05:57 +01:00
aap
b23bda6e45 Merge branch 'master' of github.com:GTAmodding/re3 2020-11-28 16:02:21 +01:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur
491274f188 CStreaming::PrintStreamingBufferState 2020-11-26 18:11:55 +02:00
Sergeanur
8374a346e5 Fix loading island LODs with big buildings 2020-11-13 18:28:15 +02:00
aap
546ed0ff07 changes to RW layer so loading foreign files works 2020-11-11 09:42:30 +01:00
Sergeanur
588fb26728 Fix player model not changing in cutscenes 2020-10-17 18:26:48 +03:00
Filip Gawin
6bae5a6031 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-08 18:45:07 +03:00
eray orçunus
fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
eray orçunus
c5a61b3d3b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 14:26:42 +03:00
eray orçunus
8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
Filip Gawin
0ac2be0093 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-04 13:18:24 +02:00
Sergeanur
bbcf3fd7d2 CutsceneMgr done 2020-08-24 21:52:16 +03:00
aap
cc2f13710d fix streaming bug 2020-08-21 12:09:45 +02:00
aap
dace79c7c3 small streaming fixes 2020-08-20 23:45:45 +02:00
aap
a6fe606ce6 CStreaming done, hopefully 2020-08-20 23:44:40 +02:00
aap
5ac83e4b4c changing silly streaming memory limit 2020-08-19 14:58:43 +02:00
Sergeanur
4d1cfb7214 Island loading cleanup and fix 2020-08-19 03:31:42 +03:00
Sergeanur
732681db08 Island loading and PS2 alpha test added to options 2020-08-16 17:26:44 +03:00
eray orçunus
15918feb8e 90% fixes, 10% skel refactoring 2020-07-24 21:35:04 +03:00
eray orçunus
732b760829 64-bit on Windows 2020-07-24 20:26:33 +03:00
eray orçunus
1dc6fbda1f 64-bit on Windows 2020-07-22 18:51:28 +03:00
Sergeanur
d0f5464200 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
Sergeanur
cf69f22a0c Remove island loading 2020-07-09 19:18:42 +03:00
eray orçunus
67a3c7d2ee VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00