Sergeanur
cea6b20c09
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
feb993e751
get rid of most --MIAMI comments
2021-01-22 11:43:29 +01:00
Sergeanur
8dab92d158
CMessages::GetTokenPadKeyString
2021-01-22 05:49:17 +02:00
withmorten
d1317f8fa6
m_nWantedLevel -> GetWantedLevel()
2021-01-22 00:20:51 +01:00
Nikolay Korolev
4703ec5164
sync
2021-01-17 16:03:37 +03:00
Sergeanur
4bd7bafd7c
Merge branch 'miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# premake5.lua
# src/control/Script2.cpp
# src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
erorcun
13b52229be
hud ammo fix
2021-01-13 23:07:12 +03:00
Sergeanur
8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr
...
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
2021-01-12 13:22:44 +02:00
Sergeanur
a223157000
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
2021-01-11 19:53:15 +02:00
Fire-Head
91c6389754
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-01-09 01:02:17 +03:00
Fire-Head
7a3ee349da
sync with re3
...
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
2021-01-09 01:01:41 +03:00
Sergeanur
faa9e6441b
Use original names
2021-01-08 21:53:11 +02:00
Nikolay Korolev
21e151cadd
hud fix
2021-01-03 20:06:29 +03:00
Sergeanur
42e4a068bb
CVarConsole
2021-01-02 13:32:25 +02:00
Sergeanur
6b52fb5fb6
Add shadow to subtitles with cutscene borders off
2020-12-28 15:04:07 +02:00
aap
73d080bcc8
silly mistake
2020-12-18 23:39:59 +01:00
aap
a7050458ae
little cleanup and synch on templates and config
2020-12-18 13:50:26 +01:00
aap
0115b0827b
fix wrong blend mode (original bug)
2020-11-11 19:10:22 +01:00
erorcun
fe5d0c9cdf
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-08 20:49:47 +03:00
aap
9203a33646
fix sniper/camera crosshair
2020-10-31 22:07:58 +01:00
erorcun
5b8437172a
Fix weapon icon drawing
2020-10-25 15:27:49 +03:00
Nikolay Korolev
720abca826
finished save/load
2020-10-17 20:45:07 +03:00
eray orçunus
40020f4e1e
Fix forgotten wanted/busted text
2020-10-12 12:36:15 +03:00
eray orçunus
8a622a0e72
Hud, Fire, OnscreenBlaBla
2020-10-12 06:42:54 +03:00
eray orçunus
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
majestic
9f43b1988b
cheats, fixes, cosmetic changes
2020-09-01 09:42:17 -07:00
aap
cdebea71f3
fixes to HUD and sprite2d
2020-08-13 18:47:39 +02:00
eray orçunus
eafa9cc107
new opcodes, buyable properties, minor fixes
2020-07-30 15:32:34 +03:00
eray orçunus
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +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
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
860f75d66c
Merge branch 'master' into ps2menu
2020-06-29 09:37:53 +03:00
Fire-Head
1c11a8081f
mips overdose
2020-06-28 00:01:51 +03:00
eray orçunus
f3ed6659c3
CWanted, anim fix, ped objs renaming, remove III beta features
2020-06-22 04:20:56 +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
Sergeanur
beb6f3bf80
small fixes
2020-06-13 13:57:25 +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
a44510d1df
more font
2020-06-07 10:36:37 +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
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
552205dfba
FONT_BANK renamed to FONT_STANDARD
2020-06-07 04:10:06 +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
aap
2e3cb77702
fixed radar rendering
2020-06-02 22:49:57 +02:00
eray orçunus
529cec5653
R to freeroam, idle anims, weapon and cam enum fix
2020-05-29 22:05:33 +03:00
eray orçunus
5357957fe1
Compatibility with VC weapon.dat + new shotguns
2020-05-23 16:53:20 +03:00