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

95 commits

Author SHA1 Message Date
Sergeanur
9bb8ebaa10 Make collision code placement more like original (+ small fixes) 
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
 2020-11-16 00:36:54 +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
Filip Gawin
a25005a84c Add option to enable asan 
# Conflicts:
#	premake5.lua
 2020-10-28 10:10:44 +02:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03: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
Andrew Udvare
ef9455c324 premake5: Place macosx-amd64 after arm64 
Fixes xcode4 project from Premake getting the wrong target (for now).
 2020-10-08 17:53:14 +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
Andrew Udvare
34579ae9c3
premake5: Place macosx-amd64 after arm64 
Fixes xcode4 project from Premake getting the wrong target (for now).
 2020-10-01 20:44:33 -04:00
Andrew Udvare
01ea7801fd
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-09-30 15:40:28 -04:00
Filip Gawin
35656fe0e8 Add target arm64 
# Conflicts:
#	premake5.lua
 2020-09-30 02:16:50 +03:00
Filip Gawin
6cfac662a1 Add target arm64 2020-09-27 00:32:14 +02:00
Sergeanur
0ae41be16b Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	librw
 2020-08-14 14:35:54 +03:00
Sergeanur
e1ca6c6b79 Move stuff to vendor 2020-08-14 14:22:50 +03:00
Sergeanur
1c1fa25e6c Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/render/Coronas.cpp
#	src/render/Timecycle.cpp
#	src/render/Timecycle.h
 2020-08-10 19:15:51 +03:00
Blingu
c50160a992 fixed line formatting 2020-08-08 13:07:55 +02:00
blingu
2af22cfabc
Update premake5.lua 2020-08-08 12:49:38 +02:00
blingu
47b7d4a53a
Update premake5.lua 2020-08-05 14:40:56 +02:00
blingu
99d8e12207
added partial bsd support (FreeBSD) 2020-08-05 14:28:12 +02:00
Sergeanur
3e24ae8812 Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp
 2020-08-02 19:49:12 +03:00
Sergeanur
a786dd45a4 Move sdk and eax 2020-08-02 19:36:50 +03:00
eray orçunus
0009558fcb Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-07-29 19:32:37 +03:00
eray orçunus
2c6f2f24e7 Fix Win32 OAL build 2020-07-29 19:32:06 +03:00
eray orçunus
4a55f19761 Fix Win32 OAL build 2020-07-29 19:24:17 +03:00
Sergeanur
e823e01860 more fix 2020-07-29 16:10:59 +03:00
Sergeanur
550b813d92 premake fix 2020-07-29 16:08:01 +03:00
Sergeanur
57d5782588
Merge pull request #587 from Sergeanur/opus 
OPUS support for OpenAL
 2020-07-29 15:52:17 +03:00
eray orçunus
732b760829 64-bit on Windows 2020-07-24 20:26:33 +03:00
eray orçunus
1dc6fbda1f 64-bit on Windows 2020-07-22 18:51:28 +03:00
Sergeanur
87eb96453a Add compatibility with RW 3.4 2020-07-18 13:30:51 +03:00
Sergeanur
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
 2020-05-26 17:24:47 +03:00
Sergeanur
0c4ce002f1 Merge branch 'master' into opus 2020-05-24 01:07:03 +03:00
Sergeanur
7d30878418 Fix OAL crash 2020-05-24 01:06:19 +03:00
Sergeanur
3a7651e7ab Cleanup 2020-05-24 00:56:20 +03:00
Sergeanur
bd67db523a Merge branch 'master' into opus 
# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp
 2020-05-24 00:45:45 +03:00
Sergeanur
88b6168f1c Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
 2020-05-23 21:14:16 +03:00
eray orçunus
c993e99e00 Fix linux build 2020-05-22 22:49:54 +03:00
Sergeanur
efe52dbbbc I am an idiot 2020-05-22 21:14:38 +03:00
Sergeanur
e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
Sergeanur
97b058d0fa more checks in premake 2020-05-22 17:43:26 +03:00
Sergeanur
0af4d57408 opus support 2020-05-22 17:40:19 +03:00
Sergeanur
1a42d62d3a Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/peds/Ped.cpp
#	src/peds/PedIK.cpp
#	src/peds/PedIK.h
 2020-05-16 17:09:13 +03:00
aap
c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
Sergeanur
33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
 2020-05-13 00:27:15 +03:00
Sergeanur
d5676be83e Fix premake copy 2020-05-12 04:41:17 +03:00
Sergeanur
12b1eedcbf Include oal files 2020-05-12 04:36:10 +03:00
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master 
Linux build support
 2020-05-12 00:33:13 +03:00
eray orçunus
c4a154557b Fix appveyor (hopefully) 2020-05-12 00:10:50 +03:00
Sergeanur
0aa7f13c32 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimBlendAssociation.h
#	src/animation/AnimBlendClumpData.h
#	src/animation/AnimManager.h
#	src/animation/FrameUpdate.cpp
#	src/control/AutoPilot.h
#	src/control/PathFind.h
#	src/core/PlayerInfo.h
#	src/entities/Building.h
#	src/entities/Dummy.h
#	src/entities/Entity.h
#	src/entities/Physical.h
#	src/entities/Treadable.h
#	src/modelinfo/BaseModelInfo.h
#	src/modelinfo/ClumpModelInfo.cpp
#	src/modelinfo/ClumpModelInfo.h
#	src/modelinfo/PedModelInfo.h
#	src/modelinfo/SimpleModelInfo.h
#	src/modelinfo/TimeModelInfo.h
#	src/modelinfo/VehicleModelInfo.h
#	src/objects/CutsceneHead.h
#	src/objects/CutsceneObject.h
#	src/objects/DummyObject.h
#	src/objects/Object.h
#	src/peds/DummyPed.h
#	src/peds/PedIK.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Boat.h
#	src/vehicles/Heli.h
#	src/vehicles/Plane.h
#	src/vehicles/Train.h
#	src/vehicles/Vehicle.h
 2020-05-11 21:07:12 +03:00
eray orçunus
36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00