erorcun
b67ed1988f
Peds: Remove redundant lines
2020-11-12 17:36:41 +03:00
Nikolay Korolev
55c9a81922
fixed zone bug
2020-11-12 17:32:16 +03:00
aap
90b624a3e0
Merge pull request #812 from Nick007J/miami
...
CWorld done + top gear fix
2020-11-12 11:40:19 +01:00
aap
0115b0827b
fix wrong blend mode (original bug)
2020-11-11 19:10:22 +01:00
aap
79432dce20
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-11 14:42:12 +01:00
aap
ff44f29616
ped fix for new renderer
2020-11-11 14:42:02 +01:00
Nikolay
a76c6b2307
damn
2020-11-11 13:40:11 +03:00
Nikolay
984708dfd3
damn
2020-11-11 13:36:10 +03:00
Nikolay
a8b5303207
Update src/control/Pickups.cpp
...
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
2020-11-11 13:19:21 +03:00
Nikolay Korolev
35874b5fd2
fix
2020-11-11 12:27:40 +03:00
Nikolay Korolev
a67d4c70d7
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 12:22:57 +03:00
Nikolay Korolev
be92957328
fixed top gear
2020-11-11 12:21:30 +03:00
aap
48d0653331
urgh, merge and changes to RW layer in one commit.
2020-11-11 09:38:33 +01:00
Nikolay Korolev
612a6dd06c
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 00:08:54 +03:00
Nikolay Korolev
ef2089cafb
CWorld done
2020-11-11 00:08:32 +03:00
Sergeanur
5c64dba65a
Merge pull request #771 from theR4K/miamiDev
...
more audio for god of audio
2020-11-10 22:32:12 +02:00
majestic
cf6a9a8341
CGlass indices fix
2020-11-09 06:18:49 -08:00
Sergeanur
51e7f44433
Pickup fix
2020-11-08 22:40:05 +02:00
Sergeanur
23d294fef5
Possibly fix pickup money text
2020-11-08 21:59:13 +02:00
Roman Masanin
fb2173c396
to make Serge and _R4K_ happy
2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098
marked stupied code(dotProduct and AudioEvents)
2020-11-08 22:26:14 +03:00
Roman Masanin
0853a47a3f
returned bad code, becouse no one knows what to do with it
2020-11-08 21:23:29 +03:00
erorcun
fe5d0c9cdf
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-08 20:49:47 +03:00
Roman Masanin
95bd5b073a
pointers into referencies!
2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716
fix for merge fix
2020-11-08 17:49:10 +03:00
Roman Masanin
f8cc86c227
fix merge
2020-11-08 16:23:20 +03:00
Roman Masanin
23d23f6462
merge upstream
2020-11-08 16:23:05 +03:00
Sergeanur
a2e0373d22
Pickups fix
2020-11-08 15:00:54 +02:00
Sergeanur
7ede8685ec
Ped comments fixes
2020-11-07 14:39:53 +02:00
aap
092f32ba67
move stuff into define
2020-11-07 12:52:11 +01:00
Filip Gawin
e24513d2ad
Sfx audio logic
2020-11-06 18:42:52 +01:00
aap
ee8366adba
RwRenderStateGet
2020-11-05 17:46:28 +02:00
Sergeanur
5a59542679
Fix inverted vertical camera
2020-11-05 16:38:41 +02:00
aap
0d55b6182a
Merge pull request #795 from withmorten/master
...
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
# Conflicts:
# premake5.lua
# src/core/config.h
2020-11-05 16:38:02 +02:00
aap
67c894cda9
more fixes to new renderer
2020-11-04 23:11:27 +01:00
aap
0662de5323
fixed vehicle and ped sorting for new renderer
2020-11-04 22:45:01 +01:00
aap
244b91ee80
fixed boats for new renderer
2020-11-04 16:22:15 +01:00
Roman Masanin
89b622eea8
FORMAT
2020-11-04 11:37:17 +03:00
aap
e1279b01bc
forget ifdef
2020-11-03 20:40:33 +01:00
aap
6857e26411
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-03 20:33:14 +01:00
aap
3c5bb4e8f3
new LCS-style renderer
2020-11-03 20:33:07 +01:00
Nikolay Korolev
e473123a6a
fixes
2020-11-03 00:07:25 +03:00
Nikolay Korolev
0ccc70c843
embarassing
2020-11-02 23:53:52 +03:00
aap
8acc98563e
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-02 13:57:58 +01:00
aap
7041f11987
bike bug
2020-11-02 13:57:51 +01:00
Nikolay Korolev
bae6c24209
fix
2020-11-02 15:54:42 +03:00
Roman Masanin
174424c520
fix serviceSoundEffects an cleanup
2020-11-02 12:05:23 +03:00
Roman Masanin
cebf32c46c
mark code
2020-11-01 23:38:45 +03:00
Roman Masanin
5ea9285c5b
changes in switch, and mark code
2020-11-01 22:42:45 +03:00
Roman Masanin
55c4346610
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
2020-11-01 22:35:46 +03:00
Nikolay Korolev
5edd9e75da
finished script and replay
2020-11-01 18:21:05 +03:00
Nikolay Korolev
45c09224f7
fixed KYFC
2020-11-01 16:34:39 +03:00
Nikolay Korolev
370d693f9d
the driver fix
2020-11-01 15:15:23 +03:00
Nikolay Korolev
63a27fbc5f
overflow fix
2020-11-01 13:55:29 +03:00
Sergeanur
db84afd263
Revert
2020-11-01 12:31:37 +02:00
aap
b8b3292161
Merge pull request #791 from majesticCoding/miami
...
CObject::Render
2020-11-01 10:40:30 +01:00
aap
9598a90627
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-11-01 10:29:37 +01:00
aap
7f5806b727
tiny cleanup
2020-11-01 10:29:28 +01:00
Sergeanur
20ea2fde84
Also fix SetModelIndex in CAutomobile and CTrain ctors
2020-11-01 09:46:25 +02:00
majestic
c124e7381c
CObject::Render
2020-11-01 00:25:35 -07:00
Sergeanur
d370c2076d
Fix virtual SetModelIndex call in CBoat ctor
2020-11-01 09:20:37 +02:00
aap
32c1135cd4
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-10-31 22:08:43 +01:00
aap
9203a33646
fix sniper/camera crosshair
2020-10-31 22:07:58 +01:00
aap
3665a82418
Merge pull request #792 from withmorten/master
...
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
# src/core/Frontend.cpp
2020-10-31 19:21:10 +02:00
aap
7d64698322
foobar!
2020-10-31 14:45:26 +01:00
aap
ea5b86774d
couple of fixes and cleanup
2020-10-31 14:33:49 +01:00
Sergeanur
0e1257cf17
Disable loading screen
2020-10-30 20:32:41 +02:00
Sergeanur
b8d2c4e452
Add VB file list
2020-10-30 10:34:13 +02:00
Sergeanur
86b1d9aea5
OpenAL channels now use their own sound buffers
...
# Conflicts:
# src/audio/sampman_oal.cpp
2020-10-28 10:09:59 +02:00
aap
f1c935ac4c
stupid bug; update librw
2020-10-27 16:20:47 +01:00
aap
a4d198005d
boolean for extended pipelines
...
(cherry picked from commit 78ac22ee2c
)
2020-10-27 15:57:26 +01:00
Sergeanur
9a3758bfc1
Fix undefined colorId for pickups
2020-10-26 16:39:43 +02:00
Roman Masanin
c3cbf4353d
Fix build and use enum in ProcessPlayerMood
2020-10-26 14:02:11 +03:00
Roman Masanin
4bcd176944
fix merge
2020-10-26 00:17:21 +03:00
Roman Masanin
44bbcbd14a
merge upstream
2020-10-26 00:16:46 +03:00
Roman Masanin
96ccb1333b
cleanup processVehicleOneShots, processVehicleX done
2020-10-26 00:14:59 +03:00
Roman Masanin
04b841c719
processVehicleOneShots
2020-10-26 00:11:04 +03:00
Nikolay Korolev
3bdc974ff5
small glass fix
2020-10-25 20:53:05 +03:00
aap
adfa2645bf
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-10-25 16:17:43 +01:00
aap
537c0960fe
clean up timebar ifdefs
2020-10-25 16:17:31 +01:00
erorcun
0a36629502
Finalize frontend sounds, player setup screen
2020-10-25 18:01:09 +03:00
Roman Masanin
211ab16ddb
skiding
2020-10-25 16:14:29 +03:00
erorcun
5b8437172a
Fix weapon icon drawing
2020-10-25 15:27:49 +03:00
Sergeanur
6647dd043d
Remove redundant includes
2020-10-25 13:08:28 +02:00
Sergeanur
a520243563
cAudioManager::ProcessFrontEnd done
2020-10-25 12:00:57 +02:00
Sergeanur
93b318cfdf
DMAudio fixes
2020-10-25 09:42:24 +02:00
erorcun
de09a80a35
Messages fix and update librw
2020-10-25 01:21:18 +03:00
Sergeanur
d1394c6994
Fix WindModifiers
2020-10-24 22:28:44 +03:00
Roman Masanin
a12789c632
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
2020-10-24 22:26:56 +03:00
Roman Masanin
63c7df9f09
mark reflections done
2020-10-24 22:26:45 +03:00
Roman Masanin
c4707fe887
fix merging errors
2020-10-24 22:06:45 +03:00
Sergeanur
04845a72bc
Model indices edits
2020-10-24 21:33:15 +03:00
Roman Masanin
a9db60a1d9
jumbo
2020-10-24 20:47:03 +03:00
Roman Masanin
beae41b207
fires
2020-10-24 19:43:11 +03:00
erorcun
29a2d810a7
WaterLevel (Beachtoys)
2020-10-24 19:31:18 +03:00
Roman Masanin
19ffb9c8df
model heli
2020-10-24 19:24:48 +03:00
Adrian Graber
28fb26f792
Join CdStream threads to wait for them to exit
2020-10-24 18:14:41 +03:00
erorcun
07d1637342
Merge pull request #779 from Sergeanur/VC/Pickups
...
Pickups Done
2020-10-24 17:56:21 +03:00
erorcun
088065e0a8
Merge pull request #778 from majesticCoding/miami
...
Fluff done, FireInstantHit fix
2020-10-24 17:56:03 +03:00
erorcun
0913abe616
Merge pull request #780 from Sergeanur/VC/ObjectData
...
ObjectData
2020-10-24 17:55:40 +03:00
Sergeanur
3d14097bf6
Fix playback of vanilla opus
2020-10-24 16:37:39 +03:00
Roman Masanin
39b7075502
merge Upstream
2020-10-24 14:20:08 +03:00
Sergeanur
a0efb89aa0
more ScriptSounds
2020-10-23 18:35:37 +03:00
majestic
6a89fe401a
Fluff done, FireInstantHit fix
2020-10-23 07:51:24 -07:00
Sergeanur
ca497e2cbd
ScriptSounds
2020-10-23 16:56:34 +03:00
Sergeanur
1544683bdc
Missed nil
2020-10-23 13:23:42 +03:00
Sergeanur
d237bb694b
Small CPedModelInfo fixes
2020-10-23 13:11:51 +03:00
Sergeanur
89a7007c6a
ObjectData
2020-10-23 08:41:23 +03:00
Sergeanur
281e45ce01
Timer fix
2020-10-23 08:38:36 +03:00
erorcun
08d78fb6ff
Timer, main
2020-10-23 04:26:52 +03:00
erorcun
1587815fca
satisfy mr.casepath
2020-10-23 04:25:55 +03:00
Sergeanur
1cdc647324
Fix argument type
2020-10-22 22:05:50 +03:00
Sergeanur
ee61f19253
Police Radio + fixes
2020-10-22 12:38:09 +03:00
erorcun
86002b093f
EmergencyPed, PedDebug, message fix
2020-10-21 21:27:13 +03:00
Sergeanur
ff2665942e
CTempColModels stuff
2020-10-21 21:24:18 +03:00
Sergeanur
2709531f09
Rename CObject flag
2020-10-21 21:14:40 +03:00
Sergeanur
e9a89236a2
Pickups Done
2020-10-21 21:00:13 +03:00
erorcun
0265804003
Cross-platform fix and a little style change
2020-10-21 03:55:35 +03:00
majestic
1fef3e106c
Fluff done
2020-10-20 16:03:41 -07:00
majestic
b36759b586
/c/Users/misha/Documents/GitHub/re3/src/render/Fluff.cpp /c/Users/misha/Documents/GitHub/re3/src/render/Fluff.h
2020-10-20 15:49:29 -07:00
erorcun
0750f04019
Messages, fix Font
2020-10-20 22:24:56 +03:00
erorcun
42fbe7572e
Messages, fix Font
2020-10-20 22:19:05 +03:00
Roman Masanin
0594ed5b46
peds
2020-10-18 23:03:03 +03:00
Nikolay Korolev
a1112183de
fix
2020-10-18 22:53:25 +03:00
Nikolay Korolev
6173e1dd10
fix
2020-10-18 22:52:49 +03:00
Nikolay Korolev
e2c29a3b28
fix
2020-10-18 22:15:44 +03:00
Nikolay Korolev
fb80236214
fixed ped attractor crash
2020-10-18 21:17:37 +03:00
erorcun
1858904ce0
Merge pull request #769 from Sergeanur/VC/Pickups
...
Partial Pickups
2020-10-18 20:01:32 +03:00
erorcun
10758088ef
Merge pull request #766 from Fire-Head/miami
...
Glass
2020-10-18 19:59:11 +03:00
erorcun
70f9832e14
Merge branch 'miami' into miami
2020-10-18 19:45:11 +03:00
erorcun
497c179245
Merge pull request #772 from Nick007J/miami
...
Original save/load support + bugfixes
2020-10-18 19:37:49 +03:00
erorcun
20ab7d1739
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-10-18 19:31:39 +03:00
erorcun
937290db09
Fix attractor even more
2020-10-18 19:31:02 +03:00
Sergeanur
8697eebbc2
Merge branch 'miami' into VC/Pickups
...
# Conflicts:
# src/control/Pickups.cpp
2020-10-18 17:17:11 +03:00
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
Sergeanur
cc0ae51631
lil fix
2020-10-18 16:55:11 +03:00
Sergeanur
b91f6a4550
Setter for bIsStatic (became virtual in SA)
2020-10-18 16:40:06 +03:00
erorcun
1b59b2c9bc
Attractor obj. fixes
2020-10-18 16:38:36 +03:00
Filip Gawin
23220d799c
Cleanup breaks CAutomobile::ProcessOpenDoor
2020-10-18 15:26:20 +02: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
Nikolay Korolev
8d92a0681a
fix in ped attractor
2020-10-18 15:39:27 +03:00
eray orçunus
ab071163e5
Fix ped buoyancy
2020-10-18 14:34:20 +03:00
eray orçunus
f60e3d667a
Minor things
2020-10-18 13:53:17 +03:00
shfil
cafe4e38db
Script.cpp missing breaks
2020-10-18 13:37:17 +03:00
Nikolay Korolev
c856d88691
object field renamed
2020-10-18 12:34:34 +03:00
Sergeanur
b3385015e5
Merge remote-tracking branch 'origin/miami' into VC/Pickups
2020-10-18 04:54:01 +03:00
shfil
82f54b946f
Script.cpp missing breaks
2020-10-18 00:56:07 +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
Roman Masanin
1e3aabf654
fix bugs
2020-10-17 21:30:48 +03:00