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 |
|