a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-25 07:21:55 +00:00
Code Issues Projects Releases Wiki Activity
3299 commits 4 branches 2 tags 50 MiB
Commit graph

3299 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 56388472cb Remove III files 2020-08-14 15:25:02 +03:00
Sergeanur 0ae41be16b Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	librw
 2020-08-14 14:35:54 +03:00
Sergeanur e1ca6c6b79 Move stuff to vendor 2020-08-14 14:22:50 +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
aap 18647717df
Merge pull request #684 from aap/miami 
extended colourfilter
 2020-08-13 16:29:07 +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 4635daf6b3 update librw 2020-08-11 18:42:21 +02:00
aap b468d010a8 implemented extended postfx 2020-08-11 18:40:04 +02:00
aap c3443bff99
Merge pull request #683 from majesticCoding/miami 
improved mission switcher
 2020-08-10 23:26:22 +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 e29e911302 update librw 2020-08-10 17:05:34 +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
aap b02c7cdc44 coronas done 2020-08-09 13:17:48 +02:00
aap 5dc7ff98f2 corona fixes 2020-08-09 13:17:05 +02:00
Fire-Head d2d8bea51e rem pobj assert 2020-08-09 01:30:57 +03:00
aap bad2b4b3c2
Merge pull request #681 from withmorten/master 
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't …
 2020-08-08 17:40:17 +02:00
Fire_Head dbaeaa45cf
Merge pull request #682 from Fire-Head/miami 
static shadows fix, cutscene shadows switches
 2020-08-08 18:15:51 +03:00