Sergeanur
|
53ac163a3e
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/vehicles/Automobile.h
|
2020-05-27 20:50:40 +03:00 |
|
Sergeanur
|
3a5a122887
|
Fix city sound playing on restarting a new game
|
2020-05-27 20:48:47 +03:00 |
|
Nikolay Korolev
|
d4ae40ae99
|
crash fix
|
2020-05-27 19:39:04 +03:00 |
|
aap
|
02741dc64f
|
RwCameraGetCurrentCamera
|
2020-05-27 09:47:57 +02:00 |
|
aap
|
1af4edd43a
|
RwCameraGetCurrentCamera
|
2020-05-27 09:47:21 +02:00 |
|
aap
|
d71cbae9df
|
CVehicle loose ends
|
2020-05-27 07:43:38 +02:00 |
|
aap
|
c068570192
|
Merge pull request #600 from Fire-Head/miami
Miami Particle
|
2020-05-27 07:18:47 +02:00 |
|
aap
|
4868bf13a8
|
Merge pull request #601 from Sergeanur/VC/audio3
Support of original mp3/wav/adf
|
2020-05-27 07:10:36 +02:00 |
|
Sergeanur
|
591c35d51b
|
OpenAL support
|
2020-05-27 07:52:45 +03:00 |
|
aap
|
d0d060d321
|
MT function for fakerw
|
2020-05-27 06:50:05 +02:00 |
|
aap
|
926281f909
|
MT function for fakerw
|
2020-05-27 06:49:38 +02:00 |
|
Sergeanur
|
7a79b74778
|
Restore original logic
|
2020-05-27 03:33:27 +03:00 |
|
Sergeanur
|
408faf8a66
|
Support of original mp3/wav/adf
|
2020-05-27 03:29:54 +03:00 |
|
Fire-Head
|
90947a608f
|
fix linux build
|
2020-05-27 03:18:02 +03:00 |
|
Fire-Head
|
6a32981ba5
|
VC CParticle done
|
2020-05-27 02:16:31 +03:00 |
|
Nikolay Korolev
|
9673ecddad
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-27 00:25:33 +03:00 |
|
Nikolay Korolev
|
ec1d14971c
|
mission replay
|
2020-05-27 00:25:12 +03:00 |
|
aap
|
ea09825d10
|
Merge pull request #553 from Sergeanur/VC/audio
Very basic compatibility with original sfx.raw/sdt
|
2020-05-26 22:02:12 +02:00 |
|
aap
|
4f1ce8bd42
|
added some unused enums
|
2020-05-26 20:44:03 +02: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 |
|
Sergeanur
|
1991aa388b
|
Very basic compatibility with original sfx.raw/sdt
|
2020-05-26 18:25:34 +03:00 |
|
Sergeanur
|
0ce2af7a0d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/Garages.cpp
# src/core/SurfaceTable.cpp
# src/core/SurfaceTable.h
# src/core/World.cpp
# src/core/main.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/Ped.cpp
# src/render/Timecycle.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/Heli.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/Weapon.cpp
# src/weapons/WeaponInfo.h
|
2020-05-26 17:24:47 +03:00 |
|
Nikolay Korolev
|
f40677c7a4
|
fixed crash
|
2020-05-26 16:17:40 +03:00 |
|
aap
|
314e56b7b9
|
fix2
|
2020-05-26 12:11:04 +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
|
7e5dde1f1a
|
eSurfaceType
|
2020-05-26 11:37:46 +02:00 |
|
aap
|
d8528ebbbe
|
eSurfaceType
|
2020-05-26 11:34:20 +02:00 |
|
aap
|
0b8f045d36
|
Merge pull request #586 from aap/miami
CVehicle
|
2020-05-26 11:25:23 +02:00 |
|
Nikolay Korolev
|
5ca0d6c6cf
|
fixed NE bug
|
2020-05-26 00:45:32 +03:00 |
|
Nikolay Korolev
|
38d2854226
|
fixed FIX_BUGS
|
2020-05-26 00:18:04 +03:00 |
|
Nikolay Korolev
|
ad8e8f4341
|
switch collision with debug menu
|
2020-05-25 23:59:55 +03:00 |
|
Nikolay Korolev
|
15a99da50e
|
cranes fix
|
2020-05-25 23:34:47 +03:00 |
|
aap
|
3c3b1aadc0
|
small fixes
|
2020-05-25 20:36:23 +02:00 |
|
Sergeanur
|
52644192e3
|
Even more audio cleanups
|
2020-05-25 19:36:09 +03:00 |
|
aap
|
7bf8337854
|
CVehicle
|
2020-05-25 18:33:34 +02:00 |
|
Sergeanur
|
ad896d5f81
|
Ped comments cleanup
|
2020-05-25 19:10:15 +03:00 |
|
Sergeanur
|
cebc3bbd48
|
More audio cleanup and bugfixes
|
2020-05-25 18:39:16 +03:00 |
|
Sergeanur
|
fd06ab4db8
|
Fix names of static variables
|
2020-05-25 03:56:17 +03:00 |
|
Sergeanur
|
80c2018b51
|
cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes
|
2020-05-25 03:40:47 +03:00 |
|
Sergeanur
|
56683dbed3
|
Clean cAudioManager::ProcessGarages up a bit
|
2020-05-24 20:33:30 +03:00 |
|
blingu
|
79c652e115
|
Ped.h include not needed
|
2020-05-24 17:48:13 +02:00 |
|
blingu
|
55ece14f42
|
Update CopPed.cpp
|
2020-05-24 17:36:37 +02:00 |
|
nrb
|
d59862eb5e
|
fixed compiler errors
|
2020-05-24 17:27:12 +02:00 |
|
Nikolay Korolev
|
6235e2140e
|
fixed filename
|
2020-05-24 17:23:14 +03:00 |
|
eray orçunus
|
14755a4ff4
|
all my fixes live in exes
|
2020-05-24 16:41:29 +03:00 |
|
aap
|
3fdd352ca2
|
CVehicle fixes
|
2020-05-24 15:14:56 +02:00 |
|
Nikolay Korolev
|
8705562559
|
how did saving even work in original III?
|
2020-05-24 15:58:25 +03:00 |
|
Nikolay Korolev
|
8c510a8d5b
|
script fix
|
2020-05-24 15:00:45 +03:00 |
|
Nikolay Korolev
|
e248cbcc7d
|
say goodbye to your saves
|
2020-05-24 14:01:01 +03:00 |
|
Nikolay Korolev
|
9c93cc7d6f
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-24 13:48:41 +03:00 |
|
Nikolay Korolev
|
cda3752838
|
comments
|
2020-05-24 13:48:17 +03:00 |
|
Nikolay Korolev
|
e95de89c9a
|
script fix
|
2020-05-24 12:01:07 +03:00 |
|
aap
|
19a0c8b462
|
Merge pull request #583 from erorcun/miami
Menu borders and weapon fixes
|
2020-05-24 10:47:17 +02:00 |
|
eray orçunus
|
4870d9a31b
|
Menu borders and weapon fixes
|
2020-05-24 03:05:48 +03:00 |
|
Sergeanur
|
f92770f74a
|
Optimize ALDeviceList
|
2020-05-24 01:44:10 +03:00 |
|
Sergeanur
|
7d30878418
|
Fix OAL crash
|
2020-05-24 01:06:19 +03:00 |
|
Nikolay Korolev
|
6a7bd0e330
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-24 00:19:25 +03:00 |
|
Sergeanur
|
ac208ce02c
|
Even more small audio cleanup
|
2020-05-23 23:25:14 +03:00 |
|
Sergeanur
|
f2790f610b
|
More audio cleanup
|
2020-05-23 22:48:50 +03:00 |
|
Sergeanur
|
88b6168f1c
|
Merge branch 'master' into miami
# Conflicts:
# premake5.lua
# src/control/Script.cpp
# src/core/SurfaceTable.cpp
# src/core/config.h
# src/entities/Physical.cpp
# src/entities/Physical.h
# src/objects/Object.h
# src/skel/skeleton.h
# src/vehicles/Vehicle.h
|
2020-05-23 21:14:16 +03:00 |
|
Nikolay Korolev
|
2966be41ba
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-23 20:07:30 +03:00 |
|
Nikolay Korolev
|
607175f02a
|
set pieces
|
2020-05-23 20:06:52 +03:00 |
|
eray orçunus
|
c3b41d79a2
|
Cleanup and one needed function
|
2020-05-23 18:04:33 +03:00 |
|
eray orçunus
|
5357957fe1
|
Compatibility with VC weapon.dat + new shotguns
|
2020-05-23 16:53:20 +03:00 |
|
Nikolay Korolev
|
100e59886d
|
cranes fix
|
2020-05-23 16:14:39 +03:00 |
|
aap
|
9313bfa155
|
skeleton typos
|
2020-05-23 11:34:48 +02:00 |
|
aap
|
e2d3ef449c
|
skeleton typos
|
2020-05-23 11:34:40 +02:00 |
|
Nikolay Korolev
|
9c6046455e
|
fixed script
|
2020-05-23 12:17:05 +03:00 |
|
Nikolay Korolev
|
7b7b0fb5f2
|
removed debug
|
2020-05-23 02:18:16 +03:00 |
|
Nikolay Korolev
|
f8a509ffb3
|
fixes
|
2020-05-23 02:17:27 +03:00 |
|
Nikolay Korolev
|
b9115b4429
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-23 01:43:17 +03:00 |
|
Nikolay Korolev
|
7bf561d440
|
some fixes
|
2020-05-23 01:43:12 +03:00 |
|
aap
|
a1e4b15bcc
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-22 23:58:59 +02:00 |
|
Nikolay Korolev
|
e18eb0ce01
|
script fix
|
2020-05-23 00:50:15 +03:00 |
|
Nikolay Korolev
|
6e51ed3c53
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-22 23:35:19 +03:00 |
|
eray orçunus
|
c993e99e00
|
Fix linux build
|
2020-05-22 22:49:54 +03:00 |
|
Sergeanur
|
a9f332f2d9
|
Possibly fix travis
|
2020-05-22 21:26:31 +03:00 |
|
Sergeanur
|
e858314a9f
|
OpenAL configs
|
2020-05-22 18:01:09 +03:00 |
|
erorcun
|
4b99d7127f
|
Merge pull request #579 from Xinerki/miami
InitAfterFocusLoss compile fix
|
2020-05-22 16:10:35 +03:00 |
|
Xin
|
a878e09f0f
|
InitAfterFocusLoss compile fix
|
2020-05-22 16:04:52 +03: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 |
|
Nikolay Korolev
|
864847a6fe
|
new script commands - mostly stubs
|
2020-05-22 02:42:04 +03:00 |
|
Xinerki
|
900d5a4ce0
|
focus loss improvement
for u aap
|
2020-05-21 21:48:39 +03:00 |
|
Xinerki
|
e0345732c0
|
wasted/busted text color
how did nobody change it yet
|
2020-05-21 17:50:08 +03:00 |
|
Xinerki
|
0db3d03c3c
|
sorry my bad
|
2020-05-21 17:36:12 +03:00 |
|
Xinerki
|
1c00e3cf2c
|
vehicle cheats and debug cheat string display
|
2020-05-21 17:28:03 +03:00 |
|
Xinerki
|
6692f5b2aa
|
make reloadables optional
|
2020-05-21 16:47:48 +03:00 |
|
Xinerki
|
6912cfe98a
|
menu map color change
|
2020-05-21 16:26:56 +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 |
|
Xinerki
|
1cb7b9876f
|
scuffed InitAfterFocusLoss implementation
|
2020-05-21 14:23:12 +03:00 |
|
Xinerki
|
b4060a4789
|
add freecam toggle in control settings
comes with a free config save!
|
2020-05-21 13:06:09 +03:00 |
|
Xinerki
|
2db26d304f
|
approach separation differently
|
2020-05-21 12:45:45 +03:00 |
|
Xinerki
|
6d32cf4a11
|
blip marker colors, also isolate crgba
|
2020-05-21 12:21:02 +03:00 |
|
Nikolay Korolev
|
7e5342e9f0
|
script revision
|
2020-05-21 11:22:25 +03:00 |
|
Nikolay Korolev
|
73ff01e35b
|
script fix
|
2020-05-21 00:18:13 +03:00 |
|
Nikolay Korolev
|
510261cb05
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-20 23:54:22 +03:00 |
|
Nikolay Korolev
|
3405cfffb7
|
fixed dumb
|
2020-05-20 23:52:17 +03:00 |
|
Nikolay Korolev
|
0085ed894f
|
script revision
|
2020-05-20 23:47:44 +03:00 |
|
Nikolay Korolev
|
b7c1784dd2
|
script fix
|
2020-05-20 23:25:01 +03:00 |
|
eray orçunus
|
5b953228b4
|
Pickup and audio fix
|
2020-05-20 21:22:40 +03:00 |
|
aap
|
71b9b2ecf9
|
Merge pull request #572 from erorcun/miami
Fixes for melees and various things
|
2020-05-20 19:55:05 +02:00 |
|
Nikolay Korolev
|
c0c8278c63
|
fixed ped comment
|
2020-05-20 20:45:07 +03:00 |
|
Nikolay Korolev
|
f33a01e8c8
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-20 20:40:36 +03:00 |
|
Nikolay Korolev
|
d84650fbe5
|
script revision
|
2020-05-20 20:40:04 +03:00 |
|
eray orçunus
|
2ab3fb5dd0
|
Fixes for melees and various things
|
2020-05-20 20:21:27 +03:00 |
|
Sergeanur
|
c53b23cff0
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/Radar.h
# src/core/World.cpp
# src/core/config.h
# src/entities/Entity.cpp
# src/modelinfo/ModelIndices.h
# src/modelinfo/PedModelInfo.cpp
# src/peds/Population.cpp
# src/render/Clouds.cpp
# src/render/Hud.cpp
# src/vehicles/HandlingMgr.h
|
2020-05-20 14:39:36 +03:00 |
|
aap
|
fd4cd3e8f1
|
Merge pull request #569 from aap/miami
CEntity and friends
|
2020-05-20 12:41:12 +02:00 |
|
Nikolay Korolev
|
1b96e6c378
|
fixed script bug
|
2020-05-19 23:49:28 +03:00 |
|
Nikolay Korolev
|
fec0028e12
|
sync with upstream
|
2020-05-19 23:27:41 +03:00 |
|
aap
|
50f0c7a1dc
|
bla
|
2020-05-19 22:01:28 +02:00 |
|
aap
|
0b0ba49abc
|
small fixes
|
2020-05-19 21:42:55 +02:00 |
|
aap
|
bdbe5d1080
|
CEntity and friends
|
2020-05-19 20:56:42 +02:00 |
|
Nikolay Korolev
|
46d1889344
|
slightly restructured ped flags for convenience
|
2020-05-19 21:34:28 +03:00 |
|
Nikolay Korolev
|
e967db4a3c
|
fixed annoying bug
|
2020-05-19 21:10:40 +03:00 |
|
Nikolay Korolev
|
41d7b3244b
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-19 20:54:10 +03:00 |
|
Nikolay Korolev
|
4c822e8375
|
script revision
|
2020-05-19 20:54:05 +03: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
|
8a90e32f1b
|
Merge pull request #564 from Xinerki/miami
fix audio menu crash
|
2020-05-19 13:26:43 +02:00 |
|
aap
|
6b0b984909
|
Merge pull request #561 from Nick007J/miami
script revision
|
2020-05-19 13:26:21 +02:00 |
|
Xinerki
|
ffd175c705
|
fix frontend control config menu a little
thank erorcun
|
2020-05-19 14:23:59 +03:00 |
|
aap
|
0d0f4da27a
|
little cleanup of handlingmgr
|
2020-05-19 13:09:20 +02:00 |
|
Xinerki
|
12b48edada
|
fix audio menu crash
|
2020-05-19 14:07:24 +03:00 |
|
aap
|
53cdf6ab41
|
HandlingMgr
|
2020-05-19 13:07:12 +02:00 |
|
aap
|
401e45d63e
|
Merge pull request #563 from Xinerki/miami
match frontend to vc more; isolate crgba
|
2020-05-19 12:50:47 +02:00 |
|
Xinerki
|
9e14e8553f
|
match frontend to vc more; isolate crgba
|
2020-05-19 13:47:55 +03:00 |
|
Nikolay Korolev
|
ff0e039599
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-19 12:44:40 +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 |
|
Xinerki
|
d425358181
|
Load VC frontend textures and use some
|
2020-05-19 10:07:15 +03:00 |
|
Nikolay Korolev
|
a27fc8d9d9
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-19 01:49:51 +03:00 |
|
Nikolay Korolev
|
6510b15704
|
script revision
|
2020-05-19 01:49:09 +03:00 |
|
Nikolay Korolev
|
c47292b518
|
script fix
|
2020-05-19 00:10:45 +03:00 |
|
aap
|
abd230dcdd
|
some less certainly fps fixes
|
2020-05-18 22:52:35 +02:00 |
|
aap
|
a8f4f74a76
|
only one sunbathe anim group
|
2020-05-18 22:25:06 +02:00 |
|
Nikolay Korolev
|
746f2aa479
|
script FPS fix
|
2020-05-18 22:43:06 +03:00 |
|
shfil
|
6bf79120dc
|
Fix string assignment (aldlist.cpp)
|
2020-05-18 21:08:01 +02:00 |
|
Sergeanur
|
e891cf858f
|
Remove MAX_VOLUME dups
|
2020-05-18 20:17:24 +03:00 |
|
aap
|
b05e6632be
|
Merge pull request #556 from Fire-Head/master
nullsampman
|
2020-05-18 17:08:32 +02:00 |
|
aap
|
2588e69849
|
some less certainly fps fixes
|
2020-05-18 16:55:38 +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
|
2d4861454c
|
Merge pull request #557 from Nick007J/miami
script and script stubs
|
2020-05-18 13:08:24 +02:00 |
|