Commit Graph

2983 Commits

Author SHA1 Message Date
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
eray orçunus
bd96f49aac Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-08-25 03:28:20 +03:00
eray orçunus
7658577260 CFO fixes 2020-08-25 03:27:38 +03:00
Nikolay Korolev
1fff83eeee update lib 2020-08-25 02:08:09 +03:00
Nikolay Korolev
290faa5e4b update lib 2020-08-25 02:06:27 +03:00
aap
24e74f785e update librw 2020-08-25 00:04:16 +02:00
aap
700967dd2d update librw 2020-08-25 00:04:01 +02:00
erorcun
e01f249025
Merge pull request #695 from erorcun/master
new frontend customization
2020-08-25 00:57:30 +03:00
eray orçunus
082c4caecf new frontend customization 2020-08-25 00:55:57 +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
eray orçunus
cb813bd1ab Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-08-24 22:36:03 +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