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

5498 commits

This branch
This branch
All branches
Author SHA1 Message Date
Filip Gawin
13d5c5e7e6 A bit more of cleanup of CI 2021-01-12 21:57:58 +01:00
Filip Gawin
8929e55bff Shorten job name 2021-01-12 21:47:19 +01:00
Filip Gawin
11ecab3ca1 Disable opus for now (as default option) 2021-01-12 21:47:19 +01:00
Sergeanur
f73e870bde Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
 2021-01-12 22:29:50 +02:00
aap
0afa027ab4 bug of the decade 2021-01-12 21:28:13 +01:00
Nikolay Korolev
e6aa9f9d4e big oof 2021-01-12 20:56:49 +03:00
aap
48ce6151f9 fix building with PED_SKIN 2021-01-12 18:55:21 +01:00
Nikolay Korolev
6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
Nikolay Korolev
1c3f3c1842 script4 2021-01-12 20:52:31 +03:00
aap
55320a03f1 little cleanup of vehicle rendering 2021-01-12 14:07:24 +01:00
aap
9b2037419f mobile vehicle rendering 2021-01-12 13:41:29 +01:00
aap
99a6976f53 colmodel fix 2021-01-12 12:42:29 +01:00
Sergeanur
8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr 
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
 2021-01-12 13:22:44 +02:00
Sergeanur
cb4b4d584c Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
 2021-01-12 12:55:07 +02:00
withmorten
75367e714a premake: add startrpoject; add lto option; fix copying of binary to gamedir; update premake5.exe 
# Conflicts:
#	premake5.lua
 2021-01-12 12:43:42 +02:00
aap
fe1d82c9c3
Merge pull request #945 from withmorten/master 
premake: add startrpoject; add lto option; fix copying of binary to gamedir; update premake5.exe
 2021-01-12 10:29:19 +01:00
Nikolay Korolev
167a841010 Merge branch 'lcs-dev' into lcs 2021-01-12 12:17:22 +03:00
Nikolay Korolev
2736c3a9d1 fix 2021-01-12 12:16:52 +03:00
Sergeanur
7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
Sergeanur
dcb4eedeb0 Fix collective commands 2021-01-12 02:28:08 +02:00
Sergeanur
be1e09aad4 Fix collective commands 2021-01-12 02:26:37 +02:00
Sergeanur
3e6eea25b3 More fix 2021-01-12 02:15:44 +02:00
Sergeanur
2ce6e59d9b PLAY_ANNOUNCEMENT 2021-01-11 23:55:45 +02:00
Sergeanur
132a710a0a Case sensitive my ass 2021-01-11 23:50:56 +02:00
aap
afcb794d59
Merge pull request #947 from withmorten/miami 
fix CPed struct, GetWantedLevel
 2021-01-11 22:46:06 +01:00
aap
6ef3b8c458
Merge pull request #949 from majesticCoding/lcs 
unused CFerryDoor
 2021-01-11 22:45:10 +01:00
Nikolay Korolev
daf5cfe425 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-12 00:43:45 +03:00
Nikolay Korolev
42e4e7c063 fix 2021-01-12 00:43:26 +03:00
Nikolay Korolev
7496a463d4 Merge branch 'lcs-dev' into lcs 2021-01-12 00:42:44 +03:00
Nikolay Korolev
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
majestic
0f0812618a unused CFerryDoor 2021-01-11 12:47:09 -08:00
aap
383142bcbe some useless code 2021-01-11 20:20:08 +01:00
Fire-Head
06fbbaa43f fix explosion jet 2021-01-11 21:12:11 +03:00
Fire-Head
f728c58383 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-11 21:10:28 +03:00
Fire-Head
e2095bf70b fix explosion jet 2021-01-11 21:10:24 +03:00
Sergeanur
a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
Nikolay Korolev
31dd135075 fuck 2021-01-11 20:53:03 +03:00
Nikolay Korolev
c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
withmorten
4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
majestic
0345861b5f Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-11 08:10:11 -08:00
Nikolay Korolev
4422a3df23 Merge branch 'lcs-dev' into lcs 2021-01-11 17:26:17 +03:00
Nikolay Korolev
a214d0ed4c fix 2021-01-11 17:25:51 +03:00
Nikolay Korolev
08e5c8e010 fixes 2021-01-11 17:22:07 +03:00
Nikolay Korolev
81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Nikolay Korolev
625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Anonymous Maarten
3519cbd3e5 conan: build re3 + librw with RelWithDebInfo build_type 2021-01-11 11:24:25 +01:00
Anonymous Maarten
6b8374f391 cmake: install files ready for copying in game folder 2021-01-11 11:24:25 +01:00
Anonymous Maarten
96e2ba19f8 cmake: add resource (settings windows icon) 2021-01-11 11:24:25 +01:00
Anonymous Maarten
a78e4a3366 conan: allow repeated executions of conan build 2021-01-11 11:24:25 +01:00
Anonymous Maarten
b375e20c75 cmake: opus is now optional + libsndfile only when using openal 2021-01-11 11:24:25 +01:00