Commit Graph

608 Commits

Author SHA1 Message Date
aap
2612c9f12c CPlaneTrails and CPlaneBanners done 2020-07-20 19:50:20 +02:00
majestic
1ff27e3363 cosmetic fixes 2020-07-20 09:49:39 -07:00
aap
e74b569115 CPlane done 2020-07-19 00:56:30 +02:00
Sergeanur
dd717b2d93 Actual fix now xD 2020-07-18 13:27:31 +03:00
Sergeanur
cf5dd6289e Fix TempVertexBuffer overflow 2020-07-18 13:09:21 +03:00
Sergeanur
30384bb4ef Merge branch 'master' into miami
# Conflicts:
#	src/render/Credits.cpp
2020-07-17 21:15:47 +03:00
Sergeanur
1b161275e1 Fix CalcScreenCoors... again 2020-07-17 18:23:11 +03:00
Sergeanur
27e1fa1d28 Add missing f's 2020-07-17 17:56:59 +03:00
Sergeanur
d0f5464200 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
Sergeanur
841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Sergeanur
6eb8f6ae5a Add cutscene borders switch to the menu 2020-07-11 12:04:26 +03:00
Sergeanur
cf69f22a0c Remove island loading 2020-07-09 19:18:42 +03:00
eray orçunus
67a3c7d2ee VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
Dominik
478d4246c4
Miami Colors.
Miami colors for MissionPassed/Failed, oddjob text 1 and 2 + fixed wrong busted/wasted color (it was pink and in the original its actually green)
2020-07-07 00:32:13 +02:00
aap
2141247e08 CBoat and friends 2020-07-01 18:04:02 +02:00
Sergeanur
cbed027c0e Merge branch 'master' into miami 2020-06-30 08:24:05 +03:00
Sergeanur
a15f3ddb8b Fix glfw build 2020-06-30 08:08:50 +03:00
Sergeanur
1d2d5fe6ae Merge branch 'master' into miami
# Conflicts:
#	src/render/MBlur.cpp
#	src/render/MBlur.h
2020-06-30 07:45:54 +03:00
Sergeanur
6d396ba73b Fix MBlur 2020-06-30 07:43:20 +03:00
aap
b072cbca93 cleanup 2020-06-29 12:12:52 +02:00
aap
94ce376a76 cleanup 2020-06-29 12:12:43 +02:00
Sergeanur
b26eec5daf Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp
2020-06-29 12:56:50 +03:00
Fire-Head
3b3324de38 Update MBlur.cpp 2020-06-29 11:14:00 +03:00
Fire-Head
2f12d0e231 Update MBlur.cpp 2020-06-29 10:40:06 +03:00
Fire-Head
fcac1f9a34 fix linux build? 2020-06-29 10:36:35 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
aap
3370ae04cb renamed 2dfx shadowRange to Size 2020-06-28 12:08:46 +02:00
aap
418bee9c22 renamed 2dfx shadowRange to Size 2020-06-28 12:05:42 +02:00
Fire-Head
233792e2b8 fixfixfix 2020-06-28 00:31:45 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
aap
592a6aef0b
Merge pull request #638 from erorcun/miami
CWanted, anim fix, ped objs renaming, remove III beta features
2020-06-25 15:15:01 +02:00
aap
2b21f92347 rename attractor flag to type 2020-06-25 15:13:33 +02:00
aap
cafe4d6f0c rename attractor flag to type 2020-06-25 15:13:08 +02:00
eray orçunus
f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
aap
60f736f20f FOV fix 2020-06-21 14:52:44 +02:00
aap
98baa36f1a FOV fix 2020-06-21 14:50:00 +02:00
aap
c5205a89ee CCamera done 2020-06-20 14:54:11 +02:00
eray orçunus
e9d5d42ea9 fix clipped subtitles 2020-06-17 11:11:44 +03:00
Sergeanur
655eaa36ce Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/Script.cpp
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
2020-06-15 17:44:47 +03:00
aap
c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
Sergeanur
beb6f3bf80 small fixes 2020-06-13 13:57:25 +03:00
Nikolay Korolev
f78f707935 script fix 2020-06-13 02:02:59 +03:00
majestic
2cc8ecbb90 removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun 2020-06-11 01:36:45 -07:00
majestic
cf8fcada6e m_density renamed to m_opacity 2020-06-10 14:01:37 -07:00
majestic
287987b8fe SmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded 2020-06-10 13:47:48 -07:00
majestic
a99da7b94e more original cheats
- CSmokeTrails and CSmokeTrail classes added in new files
- more cheats added
2020-06-10 13:19:05 -07:00
Sergeanur
0afb1d9e24 Scale font shadow 2020-06-08 10:30:09 +03:00
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
eray orçunus
88f066f469 HUD sizes 2020-06-07 19:13:12 +03:00
Sergeanur
fe3a3ad8b5 cleanup 2020-06-07 15:19:29 +03:00
Sergeanur
a44510d1df more font 2020-06-07 10:36:37 +03:00
Sergeanur
31569d512c font fix 2020-06-07 09:10:09 +03:00
Sergeanur
91e2b427ef more font stuff 2020-06-07 05:12:01 +03:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
fc7e35e1cd fixes 2020-06-07 04:20:02 +03:00
Sergeanur
24bf4c2cba Merge branch 'miami' into Font
# Conflicts:
#	src/render/Font.cpp
#	src/render/Font.h
2020-06-07 04:16:10 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur
678a19ce3b a bit of fonts 2020-06-07 04:11:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
eray orçunus
fc0498b3a8 CFont crash workaround 2020-06-06 19:25:37 +03:00
eray orçunus
016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
aap
2e3cb77702 fixed radar rendering 2020-06-02 22:49:57 +02:00
aap
06c761e9ac few bike things 2020-06-02 15:26:11 +02:00
aap
25273485d9 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
aap
7c7727e7da fixed timebar toggle 2020-06-01 13:21:19 +02:00
aap
f69313237e
Merge pull request #607 from rollschuh2282/master
Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu
2020-06-01 10:44:45 +02:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap
bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02:00
aap
21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
aap
00dc86917e some more CAutomobile 2020-05-31 17:05:59 +02:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
eray orçunus
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
rollschuh2282
2d5f7d92e5
Add files via upload 2020-05-29 12:04:20 +02:00
aap
ab7a21e017
Merge pull request #603 from Fire-Head/miami
Miami Water, Seagulls, Ships
2020-05-28 10:23:28 +02:00
Fire-Head
8280e04b23 rem unnecessary asserts 2020-05-28 02:40:23 +03:00
Fire_Head
7f30a2ae1b
cockbuilding ejaculation fix 2020-05-28 00:45:45 +03:00
Fire-Head
fab2c8699c surfacetable included 2020-05-28 00:36:52 +03:00
Fire-Head
98af5e4ddb fix SURFACE_SAND 2020-05-28 00:28:36 +03:00
Fire-Head
895580c724 seagulls, ships 2020-05-28 00:15:37 +03:00
Fire-Head
63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
Fire-Head
6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
aap
0ac3477035 fix UB shit 2020-05-26 18:50:27 +02:00
aap
7f60be9814 fix UB shit 2020-05-26 18:50:19 +02:00
aap
dfa95002aa fix 2020-05-26 12:10:08 +02:00
aap
800d706935
Merge pull request #588 from blingu/miami
fixed compiler errors
2020-05-26 11:39:16 +02:00
aap
3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
nrb
d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
aap
a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
erorcun
8b82e9c40f
Merge pull request #574 from Xinerki/miami
many additions
2020-05-22 15:49:37 +03:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap
a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Xinerki
e0345732c0 wasted/busted text color
how did nobody change it yet
2020-05-21 17:50:08 +03:00
Xinerki
6692f5b2aa make reloadables optional 2020-05-21 16:47:48 +03:00
Xinerki
46c6b0d29d fancy HUD.TXD reloader
TODO: make optional with defines, also add more reload options
2020-05-21 16:25:46 +03:00
Xinerki
3e75de9709 radardisc shadow
thank tomasak
2020-05-21 15:46:53 +03:00
Nikolay Korolev
7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
aap
fd4cd3e8f1
Merge pull request #569 from aap/miami
CEntity and friends
2020-05-20 12:41:12 +02:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
eray orçunus
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
aap
9d16df5aa8
Merge pull request #562 from Xinerki/miami
Load VC frontend textures and use some
2020-05-19 10:41:17 +02:00
Xinerki
00ee82aba6 Zone and Vehicle text slant 2020-05-19 11:36:08 +03:00
aap
62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
3f2bdc096d some HUD colors 2020-05-17 15:57:59 +02:00
aap
4ab49780b5 collect HUD colors at top of file 2020-05-17 15:33:44 +02:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
Nikolay Korolev
5abd466b5d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 10:52:58 +03:00
Sergeanur
76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur
ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Nikolay Korolev
21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev
08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Nikolay Korolev
d426588496 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-13 17:55:12 +03:00
Nikolay Korolev
81ea6f0258 ped attractor: start 2020-05-13 11:38:05 +03:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Sergeanur
33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
2020-05-13 00:27:15 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02: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
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master
Linux build support
2020-05-12 00:33:13 +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
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
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur
35c41208f5 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
2020-05-10 01:26:12 +03:00
Sergeanur
28103775ba Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
Sergeanur
4b8d6a3223 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimBlendAssocGroup.cpp
#	src/animation/AnimBlendAssociation.cpp
#	src/animation/AnimManager.cpp
#	src/core/Streaming.cpp
2020-05-09 02:56:53 +03:00
Sergeanur
e917cd1f46 Fix corona scaling 2020-05-09 02:50:48 +03:00
Sergeanur
1ef8d61f36 Merge branch 'master' into miami 2020-05-08 17:49:19 +03:00
Sergeanur
e0b3418e65 Fix water UV on high FPS and inverted free camera 2020-05-08 14:34:21 +03:00
aap
a8f1505517 small fixes 2020-05-07 21:56:09 +02:00
aap
c715569d1d CBaseModelInfo done 2020-05-07 21:55:54 +02:00
aap
6a7d08ecc2 some quick cosmetic fixes 2020-05-07 14:41:35 +02:00
aap
dbbf390983 use water color and new water texture 2020-05-07 13:38:14 +02:00
aap
3931dc795f waterlevel with offset (from Fire_Head) 2020-05-06 23:13:12 +02:00
Nikolay Korolev
a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
aap
e0568a19d5 new zone stuff 2020-05-06 12:23:57 +02:00
aap
edd9301d7f reverting fuckup 2020-05-06 09:59:04 +02:00
aap
8e84728f41 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-06 09:24:18 +02:00
aap
bb0541404d updated librw 2020-05-06 09:24:12 +02:00
aap
31f9bb566b implemented most of timecycle and mblur 2020-05-06 00:53:26 +02:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
aap
e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Sergeanur
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur
c2b9ddc5b8 Revert "Remove Miami stuff"
This reverts commit 9960c41193.
2020-05-05 18:04:43 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
aap
b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
aap
702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Sergeanur
89961325b2 Ceil health and armor values in hud (fix 99 health) 2020-05-02 23:38:52 +03:00
Sergeanur
52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap
4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
aap
d9c987bd8c fix (temporary?) for black bullet traces 2020-04-27 12:31:38 +02:00
Nikolay Korolev
68bf239868
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
2020-04-27 00:53:54 +03:00
aap
1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02:00
Sergeanur
f0890b1112 Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-26 22:03:15 +03:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev
05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
Nikolay Korolev
78d6ad7348 Merge remote-tracking branch 'upstream/master' 2020-04-21 23:41:04 +03:00
Fire_Head
828dc85be5
fix RenderExtraPlayerShadows 2 2020-04-21 22:53:55 +03:00
Fire_Head
fba4c51f6b
fix RenderExtraPlayerShadows 2020-04-21 22:52:42 +03:00
Nikolay Korolev
7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
shfil
7794cca429
Merge pull request #477 from ShFil119/mingw
Try to make code working on more platforms
2020-04-20 19:50:12 +02:00
Nikolay Korolev
35a7f89f73 Merge remote-tracking branch 'upstream/master' 2020-04-20 19:41:49 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Fire-Head
83810168ee beta OddJob(unique jump etc) sliding text 2020-04-20 07:45:17 +03:00
Nikolay Korolev
b8c34f6654 Merge remote-tracking branch 'upstream/master' 2020-04-20 01:05:20 +03:00
Fire-Head
2308321805 Add polish lang support 2020-04-19 22:32:59 +03:00
Nikolay Korolev
df376a13ea sync with master 2020-04-19 17:38:48 +03:00
Nikolay Korolev
9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03:00
erorcun
0f07a323c9
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
2020-04-19 16:56:39 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev
4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
gennariarmando
ffe5dce7f5 Hide Vehicle/Zone name during Wasted/Busted...
Fixed little mistake in my latest commit.
2020-04-18 18:14:38 +02:00
Filip Gawin
d6314f9564 Revert "Part one"
This reverts commit 63951d9b95.
2020-04-18 12:29:28 +02:00
Filip Gawin
2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur
555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
Filip Gawin
63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur
941c50ee25 Merge remote-tracking branch 'origin/master' into Standalone 2020-04-17 16:31:43 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00