Sergeanur
|
0d20f1c364
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
|
2020-10-18 17:15:49 +03:00 |
|
Filip Gawin
|
747fe7ab67
|
Merge branch 'master' of github.com:GTAmodding/re3 into master
|
2020-10-18 15:14:03 +02:00 |
|
Filip Gawin
|
3594b35fbb
|
Add missing breaks in AudioLogic.cpp
|
2020-10-18 15:13:43 +02:00 |
|
Roman Masanin
|
9cf38634b9
|
ProcessWaterCannon bug and refractoring (#773)
* fix audio bug and some refractoring
* mark original bugs
|
2020-10-17 20:56:42 +02:00 |
|
erorcun
|
4e07297503
|
Update sampman_miles.cpp
|
2020-10-12 20:51:52 +03:00 |
|
eray orçunus
|
342da2430b
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-12 20:47:34 +03:00 |
|
eray orçunus
|
d18a55f429
|
SampleManager
|
2020-10-12 20:22:39 +03:00 |
|
Sergeanur
|
9dba2386bb
|
Merge branch 'master' into VC/TextFinish
# Conflicts:
# src/text/Text.cpp
|
2020-10-11 10:34:47 +03:00 |
|
Sergeanur
|
e26e85deb8
|
Some unicode funcs belong to Font.cpp + small fix
|
2020-10-11 10:33:02 +03:00 |
|
erorcun
|
3435d6656c
|
Merge pull request #748 from theR4K/miamiUpstream
CExplosion and some audio
|
2020-10-08 16:15:18 +03:00 |
|
Roman Masanin
|
4fd93fea51
|
fix mistakes
|
2020-10-05 17:24:57 +03:00 |
|
eray orçunus
|
ee27cae732
|
Fix Linux audio path
|
2020-10-05 14:23:37 +03:00 |
|
eray orçunus
|
1a0b71bd47
|
Fix Audio
|
2020-10-05 14:23:12 +03:00 |
|
eray orçunus
|
6f3f581d8a
|
Fix Audio
|
2020-10-05 13:59:40 +03:00 |
|
Roman Masanin
|
4867d9949d
|
some audio and part of CExplosion
|
2020-10-05 03:04:35 +03:00 |
|
eray orçunus
|
49ae7da5ce
|
Fix Linux audio path
|
2020-10-05 01:25:56 +03:00 |
|
shfil
|
9d53b738cc
|
Merge pull request #737 from theR4K/miamiDev
just ProcessActiveQueues
|
2020-10-02 20:11:00 +02:00 |
|
Roman Masanin
|
1991f9b362
|
revert some changes and little fix
|
2020-10-02 20:35:16 +03:00 |
|
erorcun
|
72f342245d
|
Merge pull request #731 from erorcun/miami
Population done, mouse AUX buttons, Frontend, Hud, fixes
|
2020-10-02 17:39:15 +03:00 |
|
Roman Masanin
|
6ff138ca76
|
fix build(bcs func CheckForAnAudioFileOnCD not used anymore)
|
2020-10-02 05:03:29 +03:00 |
|
Roman Masanin
|
064f2e66e1
|
letter 'c' is done
|
2020-10-02 04:59:06 +03:00 |
|
Roman Masanin
|
e5a48faf89
|
merged from upstream
|
2020-10-02 04:03:17 +03:00 |
|
Roman Masanin
|
63e5faef11
|
rewieved some audio functions
|
2020-10-02 03:55:26 +03:00 |
|
Roman Masanin
|
e54b540bd4
|
final processActiveQueues
|
2020-10-02 00:11:51 +03:00 |
|
Roman Masanin
|
311cffa901
|
second pass processActiveQueues
|
2020-10-01 23:48:35 +03:00 |
|
Roman Masanin
|
eb0e89d3ea
|
half done processActiveQueues
|
2020-10-01 23:11:20 +03:00 |
|
eray orçunus
|
595421da39
|
Fixes, mouse AUX buttons, joystick detect menu
|
2020-09-30 20:03:01 +03:00 |
|
Filip Gawin
|
4ec5e44b68
|
Mark audio code which is the same in re3 as done
|
2020-09-30 18:14:50 +02:00 |
|
eray orçunus
|
f740588780
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-09-30 02:44:02 +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 |
|
Sergeanur
|
fae4c73ad3
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
# src/audio/MusicManager.cpp
# src/audio/sampman.h
# src/audio/sampman_oal.cpp
# src/control/CarCtrl.cpp
# src/control/Replay.cpp
# src/control/Script.cpp
# src/core/Camera.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/math/Matrix.cpp
# src/math/Matrix.h
# src/math/Vector2D.h
# src/peds/Ped.cpp
# src/render/Credits.cpp
# src/render/Hud.cpp
# src/render/Skidmarks.cpp
# src/weapons/Weapon.cpp
|
2020-09-30 02:25:30 +03:00 |
|
Filip Gawin
|
855c6a3c05
|
Fix build (if -> ifdef)
|
2020-09-30 02:18:46 +03:00 |
|
Filip Gawin
|
ff2998bee3
|
Make frequency more consistent with vanilla
|
2020-09-30 02:18:38 +03:00 |
|
Sergeanur
|
2129cc2906
|
Fix arg types
|
2020-09-30 02:18:11 +03:00 |
|
shfil
|
f35fd97c76
|
Merge pull request #722 from theR4K/master
fix for frequency miscalculation
|
2020-09-30 02:17:14 +03:00 |
|
Filip Gawin
|
8424eabf22
|
Fix build (if -> ifdef)
|
2020-09-29 17:02:47 +02:00 |
|
Filip Gawin
|
a0b6410801
|
Make frequency more consistent with vanilla
|
2020-09-29 16:56:40 +02:00 |
|
erorcun
|
e2314c7852
|
Merge pull request #717 from theR4K/miami
Helicopters not ringing, and other audio stuff
|
2020-09-29 01:48:11 +03:00 |
|
Sergeanur
|
5144b5051c
|
Fix arg types
|
2020-09-28 21:37:59 +03:00 |
|
Roman Masanin
|
a5269b998b
|
reverse compare
|
2020-09-28 21:11:24 +03:00 |
|
Roman Masanin
|
c317d3d9b1
|
tiny style fix
|
2020-09-28 21:09:06 +03:00 |
|
Roman Masanin
|
7576b003c6
|
change for better understanding
|
2020-09-28 20:48:28 +03:00 |
|
Roman Masanin
|
1ea89f5aed
|
Merge remote-tracking branch 'upstream/master'
|
2020-09-28 03:40:58 +03:00 |
|
Roman Masanin
|
37e382c758
|
fix for frequency misscalculation
|
2020-09-28 03:29:45 +03:00 |
|
eray orçunus
|
70aac0f460
|
Fixes: PS2/PS2-like menu, Hud, new sliding text found
|
2020-09-27 19:22:21 +03:00 |
|
Roman Masanin
|
b956be0f44
|
another clamp
|
2020-09-27 04:22:59 +03:00 |
|
Roman Masanin
|
f67275be13
|
correction of defects and another two audio functions
|
2020-09-27 03:35:15 +03:00 |
|
Sergeanur
|
4cfc61da14
|
Use enums in aVehicleSettings
|
2020-09-27 02:26:35 +03:00 |
|
Roman Masanin
|
c403df0861
|
processEngineDamage
|
2020-09-27 02:03:36 +03:00 |
|
Roman Masanin
|
bb2e601e13
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-09-26 21:38:37 +03:00 |
|