mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-27 19:43:42 +00:00
Code Issues Projects Releases Wiki Activity
3157 commits 3 branches 0 tags 63 MiB
Commit graph

1117 commits

Author SHA1 Message Date
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
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
b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
eray orçunus
f60e3d667a Minor things 2020-10-18 13:53:17 +03:00
Nikolay Korolev
c856d88691 object field renamed 2020-10-18 12:34:34 +03:00
Nikolay Korolev
720abca826 finished save/load 2020-10-17 20:45:07 +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
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +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
Sergeanur
6450fd2692 Fix zone saving on 64 bit 2020-10-12 22:54:46 +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
417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +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
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
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
dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +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
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
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
da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
eray orçunus
c5a61b3d3b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 14:26:42 +03:00
shfil
c31e3e6823
Merge pull request #741 from ShFil119/fix/make_space 
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
 2020-10-04 22:02:28 +02:00
eray orçunus
8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
erorcun
fae97f29c4
Merge branch 'master' into master 2020-10-04 22:12:57 +03:00
Filip Gawin
0ac2be0093 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-04 13:18:24 +02:00
Roman Masanin
063a80ecfb now BETTER_ALLCARSDODO_CHEAT tweak original cheat to be useful. 2020-10-03 02:26:49 +03:00
Roman Masanin
55d94c99b8 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-03 01:52:37 +03:00