a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-09 01:34:55 +00:00
Code Issues Projects Releases Wiki Activity
2213 commits 4 branches 2 tags 50 MiB
Commit graph

61 commits

Author SHA1 Message Date
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 7d30878418 Fix OAL crash 2020-05-24 01:06:19 +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 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
Sergeanur 85c44715ea remove aps from premake 2020-05-11 15:08:19 +03:00
blattersturm 2c147608e4 fix premake failing if not passing any action (such as with --help) 2020-05-11 10:15:59 +02:00
aap edd9301d7f reverting fuckup 2020-05-06 09:59:04 +02:00
aap 8e84728f41 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-06 09:24:18 +02:00
aap bb0541404d updated librw 2020-05-06 09:24:12 +02:00
aap 68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Sergeanur a02b4c9592 Merge branch 'master' into miami 2020-05-05 20:54:54 +03:00
Sergeanur 3adf740bd5 Remove audio from premake 2020-05-05 20:51:23 +03:00
Sergeanur 4bd4d24802 Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
 2020-05-05 20:42:11 +03:00
Sergeanur 52907088f9 Fix build status and don't add random files into the project 2020-05-05 20:40:27 +03:00
aap e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
aap 0bdb558804 improvements (?) to premakefile 2020-04-29 11:44:26 +02:00
Sergeanur d5256f74e5 premake stuff 2020-04-28 23:50:59 +03:00
eray orçunus 6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
aap 5bb4e99926 implemented debugmenu 2020-04-24 14:08:06 +02:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Sergeanur 444d6462c5 premake cleanup 2020-04-18 14:20:49 +03:00
ThirteenAG a6825e1ae6 librw compilation in prebuild event of reIII 2020-04-18 11:59:46 +03:00
Sergeanur 5922a9b88d premake fixes 2020-04-17 19:46:17 +03:00
Sergeanur 6822cc5de8 Use LIBRW env var it it's set 2020-04-17 19:22:29 +03:00
Sergeanur 4ff01484c8 Update links 2020-04-17 18:22:33 +03:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
aap 90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Filip Gawin 25841cb9b3
Update premake5.lua 2020-04-15 00:57:45 +02:00
Sergeanur daceee593b Link with RW libs 2020-04-11 23:37:04 +03:00
Sergeanur fa4dbcab35 save 2020-01-27 18:22:51 +02:00
Sergeanur bc0ddc6b18 CText encoding fixes 2019-10-20 20:31:59 +03:00
Fire-Head 6ba2b05443 sampman done 2019-08-02 23:20:12 +03:00
aap 2d986b79d2
Merge pull request #153 from ThirteenAG/master 
premake and appveyor update
 2019-07-20 15:31:09 +02:00
ThirteenAG 9c16c1fa63 small cleanup 2019-07-20 16:30:03 +03:00
ThirteenAG a8dfcc25c7 premake and appveyor update 2019-07-20 16:13:16 +03:00
Filip Gawin a04d8f24be ComputeDopplerEffectedFrequency 2019-07-19 16:22:46 +02:00
aap 53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00
_AG f299e9ebd5 Update HUD stuff, bug and format fixes. 
Added environment variables to premake5.lua.
Update README.md
 2019-06-17 02:11:30 +02:00