Commit Graph

2149 Commits

Author SHA1 Message Date
Nikolay Korolev
180a1dc42b Merge remote-tracking branch 'upstream/master' 2020-05-12 20:23:03 +03:00
Nikolay Korolev
615bd1e878 garages fix 2020-05-12 20:22:35 +03:00
aap
98a233da43 little fixes to CClouds; disabled object clipping for SA cam 2020-05-12 16:36:23 +02:00
aap
40829b5242 CClouds; disabled object clipping for SA cam 2020-05-12 16:27:39 +02:00
Nikolay Korolev
ca6ed7f00f fix garages 2020-05-12 16:21:00 +03:00
Nikolay Korolev
4b566c26a3
fix garages 2020-05-12 14:08:42 +03:00
Nikolay Korolev
1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
aap
fab453efde fixed bug in cutscene head 2020-05-12 09:45:01 +02:00
aap
30b3f34d91
Merge pull request #536 from Nick007J/miami
more script
2020-05-12 08:53:57 +02:00
Sergeanur
d5676be83e Fix premake copy 2020-05-12 04:41:17 +03:00
Sergeanur
12b1eedcbf Include oal files 2020-05-12 04:36:10 +03:00
Sergeanur
8f1a2825d4 Remove odd calculations for bullet hit smoke 2020-05-12 04:31:11 +03:00
erorcun
24f74a775f
Update README.md 2020-05-12 03:41:41 +03:00
Nikolay Korolev
9647587447 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-12 02:00:26 +03:00
Nikolay Korolev
3e64274f6b more script 2020-05-12 01:59:35 +03:00
erorcun
603ac9ce4b
Update README.md 2020-05-12 01:24:54 +03:00
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master
Linux build support
2020-05-12 00:33:13 +03:00
aap
ce2071e1e6
Merge pull request #535 from Nick007J/miami
garages, carctrl, script
2020-05-11 23:28:52 +02:00
eray orçunus
c4a154557b Fix appveyor (hopefully) 2020-05-12 00:10:50 +03:00
aap
70a8234dad RenderPedCB from VC 2020-05-11 22:24:53 +02:00
aap
0eb5f93e96 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-11 22:21:26 +02:00
aap
6e4710b717 CVisibilityPlugins 2020-05-11 22:21:18 +02:00
Nikolay Korolev
9b23e33c36 sync with upstream 2020-05-11 21:21:09 +03:00
Sergeanur
d9db03d606 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/render/Renderer.cpp
2020-05-11 21:08:29 +03:00
Sergeanur
5f1c3fa208 Merge remote-tracking branch 'origin/miami' into miami 2020-05-11 21:07:36 +03:00
Sergeanur
0aa7f13c32 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimBlendAssociation.h
#	src/animation/AnimBlendClumpData.h
#	src/animation/AnimManager.h
#	src/animation/FrameUpdate.cpp
#	src/control/AutoPilot.h
#	src/control/PathFind.h
#	src/core/PlayerInfo.h
#	src/entities/Building.h
#	src/entities/Dummy.h
#	src/entities/Entity.h
#	src/entities/Physical.h
#	src/entities/Treadable.h
#	src/modelinfo/BaseModelInfo.h
#	src/modelinfo/ClumpModelInfo.cpp
#	src/modelinfo/ClumpModelInfo.h
#	src/modelinfo/PedModelInfo.h
#	src/modelinfo/SimpleModelInfo.h
#	src/modelinfo/TimeModelInfo.h
#	src/modelinfo/VehicleModelInfo.h
#	src/objects/CutsceneHead.h
#	src/objects/CutsceneObject.h
#	src/objects/DummyObject.h
#	src/objects/Object.h
#	src/peds/DummyPed.h
#	src/peds/PedIK.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Boat.h
#	src/vehicles/Heli.h
#	src/vehicles/Plane.h
#	src/vehicles/Train.h
#	src/vehicles/Vehicle.h
2020-05-11 21:07:12 +03:00
Nikolay Korolev
5f5babe7fe Merge remote-tracking branch 'upstream/miami' into miami 2020-05-11 21:05:01 +03:00
Nikolay Korolev
8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
eray orçunus
36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap
95920d54f2 random fixes 2020-05-11 17:04:08 +02:00
aap
d4250fc2c7 CRenderer 2020-05-11 17:03:44 +02:00
Sergeanur
85c44715ea remove aps from premake 2020-05-11 15:08:19 +03:00
aap
18b6905f24
Merge pull request #534 from blattersturm/patch/fix-premake-help
fix premake failing if not passing any action (such as with --help)
2020-05-11 10:17:59 +02:00
blattersturm
2c147608e4 fix premake failing if not passing any action (such as with --help) 2020-05-11 10:15:59 +02:00
aap
b11715608f few fixes 2020-05-11 09:18:41 +02:00
aap
ad90a06a39 little fix for cam 2020-05-11 09:18:21 +02:00
erorcun
c66c45f4c8
Merge pull request #509 from Fire-Head/master
OpenAL update
2020-05-11 03:23:36 +03:00
Nikolay Korolev
2f085ea5f5 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-11 01:00:50 +03:00
Nikolay Korolev
2f979a8cde some changes 2020-05-11 01:00:41 +03:00
aap
198b80f560 RpAnimBlend and frame updates 2020-05-10 23:47:53 +02:00
aap
9e842f1628 vehicle model descriptions; a bit of heli code 2020-05-10 20:51:29 +02:00
aap
05021ed1e1
Merge pull request #531 from Bigbossbro08/master
Defined all asserts
2020-05-10 19:42:04 +02:00
aap
7919b92d28 force load weapons as long as we dont stream em yet 2020-05-10 19:09:49 +02:00
aap
d9a8bab631 update file loader for new VC fields 2020-05-10 18:14:14 +02:00
bigbossbro08
bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08
b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +06:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
aap
c07727eed0
Merge pull request #532 from Nick007J/miami
script update
2020-05-10 17:41:31 +02:00
Nikolay Korolev
653d808417 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 18:26:13 +03:00