|
|
2c50cf8ac6
|
Merge pull request #648 from Nick007J/miami
ice cream attractor + bike respray
|
2020-07-04 21:24:23 +02:00 |
|
|
|
0acade08ca
|
Merge pull request #647 from Fire-Head/miami
miami CParticleObject
|
2020-07-04 21:24:17 +02:00 |
|
|
|
1e679dcb8d
|
Merge pull request #641 from aap/miami
CBoat and friends
|
2020-07-04 21:24:11 +02:00 |
|
|
|
1cea84d2b1
|
Remove console and fix sth
|
2020-07-04 16:01:07 +03:00 |
|
|
|
716740f918
|
Peds & fixes
|
2020-07-04 15:31:28 +03:00 |
|
|
|
4c65ec28d6
|
NULL->nil
|
2020-07-03 20:26:35 +03:00 |
|
|
|
addb701638
|
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
|
2020-07-03 16:51:58 +03:00 |
|
|
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
|
|
49a8dd7459
|
fixed typo
|
2020-07-03 15:21:11 +03:00 |
|
|
|
9bb8b39956
|
fixed typo
|
2020-07-03 15:17:02 +03:00 |
|
|
|
85e899c1a5
|
fixed typo
|
2020-07-03 15:15:42 +03:00 |
|
|
|
48ebbb7292
|
ice cream attractor + bike respray
|
2020-07-03 11:08:19 +03:00 |
|
|
|
ed036df3ce
|
Re-enable console for debugging frontend
|
2020-07-03 05:40:22 +03:00 |
|
|
|
d4004805f5
|
miami pobj
|
2020-07-03 02:18:06 +03:00 |
|
|
|
01b15fe807
|
reenabled script logging
|
2020-07-03 01:28:41 +03:00 |
|
|
|
bf2624692c
|
Fix displaying stats
|
2020-07-03 00:04:49 +02:00 |
|
|
|
c4cd210ae0
|
Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
|
2020-07-02 16:01:42 +03:00 |
|
|
|
2141247e08
|
CBoat and friends
|
2020-07-01 18:04:02 +02:00 |
|
|
|
575f35f2c4
|
fixes to CBoat
|
2020-07-01 18:03:59 +02:00 |
|
|
|
389123cff3
|
fix
|
2020-07-01 16:06:16 +03:00 |
|
|
|
ade5dff217
|
script logging for miami
|
2020-07-01 15:43:19 +03:00 |
|
|
|
a1356f1001
|
copypaste bug
|
2020-07-01 15:38:32 +03:00 |
|
|
|
eda50bc32b
|
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
|
2020-07-01 15:28:43 +03:00 |
|
|
|
779d4e02a4
|
little fix
|
2020-07-01 15:12:25 +03:00 |
|
|
|
8045bec6a5
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
|
2020-06-30 19:12:06 +03:00 |
|
|
|
da93b0a078
|
Audio fixes
|
2020-06-30 19:06:58 +03:00 |
|
|
|
cbed027c0e
|
Merge branch 'master' into miami
|
2020-06-30 08:24:05 +03:00 |
|
|
|
a15f3ddb8b
|
Fix glfw build
|
2020-06-30 08:08:50 +03:00 |
|
|
|
87fa69385c
|
remove TheText.Load() from CGame::Initialise
|
2020-06-30 07:48:09 +03:00 |
|
|
|
1d2d5fe6ae
|
Merge branch 'master' into miami
# Conflicts:
# src/render/MBlur.cpp
# src/render/MBlur.h
|
2020-06-30 07:45:54 +03:00 |
|
|
|
6f81e84bd4
|
Restore original code of CControllerState::CheckForInput
|
2020-06-30 07:44:51 +03:00 |
|
|
|
c80bdf3a2a
|
Rename IsAnyButtonPressed to CheckForInput
|
2020-06-30 07:43:55 +03:00 |
|
|
|
6d396ba73b
|
Fix MBlur
|
2020-06-30 07:43:20 +03:00 |
|
|
|
6cf698badd
|
Fix glfw.cpp
|
2020-06-29 16:24:40 +02:00 |
|
|
|
b072cbca93
|
cleanup
|
2020-06-29 12:12:52 +02:00 |
|
|
|
94ce376a76
|
cleanup
|
2020-06-29 12:12:43 +02:00 |
|
|
|
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 |
|
|
|
7b22b7e2af
|
Update MemoryCard.cpp
|
2020-06-29 11:38:30 +03:00 |
|
|
|
a01fe76db7
|
Merge pull request #640 from Fire-Head/ps2menu
ps2 menu, memorycard, pad and god knows what else
|
2020-06-29 11:23:02 +03:00 |
|
|
|
3b3324de38
|
Update MBlur.cpp
|
2020-06-29 11:14:00 +03:00 |
|
|
|
d9cb9583bf
|
update glfw.cpp
|
2020-06-29 11:04:30 +03:00 |
|
|
|
2f12d0e231
|
Update MBlur.cpp
|
2020-06-29 10:40:06 +03:00 |
|
|
|
fcac1f9a34
|
fix linux build?
|
2020-06-29 10:36:35 +03:00 |
|
|
|
63fdcf7e64
|
menu fixes
|
2020-06-29 10:29:02 +03:00 |
|
|
|
0cd2ac7e5e
|
Update AudioLogic.cpp
|
2020-06-29 09:41:56 +03:00 |
|
|
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
|
|
209b7891d1
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-28 16:24:37 +03:00 |
|
|
|
920bc0a1bf
|
fix
|
2020-06-28 16:24:09 +03:00 |
|
|
|
3370ae04cb
|
renamed 2dfx shadowRange to Size
|
2020-06-28 12:08:46 +02:00 |
|
|
|
418bee9c22
|
renamed 2dfx shadowRange to Size
|
2020-06-28 12:05:42 +02:00 |
|
