a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 06:25:54 +00:00
Code Issues Projects Releases Wiki Activity
4153 commits 4 branches 2 tags 50 MiB
Commit graph

3506 commits

Author SHA1 Message Date
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
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 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 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 c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
withmorten 4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01: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 81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Nikolay Korolev 625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Nikolay Korolev cf11b32849 of course 2021-01-11 02:43:57 +03:00
Nikolay Korolev 53a99cb9ee script2 2021-01-11 02:35:03 +03:00
erorcun b5711b21dc Automobile: fix 2021-01-11 01:10:24 +03:00
Sergeanur 585300cd33 More font fix 2021-01-10 22:37:11 +02:00
Nikolay Korolev 642970df95 Merge branch 'lcs-dev' into lcs 2021-01-10 22:58:43 +03:00
Nikolay Korolev 75d1715442 script file 1 done (hopefully) 2021-01-10 22:58:06 +03:00
Fire-Head adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
aap ca64363899 debugmenu vehicle spawn list 2021-01-10 19:58:58 +01:00
aap 93ea98520b mobile building rendering 2021-01-10 19:45:58 +01:00
aap ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
shfil c3b6e9da43
Fix linux build 2021-01-10 17:14:33 +01:00
aap c631e6c61c env map tweaks 2021-01-10 14:32:37 +01:00
aap 453405f131 dont render untextured world 2021-01-10 13:05:34 +01:00
aap 0ee87d7b46 env map rendering 2021-01-10 11:59:57 +01:00
Nikolay b0e395e853
Merge pull request #942 from majesticCoding/lcs 
just original marker's colors
 2021-01-10 13:44:40 +03:00
Seemann ad7855f995 Update command definitions 2021-01-10 12:27:51 +03:00
Seemann c2265e29d2 Update command definitions 2021-01-09 23:59:47 -05:00
Nikolay Korolev 1b3047c812 Merge branch 'lcs-dev' into lcs 2021-01-09 22:24:52 +03:00
Nikolay Korolev f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
aap d3aa8a118c fix rendering; update librw 2021-01-09 19:45:19 +01:00
majestic 2639fba582 just original marker color 2021-01-09 10:26:07 -08:00
aap 03c5fdef43 moved new renderer; implemented leeds building rendering 2021-01-09 19:20:32 +01:00
Nikolay Korolev 203dff9165 script 2021-01-09 20:33:21 +03:00
aap e906a807f1 moved new renderer 2021-01-09 18:22:09 +01:00
aap 434bc01f0b fix fix 2021-01-09 16:17:47 +01:00
aap f6f0cb708e boat fix 2021-01-09 16:13:38 +01:00
Sergeanur 322d93ab0c Fix font 2021-01-09 16:55:45 +02:00
Nikolay Korolev 1f79fb608a fix 2021-01-09 17:47:55 +03:00
Nikolay Korolev c1e68b2c61 fix 2021-01-09 17:43:21 +03:00
Nikolay Korolev a38d0a0fbd Merge branch 'lcs-dev' into lcs 2021-01-09 17:35:57 +03:00
Nikolay Korolev b32301592f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-09 17:35:52 +03:00
Nikolay Korolev 97c95b7639 more script 2021-01-09 17:35:27 +03:00
Sergeanur 852c3badbb Change window name 2021-01-09 14:21:46 +02:00
Sergeanur e5b7628802 Remove fake firetruck ID 2021-01-09 13:43:09 +02:00
Sergeanur da10ce7b05 More linux fix 2021-01-09 13:33:45 +02:00
Sergeanur b484638bb9 Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  cam sector fix
  streaming fixes
 2021-01-09 13:24:26 +02:00
Sergeanur 9a145ab15f Possibly fix linux build 2021-01-09 13:24:09 +02:00
aap e473d234fd cam sector fix 2021-01-09 12:11:34 +01:00
aap 7f5deb0f97 cam sector fix 2021-01-09 12:10:10 +01:00
aap 225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Fire-Head 6b78bab99a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 03:38:39 +03:00
Fire-Head 8e7cce0634 useless fix 2021-01-09 03:37:59 +03:00
Nikolay b7f9bfda4a
fail 2021-01-09 02:41:27 +03:00
Sergeanur 2ce925caba Sector sizes 2021-01-09 01:22:50 +02:00
aap 4a7b3d6d7b fix world bounds check for cars 2021-01-09 00:13:29 +01:00
aap 219af60102 timecycle back to normal 2021-01-08 23:53:14 +01:00
aap 14a5144de7 Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs 2021-01-08 23:43:56 +01:00
aap 49d5c02d69 anims done. ped fight hacked to compile 2021-01-08 23:43:52 +01:00
Fire-Head 91c6389754 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 01:02:17 +03:00
Fire-Head 7a3ee349da sync with re3 
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
 2021-01-09 01:01:41 +03:00
Sergeanur a871da4fbe Add Relocatable Chunk stubs 2021-01-08 23:42:42 +02:00
Nikolay Korolev 3ac74c86a1 fix 2021-01-09 00:33:16 +03:00
Nikolay Korolev 2bf88fcef5 Merge branch 'lcs' into lcs-dev 2021-01-09 00:30:13 +03:00
Sergeanur b6875b41f4 Level 4 2021-01-08 23:20:52 +02:00
Nikolay Korolev a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Sergeanur de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02:00
Sergeanur af09cb06f5 Merge branch 'miami' into lcs 
* miami:
  Use original names
 2021-01-08 21:53:42 +02:00
Sergeanur faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur 079b8e0e16 CKeyGen 2021-01-08 20:51:31 +02:00
Sergeanur 4debd89d8e Merge branch 'miami' into lcs 
# Conflicts:
#	src/render/Timecycle.cpp
 2021-01-08 20:24:43 +02:00
Sergeanur 68e8c1ce04 Add multisampling 2021-01-08 20:22:08 +02:00
Sergeanur bf3135eb41 Enable trains 2021-01-08 18:31:50 +02:00
Sergeanur e9001207ea Disable water creatures 2021-01-08 18:26:35 +02:00
Sergeanur 95260371cb Train anims in enum 2021-01-08 18:25:35 +02:00
Sergeanur c6c55d0130 Train anims in enum 2021-01-08 18:24:53 +02:00
Nikolay Korolev 613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03:00
Nikolay Korolev e92666d988 wtf 2021-01-08 18:57:59 +03:00
Sergeanur 5fb3edf258 Allocator fix 2021-01-08 17:21:07 +02:00
Sergeanur ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
Sergeanur ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
Sergeanur d68ffc2da6 Original GXT support 2021-01-08 15:34:21 +02:00
aap 8be0567924 little fixes 2021-01-08 13:51:42 +01:00
aap a99457ee29 fix phones 2021-01-08 13:51:31 +01:00
Sergeanur 0e2af13656 Merge branch 'miami' into lcs 
* miami:
  wtf
  fix
  small cleanup
  Fix gOneShotCol
  Fix garage messages position
  Fix font on green screen counter
  Add MPG123_QUIET to mp3 files
  Make opus available alongside other formats
  Fix pickup text
  Fix char in stats
  Add missing GXT line
  fail
  minor refactoring
  Fix 16KHz track
  GET_WHEELIE_STATS fix
  Cleanup and fixes for new decoders
  Fixes for CVbFile
  Small fixes for new wav decoder
  Remove fastmath from premake's config
  Implementing our own WAV decoder to replace SndFile
 2021-01-08 14:47:37 +02:00