Sergeanur
|
de8759eabd
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Record.cpp
# src/vehicles/Automobile.cpp
|
2020-07-17 13:53:11 +03:00 |
|
Sergeanur
|
949d0c8853
|
Add audio cache for faster initialization
|
2020-07-17 13:48:25 +03:00 |
|
Sergeanur
|
693a5e0c2a
|
Fix wheel water splash with PC_PARTICLE
|
2020-07-17 12:57:47 +03:00 |
|
Sergeanur
|
ebdc5cca7f
|
Merge branch 'master' into miami
|
2020-07-16 23:03:31 +03:00 |
|
Sergeanur
|
81c03f8e6d
|
Audio fixes
|
2020-07-16 22:30:55 +03:00 |
|
Sergeanur
|
ec09055599
|
Fix CCarStateEachFrame
|
2020-07-16 22:21:09 +03:00 |
|
aap
|
4e3e1d0b87
|
make game load all platform dffs
|
2020-07-16 13:36:25 +02:00 |
|
aap
|
23da99622c
|
tiny cleanup
|
2020-07-16 13:35:35 +02: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 |
|
eray orçunus
|
00bba630f6
|
enable island loading for now
|
2020-07-10 12:28:00 +03:00 |
|
erorcun
|
30723cf723
|
Merge pull request #654 from erorcun/miami
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-10 00:06:16 +03:00 |
|
eray orçunus
|
aabf0f4c2c
|
keep loading screen, but for a second
|
2020-07-09 21:48:43 +03:00 |
|
Sergeanur
|
c012e5a7ff
|
Disable loading screen
|
2020-07-09 20:40:15 +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
|
fa1263b6a4
|
CDarkel miami hud colors.
|
2020-07-07 01:02:39 +02: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 |
|
eray orçunus
|
c483a044b5
|
Noskillx's PR + fix .set loading
|
2020-07-06 19:26:41 +03:00 |
|
eray orçunus
|
70fa4ab79c
|
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
|
2020-07-06 16:38:00 +03:00 |
|
eray orçunus
|
ceb1defc4e
|
fixes from master, menu helper text
|
2020-07-04 23:50:43 +03:00 |
|
aap
|
2c50cf8ac6
|
Merge pull request #648 from Nick007J/miami
ice cream attractor + bike respray
|
2020-07-04 21:24:23 +02:00 |
|
aap
|
0acade08ca
|
Merge pull request #647 from Fire-Head/miami
miami CParticleObject
|
2020-07-04 21:24:17 +02:00 |
|
aap
|
1e679dcb8d
|
Merge pull request #641 from aap/miami
CBoat and friends
|
2020-07-04 21:24:11 +02:00 |
|
eray orçunus
|
1cea84d2b1
|
Remove console and fix sth
|
2020-07-04 16:01:07 +03:00 |
|
eray orçunus
|
716740f918
|
Peds & fixes
|
2020-07-04 15:31:28 +03:00 |
|
Fire-Head
|
4c65ec28d6
|
NULL->nil
|
2020-07-03 20:26:35 +03:00 |
|
eray orçunus
|
addb701638
|
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
|
2020-07-03 16:51:58 +03:00 |
|
eray orçunus
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
Nikolay Korolev
|
49a8dd7459
|
fixed typo
|
2020-07-03 15:21:11 +03:00 |
|
Nikolay Korolev
|
9bb8b39956
|
fixed typo
|
2020-07-03 15:17:02 +03:00 |
|
Nikolay Korolev
|
85e899c1a5
|
fixed typo
|
2020-07-03 15:15:42 +03:00 |
|
Nikolay Korolev
|
48ebbb7292
|
ice cream attractor + bike respray
|
2020-07-03 11:08:19 +03:00 |
|
eray orçunus
|
ed036df3ce
|
Re-enable console for debugging frontend
|
2020-07-03 05:40:22 +03:00 |
|
Fire-Head
|
d4004805f5
|
miami pobj
|
2020-07-03 02:18:06 +03:00 |
|
Nikolay Korolev
|
01b15fe807
|
reenabled script logging
|
2020-07-03 01:28:41 +03:00 |
|
Filip Gawin
|
bf2624692c
|
Fix displaying stats
|
2020-07-03 00:04:49 +02:00 |
|
eray orçunus
|
c4cd210ae0
|
Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
|
2020-07-02 16:01:42 +03:00 |
|
aap
|
2141247e08
|
CBoat and friends
|
2020-07-01 18:04:02 +02:00 |
|
aap
|
575f35f2c4
|
fixes to CBoat
|
2020-07-01 18:03:59 +02:00 |
|
Nikolay Korolev
|
389123cff3
|
fix
|
2020-07-01 16:06:16 +03:00 |
|
Nikolay Korolev
|
ade5dff217
|
script logging for miami
|
2020-07-01 15:43:19 +03:00 |
|
Nikolay Korolev
|
a1356f1001
|
copypaste bug
|
2020-07-01 15:38:32 +03:00 |
|
erorcun
|
eda50bc32b
|
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
|
2020-07-01 15:28:43 +03:00 |
|
Nikolay Korolev
|
779d4e02a4
|
little fix
|
2020-07-01 15:12:25 +03:00 |
|
Sergeanur
|
8045bec6a5
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
|
2020-06-30 19:12:06 +03:00 |
|
Sergeanur
|
da93b0a078
|
Audio fixes
|
2020-06-30 19:06:58 +03: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
|
87fa69385c
|
remove TheText.Load() from CGame::Initialise
|
2020-06-30 07:48:09 +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
|
6f81e84bd4
|
Restore original code of CControllerState::CheckForInput
|
2020-06-30 07:44:51 +03:00 |
|
Sergeanur
|
c80bdf3a2a
|
Rename IsAnyButtonPressed to CheckForInput
|
2020-06-30 07:43:55 +03:00 |
|
Sergeanur
|
6d396ba73b
|
Fix MBlur
|
2020-06-30 07:43:20 +03:00 |
|
Filip Gawin
|
6cf698badd
|
Fix glfw.cpp
|
2020-06-29 16:24:40 +02: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
|
7b22b7e2af
|
Update MemoryCard.cpp
|
2020-06-29 11:38:30 +03:00 |
|
Fire-Head
|
3b3324de38
|
Update MBlur.cpp
|
2020-06-29 11:14:00 +03:00 |
|
Fire-Head
|
d9cb9583bf
|
update glfw.cpp
|
2020-06-29 11:04:30 +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
|
63fdcf7e64
|
menu fixes
|
2020-06-29 10:29:02 +03:00 |
|
Fire_Head
|
0cd2ac7e5e
|
Update AudioLogic.cpp
|
2020-06-29 09:41:56 +03:00 |
|
Fire_Head
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
Nikolay Korolev
|
209b7891d1
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-28 16:24:37 +03:00 |
|
Nikolay Korolev
|
920bc0a1bf
|
fix
|
2020-06-28 16:24:09 +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 |
|
Nikolay Korolev
|
d6e111bb67
|
script logging fixes
|
2020-06-28 11:59:20 +03:00 |
|
Fire-Head
|
1f1782c587
|
restore Text.cpp
|
2020-06-28 08:32:56 +03:00 |
|
Fire-Head
|
b8f633de24
|
fixes
|
2020-06-28 01:57:01 +03: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 |
|
eray orçunus
|
c72fab15b4
|
fix anims again
|
2020-06-25 16:20:20 +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 |
|
aap
|
077bcf1c82
|
CPad fix
|
2020-06-24 19:11:33 +02:00 |
|
Nikolay Korolev
|
fe77b2ac53
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-22 14:07:49 +03:00 |
|
Nikolay Korolev
|
ba3fe38f2e
|
fixes
|
2020-06-22 14:07:19 +03:00 |
|
Nikolay Korolev
|
043f09f3fb
|
Merge pull request #637 from Nick007J/master
script logging
|
2020-06-22 13:27:25 +03:00 |
|
aap
|
3989e3df18
|
anim fix
|
2020-06-22 08:58:49 +02:00 |
|
eray orçunus
|
f3ed6659c3
|
CWanted, anim fix, ped objs renaming, remove III beta features
|
2020-06-22 04:20:56 +03:00 |
|
Nikolay Korolev
|
7a71a47f74
|
updated player control names
|
2020-06-21 16:00:17 +03:00 |
|
aap
|
60f736f20f
|
FOV fix
|
2020-06-21 14:52:44 +02:00 |
|
aap
|
b81bf1e138
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-06-21 14:52:19 +02:00 |
|
aap
|
e563450cb6
|
synch with re3
|
2020-06-21 14:52:03 +02:00 |
|
aap
|
98baa36f1a
|
FOV fix
|
2020-06-21 14:50:00 +02:00 |
|
Nikolay Korolev
|
08af34bc99
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-21 15:49:30 +03:00 |
|
aap
|
3859efff42
|
ps2 cam transitions done (hopefully)
|
2020-06-21 14:41:39 +02:00 |
|
Nikolay Korolev
|
0ab4496423
|
copypaste
|
2020-06-21 13:51:20 +03:00 |
|
Nikolay Korolev
|
f5cba0ce89
|
script logging
|
2020-06-21 13:46:23 +03:00 |
|
aap
|
586e8a2ab4
|
tried to reconstruct bills cam
|
2020-06-21 11:03:20 +02:00 |
|
aap
|
e1c58131c4
|
PS2 cam transition mostly working
|
2020-06-21 00:40:07 +02:00 |
|
eray orçunus
|
d6a853bd60
|
killing peds increase chaos level
|
2020-06-20 22:44:31 +03:00 |
|
eray orçunus
|
cc60ad1946
|
ducking & anim fix
|
2020-06-20 20:26:27 +03:00 |
|
eray orçunus
|
2d2833f2e4
|
more weapon fixes
|
2020-06-20 17:30:28 +03:00 |
|