a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-27 18:41:57 +00:00
Code Issues Projects Releases Wiki Activity
3291 commits 4 branches 2 tags 50 MiB
Commit graph

3291 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 c1367ebdca update librw 2020-08-19 20:50:26 +02:00
aap bd30d0a796 update librw 2020-08-19 20:49:43 +02:00
eray orçunus be638a4973 Revert "remove CFO" 
This reverts commit 0418ba597b.
 2020-08-19 20:30:57 +03: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
aap dba992f388
Merge pull request #687 from Nick007J/miami 
CarCtrl done, Script update
 2020-08-19 10:08:10 +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
Nikolay Korolev 4ffa585cce
Merge pull request #692 from jack9267/master 
Added bug fix to fix mission related crashes
 2020-08-18 19:29:08 +03:00
Jack Powell f09abe9ec1
Added bug fix to fix mission related crashes 2020-08-18 17:14:27 +01:00
Nikolay Korolev 2c2b722f21
Merge pull request #691 from jack9267/master 
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE
 2020-08-18 19:02:47 +03:00
Jack Powell 809c09938a
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE 2020-08-18 16:59:19 +01:00
Nikolay Korolev 4504b1593e
Merge pull request #690 from jack9267/master 
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside
 2020-08-18 18:50:37 +03:00
Jack Powell db1e5a6ec4
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside 2020-08-18 16:47:15 +01:00
Nikolay Korolev 48c5a2abed
Merge pull request #689 from jack9267/master 
Call CWorld::Remove before the delete
 2020-08-18 18:06:04 +03: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 c63887637b submodule update 2020-08-18 16:53:15 +03: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 0e4cd8cfae update librw 2020-08-18 11:05:43 +02:00
aap c556cbbbe0 neo pipelines 2020-08-18 10:58:15 +02:00
Nikolay Korolev 30b2acb9d5 submodules fix 2020-08-16 21:07:31 +03:00
Nikolay Korolev 1334dfc16f removed libs 2020-08-16 21:04:16 +03:00
Nikolay Korolev 2765334366 Merge remote-tracking branch 'upstream/master' 2020-08-16 21:02:48 +03:00
Nikolay Korolev 1c275695c4 fix submodules 2020-08-16 18:49:27 +03: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
Nikolay Korolev 7669b97ac6 sync with upstream 2020-08-16 14:46:20 +03:00
Sergeanur a728a542be Graphics menu + MSAA 2020-08-16 01:37:09 +03:00
Nikolay Korolev b612e84be8 submodule 2020-08-15 18:58:33 +03:00
Nikolay Korolev 1d5e3c7425 sync with master 2020-08-15 18:56:52 +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