Commit Graph

2664 Commits

Author SHA1 Message Date
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
Nikolay Korolev
720abca826 finished save/load 2020-10-17 20:45:07 +03:00
Roman Masanin
3cbccd2ad3 typo fixes 2020-10-17 19:05:41 +03:00
Nikolay Korolev
cae3990eac Merge remote-tracking branch 'upstream/miami' into miami 2020-10-17 18:50:41 +03:00
Nikolay Korolev
1195f3db7b saves part 1 2020-10-17 18:50:16 +03:00
erorcun
4e4e0e8e04
Merge pull request #765 from erorcun/miami
Radar, WaterCannon, win/glfw skels
2020-10-17 18:39:56 +03:00
Sergeanur
588fb26728 Fix player model not changing in cutscenes 2020-10-17 18:26:48 +03:00
eray orçunus
b84dc2bc9b Fix management issue 2020-10-17 18:10:37 +03:00
eray orçunus
dc80884ab5 Fix management issue 2020-10-17 18:07:20 +03:00
Sergeanur
e465cea07b Pickup arrays done 2020-10-17 18:05:23 +03:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03:00
Sergeanur
7fc70179ed Pickup save/load 2020-10-17 17:06:38 +03:00
Roman Masanin
eeee5012b7 model cars and other audio stuff 2020-10-17 16:57:36 +03:00
Sergeanur
7f3b51dd17 Small inner fix 2020-10-17 16:04:11 +03:00
Sergeanur
63666391d4 More Pickup stuff 2020-10-17 15:57:12 +03:00
Sergeanur
516a02d2da Fix pickup fix :P 2020-10-17 15:33:22 +03:00
Sergeanur
ca64a49af1 fix build 2020-10-17 14:23:31 +03:00
Nikolay Korolev
0cf2c8505e cranes done 2020-10-17 14:18:20 +03:00
Sergeanur
1f36b78c20 Pickup fixes 2020-10-17 13:48:08 +03:00
Nikolay Korolev
40434eadfd small fix 2020-10-17 12:31:14 +03:00
Sergeanur
ef47dad566 Partial Pickups 2020-10-17 08:23:01 +03:00
Roman Masanin
97fc5224e7 road noise 2020-10-17 02:22:02 +03:00
Roman Masanin
894a1ae93a siren and horn 2020-10-17 00:27:28 +03:00
Roman Masanin
63c2b98c5e fix build 2020-10-15 16:04:03 +03:00
Roman Masanin
07143ee73b SpecialFX fixes 2020-10-15 15:52:37 +03:00
Roman Masanin
34b4efe242 fix bullet traces rener and some renaming 2020-10-15 15:42:10 +03:00
Fire-Head
e4ac934dbf Miami Glass 2020-10-15 00:33:57 +03:00
Sergeanur
a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
erorcun
971b7cba65
Merge pull request #761 from erorcun/SampleMan
SampleManager
2020-10-13 13:18:49 +03:00
shfil
3b40e003ab
Fix typo in fire.cpp 2020-10-12 22:51:49 +02:00
Fire-Head
1e068aea73 fix AskForObjectToBeRenderedInGlass 2020-10-12 23:10:08 +03:00
Sergeanur
6450fd2692 Fix zone saving on 64 bit 2020-10-12 22:54:46 +03:00
erorcun
1e11c1eac6
Merge pull request #762 from Nick007J/miami
Control update
2020-10-12 21:52:59 +03:00
Roman Masanin
a4fd1a9f39 sirenes and more marks for audio. also fix cAudioMrg size 2020-10-12 20:55:19 +03: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
3772be32bf Streaming and cross-platform fixes 2020-10-12 20:41:13 +03:00
eray orçunus
be6b97b5d8 Streaming and cross-platform fixes 2020-10-12 20:30:49 +03:00
eray orçunus
d18a55f429 SampleManager 2020-10-12 20:22:39 +03:00
Roman Masanin
e34261d3ef mark some audio stuff and fix frameCounter 2020-10-12 18:09:58 +03:00
Roman Masanin
417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +03:00
Roman Masanin
56bb7d721a mark file and fix screen offset 2020-10-12 13:41:57 +03:00
Roman Masanin
e6a1ea9d4f CBrightLight::render 2020-10-12 13:28:06 +03:00
erorcun
96f36d16ae
Merge pull request #753 from majesticCoding/miami
CWaterCreatures
2020-10-12 12:37:47 +03:00
eray orçunus
40020f4e1e Fix forgotten wanted/busted text 2020-10-12 12:36:15 +03:00
eray orçunus
b1e235535c Cutscene aspect ratio fix 2020-10-12 12:16:24 +03:00
Nikolay Korolev
49c48f2ec2 sync with upstream 2020-10-12 12:11:53 +03:00
erorcun
9e0b23f065
Merge pull request #758 from erorcun/miami
Hud, Fire, OnscreenBlaBla
2020-10-12 11:13:46 +03:00
eray orçunus
8a622a0e72 Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
Sergeanur
239e09ad07
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad
Zones saving and loading
2020-10-12 04:16:30 +03:00
Roman Masanin
ca1d899413 final step 2020-10-11 22:29:49 +03:00
Roman Masanin
7a3e1ef19a SpecialFX almost done 2020-10-11 21:40:11 +03:00
Nikolay Korolev
28b47b601f fix 2020-10-11 18:14:35 +03:00
Nikolay Korolev
91a274da2b small fix 2020-10-11 13:11:25 +03:00
Nikolay Korolev
68779a4dac small fix 2020-10-11 13:05:41 +03:00
Nikolay Korolev
49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev
552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev
c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
Sergeanur
b0becb5a2d UnicodeMakeUpperCase move + arg fix 2020-10-11 10:39:04 +03:00
Sergeanur
9dba2386bb Merge branch 'master' into VC/TextFinish
# Conflicts:
#	src/text/Text.cpp
2020-10-11 10:34:47 +03:00
Sergeanur
43af5d9c1f Merge branch 'miami' into VC/TextFinish 2020-10-11 10:33:56 +03:00
Sergeanur
e26e85deb8 Some unicode funcs belong to Font.cpp + small fix 2020-10-11 10:33:02 +03:00
majestic
e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
Sergeanur
f1bb09826d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt
2020-10-11 01:18:08 +03:00
Sergeanur
6fe6d0cb9a Finish Text stuff 2020-10-11 00:56:16 +03:00
Sergeanur
dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +03:00
Nikolay
63611408b1
bug fix 2020-10-10 18:19:49 +03:00
Roman Masanin
881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
eray orçunus
a01b14f301 Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
majestic
c091a5c11a CWaterCreatures 2020-10-08 19:28:31 -07:00
eray orçunus
22c9e8b581 Fix POSIX streaming 2020-10-09 02:22:02 +03:00
eray orçunus
ed82c55475 Fix POSIX streaming 2020-10-09 02:19:49 +03:00
eray orçunus
570ccb7db1 Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-08 22:45:37 +03:00
eray orçunus
73a3e9d5bb Fixes, some thanks to ASan 2020-10-08 22:41:51 +03:00
erorcun
b97f86deea
Merge pull request #750 from erorcun/miami
Pad, BulletInfo, ProjectileInfo, fixes
2020-10-08 21:39:11 +03:00
Roman Masanin
e52c5ca1bb fix for wheelie cras 2020-10-08 20:34:59 +03:00
majestic
9a10501698 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-08 09:31:57 -07:00
Filip Gawin
6bae5a6031 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-08 18:45:07 +03:00
eray orçunus
fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
Andrew Udvare
1a3e254b6c CdStreamPosix: fix type issues 2020-10-08 17:53:32 +03:00
Andrew Udvare
2bb29a50b7 core/CdStreamPosix: switch to named semaphores to support macOS
macOS does not support unnamed semaphores. The functions return ENOSYS.
2020-10-08 17:52:12 +03:00
Andrew Udvare
d590fdddf6 macOS support; thanks to @MrYadro
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
2020-10-08 17:51:43 +03:00
erorcun
3435d6656c
Merge pull request #748 from theR4K/miamiUpstream
CExplosion and some audio
2020-10-08 16:15:18 +03:00
majestic
7861992fe6 CWaterCreatures 2020-10-08 05:59:08 -07:00
erorcun
fa373c7fdb
Merge branch 'miami' into miami 2020-10-08 01:29:35 +03:00
eray orçunus
0409907438 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-08 01:26:34 +03:00