Commit Graph

2392 Commits

Author SHA1 Message Date
Nikolay Korolev
647ddfa05e more fix 2020-08-31 17:18:37 +03:00
Nikolay Korolev
4ffca8954f Merge remote-tracking branch 'upstream/miami' into miami 2020-08-31 00:07:38 +03:00
Nikolay Korolev
ed799fb555 script inaccuracy 2020-08-31 00:07:29 +03:00
erorcun
b7456c604d
Merge pull request #697 from erorcun/miami
CGame done, Peds, fixes
2020-08-30 23:24:39 +03:00
Fire-Head
c22d252246 fix melee car damage 2020-08-30 17:50:03 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00
aap
e0f6459674 stupid zone load fix 2020-08-30 00:57:00 +02:00
Fire_Head
a8999bbf38
Merge pull request #1 from GTAmodding/miami
Miami
2020-08-27 20:35:14 +03:00
Fire-Head
210c7b8785 bike shooting fix + trace temp fix 2020-08-27 20:27:28 +03:00
Fire-Head
a38702a7d2 weapons 2020-08-27 19:52:43 +03:00
aap
8e7989087d
Merge pull request #694 from Sergeanur/miami_CutsceneMgr
CutsceneMgr done
2020-08-24 22:46:17 +02:00
Sergeanur
963e85f047 Fix 2020-08-24 23:01:51 +03:00
Sergeanur
14ed50a559 Remote done 2020-08-24 22:52:07 +03:00
Sergeanur
041d342faf PlayerSkin done 2020-08-24 22:37:38 +03:00
Sergeanur
85cf043e4a Compilation fix 2020-08-24 22:14:05 +03:00
Sergeanur
a3322f17d5 Merge branch 'master' into miami
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/core/ControllerConfig.cpp
#	src/core/ControllerConfig.h
#	src/core/Streaming.cpp
#	src/peds/PedChat.cpp
#	src/render/Weather.cpp
#	src/rw/TexRead.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
2020-08-24 21:59:32 +03:00
Sergeanur
1d907ac91f small fix 2020-08-24 21:56:34 +03:00
Sergeanur
bbcf3fd7d2 CutsceneMgr done 2020-08-24 21:52:16 +03:00
aap
56b80cb0ab fixes to zones and vehicle comp rules 2020-08-24 17:21:45 +02:00
aap
0a19925e99 finished sprites 2020-08-24 14:26:17 +02:00
aap
6c63dfd86d accidentally enabled extended stuff.... 2020-08-23 13:30:54 +02:00
aap
771235d213 weather fixes 2020-08-23 13:30:21 +02:00
aap
38a01a59fa CWeather done 2020-08-23 13:27:56 +02:00
Nikolay Korolev
0fd6fb1ff4 fixed a few embarassing mistakes 2020-08-23 12:27:24 +03:00
aap
4545ddee6d ... 2020-08-21 23:35:47 +02:00
aap
13c34b0863 finished cullzones 2020-08-21 13:28:33 +02:00
aap
cc2f13710d fix streaming bug 2020-08-21 12:09:45 +02:00
aap
23c52c1c86 fixed CRenderer::ScanSectorPoly again 2020-08-21 09:40:31 +02:00
aap
ac5af18891 fixed CRenderer::ScanSectorPoly again 2020-08-21 09:40:10 +02:00
aap
537b63acb5 call streaming funcs 2020-08-21 00:05:05 +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
857cef776d
Merge pull request #693 from majesticCoding/miami
stable CScriptPaths
2020-08-20 23:01:21 +02:00
Sergeanur
73dd29ea3a Cleanup CControllerConfigManager deletion a bit 2020-08-20 19:56:02 +03:00
majestic
03c90b7c40 stable CScriptPaths 2020-08-20 09:44:26 -07:00
Sergeanur
b5ccc721ae Add VEHICLE_FIREWEAPON (disabled by default) 2020-08-20 19:40:35 +03:00
Sergeanur
0f5a771292 Fix cAudioScriptObject 2020-08-20 14:47:53 +03:00
aap
a9a1bf5056 changed a sound enum 2020-08-20 13:21:08 +02:00
aap
7da4f7fc35 fixed sound enum 2020-08-20 13:20:48 +02:00
aap
517e2ee9a5 small fixes 2020-08-20 12:55:41 +02:00
aap
764af8735c rw stuff done & other small things 2020-08-20 12:53:17 +02:00
aap
30dadcfb22 transmission done 2020-08-20 10:24:12 +02:00
Sergeanur
9fd91e6250 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Collision.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/custompipes.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/shaders/Makefile
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_fs_gl3.inc
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/save/GenericGameStorage.cpp
2020-08-19 23:44:08 +03:00
Sergeanur
dab6d6dd6d Merge remote-tracking branch 'origin/miami' into miami
# Conflicts:
#	src/core/config.h
2020-08-19 23:35:10 +03:00
Sergeanur
827b240078 Merge branch 'master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	src/control/Garages.cpp
#	src/control/Record.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	utils/gxt/american.txt
2020-08-19 23:34:33 +03:00
aap
bb948904b6 small stuff 2020-08-19 21:58:00 +02:00
aap
c2e20070ab txd.img bug 2020-08-19 16:54:09 +02:00
aap
895055a3d1 update librw; fix txd.img bug 2020-08-19 16:53:11 +02:00
aap
827ba62671 neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
aap
5ac83e4b4c changing silly streaming memory limit 2020-08-19 14:58:43 +02:00
aap
76fe1247c8
Merge pull request #688 from aap/master
Neo pipelines
2020-08-19 14:36:38 +02:00
Sergeanur
4d1cfb7214 Island loading cleanup and fix 2020-08-19 03:31:42 +03:00
Nikolay Korolev
c559b71bc9 little fix 2020-08-18 20:08:27 +03:00
Jack Powell
f09abe9ec1
Added bug fix to fix mission related crashes 2020-08-18 17:14:27 +01:00
Jack Powell
809c09938a
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE 2020-08-18 16:59:19 +01:00
Jack Powell
db1e5a6ec4
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside 2020-08-18 16:47:15 +01:00
Jack Powell
2dcf31b6c7
Call CWorld::Remove before the delete, the original game does this and its safer. 2020-08-18 15:57:40 +01:00
Nikolay Korolev
b03f13b30d fixed bugfix 2020-08-18 16:52:02 +03:00
aap
e3405f4be4 Merge branch 'master' of github.com:gtamodding/re3 2020-08-18 11:09:50 +02:00
aap
c556cbbbe0 neo pipelines 2020-08-18 10:58:15 +02:00
Nikolay Korolev
cc66df18ac Merge remote-tracking branch 'upstream/miami' into miami 2020-08-16 18:41:17 +03:00
Nikolay Korolev
d303c33c2e CarCtrl finished, minor Script things 2020-08-16 18:39:11 +03:00
eray orçunus
0418ba597b remove CFO 2020-08-16 17:58:40 +03:00
Sergeanur
732681db08 Island loading and PS2 alpha test added to options 2020-08-16 17:26:44 +03:00
eray orçunus
980dd1b5a1 2 new opcodes 2020-08-16 17:10:59 +03:00
Sergeanur
a728a542be Graphics menu + MSAA 2020-08-16 01:37:09 +03:00
Sergeanur
9956b27767 Merge branch 'master' into miami
# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp
2020-08-15 15:13:46 +03:00
erorcun
07038ce88e
Merge pull request #686 from erorcun/miami
Stats(except displaying) and PlayerInfo done, Frontend, marker fix
2020-08-15 02:28:17 +03:00
eray orçunus
8b3ca9564b Continue to Frontend, fix savegame list bug 2020-08-14 22:44:12 +03:00
Sergeanur
72088a000b Don't react if player's targeting with melee 2020-08-14 19:42:15 +03:00
Sergeanur
e7945625b5 Original screen grabber 2020-08-14 18:57:23 +03:00
eray orçunus
f403a63a5c Wheelie opcode 2020-08-14 18:54:01 +03:00
Sergeanur
489743da41 Darkel fixes 2020-08-14 17:34:04 +03:00
Sergeanur
28dc67dc86 Merge branch 'master' into miami
# Conflicts:
#	src/core/Game.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/extras/postfx.h
#	src/extras/shaders/Makefile
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Sprite2d.cpp
2020-08-14 13:52:10 +03:00
aap
85d76dc171 fixed clouds render 2020-08-14 09:28:17 +02:00
aap
2a0a508a10 fixed clouds render 2020-08-14 09:27:54 +02:00
eray orçunus
80a83d48f3 Guardian Angels fix 2020-08-14 02:41:18 +03:00
eray orçunus
b54bb62c94 Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
aap
cdebea71f3 fixes to HUD and sprite2d 2020-08-13 18:47:39 +02:00
aap
afed831aed extended postfx and sniper hud fix 2020-08-13 18:14:24 +02:00
aap
0d8fcb41ee fix render poly bug 2020-08-13 16:30:23 +02:00
aap
f0503edf62 fix render poly bug 2020-08-13 16:29:42 +02:00
eray orçunus
2034d7b2ae Register start button for real 2020-08-13 01:29:34 +03:00
aap
878ffa8998 sun reflection fix 2020-08-12 10:48:00 +02:00
aap
a9935dcd45 tiny postfx cleanup 2020-08-11 19:42:08 +02:00
aap
b468d010a8 implemented extended postfx 2020-08-11 18:40:04 +02:00
majestic
2d1b48267d improved mission switcher 2020-08-10 14:04:33 -07:00
Sergeanur
1c1fa25e6c Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/render/Coronas.cpp
#	src/render/Timecycle.cpp
#	src/render/Timecycle.h
2020-08-10 19:15:51 +03:00
aap
c2c65207a3
Merge pull request #677 from majesticCoding/miami
CWindModifiers
2020-08-10 17:12:32 +02:00
aap
2f987e315e update librw (shadows are working now) 2020-08-10 17:04:57 +02:00
majestic
70029752f5 CWindModifiers 2020-08-09 21:42:12 -07:00
majestic
b73b6b8e13 CWindModifiers 2020-08-09 12:32:30 -07:00
aap
e57d450809 drunk blur done 2020-08-09 19:51:16 +02:00
aap
a149d9d511 little timecycle cleanup 2020-08-09 19:32:32 +02:00
aap
43bf854374 timecycle done 2020-08-09 19:11:44 +02:00
aap
4118d2aa55 finished skidmarks 2020-08-09 17:14:24 +02:00
aap
0bb46f3f8c rubbish done 2020-08-09 16:49:15 +02:00
aap
59d25d3ad8 pointlight fixes 2020-08-09 15:45:54 +02:00
aap
6514bc6b39 pointlights done 2020-08-09 15:45:38 +02:00
aap
951439486f Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-08-09 13:18:01 +02:00