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

654 commits

Author SHA1 Message Date
Fire-Head 9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD" 
This reverts commit 552205dfba.
 2020-06-07 05:03:06 +03:00
Sergeanur 552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Nikolay Korolev 3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
Nikolay Korolev 0803c821ae fixed roadblocks 2020-06-01 12:45:03 +03:00
Nikolay Korolev e6b9c20131
fix 2020-05-30 18:07:01 +03:00
eray orçunus e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
eray orçunus 98fec63ca7 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-28 11:40:56 +03:00
eray orçunus 329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
aap 9bcec54291
Merge pull request #599 from Nick007J/master 
Mission replay
 2020-05-28 10:25:14 +02:00
Nikolay Korolev d9d57f12fc
crash fix 2020-05-28 01:00:49 +03:00
Nikolay Korolev ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
Nikolay Korolev 5ca0d6c6cf fixed NE bug 2020-05-26 00:45:32 +03:00
Nikolay Korolev 38d2854226 fixed FIX_BUGS 2020-05-26 00:18:04 +03:00
Nikolay Korolev e95de89c9a script fix 2020-05-24 12:01:07 +03:00
Nikolay Korolev e18eb0ce01
script fix 2020-05-23 00:50:15 +03:00
Nikolay Korolev 73ff01e35b
script fix 2020-05-21 00:18:13 +03:00
Nikolay Korolev b7c1784dd2
script fix 2020-05-20 23:25:01 +03:00
Nikolay Korolev 1b96e6c378
fixed script bug 2020-05-19 23:49:28 +03:00
Nikolay Korolev c47292b518
script fix 2020-05-19 00:10:45 +03:00
Nikolay Korolev 746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
aap 72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
aap c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Nikolay Korolev b01987719e
fixed script error 2020-05-14 15:26:59 +03:00
Nikolay Korolev 1237941180 fixed traffic lights 2020-05-13 17:33:50 +03:00
Nikolay Korolev 509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
Nikolay Korolev 615bd1e878 garages fix 2020-05-12 20:22:35 +03:00
Nikolay Korolev 1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
bigbossbro08 bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08 c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
aap 5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur d9a3533438 Small unification 2020-05-10 01:14:00 +03:00
Nikolay Korolev 9fce6c4ed3 car control fixes 2020-05-09 22:24:31 +03:00
aap 5c30b3a188 got rid of superfluous enum; update librw 2020-05-07 12:48:57 +02:00
aap 876e402d1e dont hardcode first vehicle ID; little fix for roadblocks 2020-05-07 09:38:07 +02:00
aap cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +02:00
Sergeanur 1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur 7200a783ee Remove #endif 2020-05-05 18:07:08 +03:00
Sergeanur 9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
Sergeanur dfe0642195
Merge pull request #512 from Nick007J/master 
MIAMI CAutoPilot + CCarAI + multiple fixes
 2020-05-05 17:14:13 +03:00
Sergeanur fcd386f55d
Merge pull request #510 from aap/master 
implemented most of streamed collisions and big buildings
 2020-05-05 17:14:01 +03:00
Nikolay Korolev fc81a8cbe2
fixed traffic lights 2020-05-05 16:10:22 +03:00
aap b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur 4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Nikolay Korolev ee261c996b Merge remote-tracking branch 'upstream/master' 2020-05-05 14:40:56 +03:00
Nikolay Korolev ae0c83fa01 CAutoPilot + CCarAI + fixes 2020-05-05 14:40:35 +03:00
aap b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur 84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Nikolay Korolev 131e8af174
Merge pull request #508 from Nick007J/master 
Scripts compatible saving + CCarCtrl bug + crusher coach bug
 2020-05-04 19:52:26 +03:00
Nikolay Korolev d1a46c35ce fixed spawn bug 2020-05-04 14:57:49 +03:00
aap 67467f15d1 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
aap 702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Nikolay Korolev 926e216dd4 Merge remote-tracking branch 'upstream/master' 2020-05-03 01:43:12 +03:00
Nikolay Korolev fa29804c49 script compatibility 2020-05-03 01:42:46 +03:00
Sergeanur 7fc33d85f7
Merge pull request #504 from Sergeanur/PadInputSwitch 
Switching pad modes and cheats when player is switching between controller and kb&m
 2020-05-03 00:12:54 +03:00
Sergeanur d2712afc78 Add CURMODE macro 2020-05-03 00:11:02 +03:00
Sergeanur fc85bb710b Fix COMMAND_GET_CONTROLLER_MODE 2020-05-02 19:39:36 +03:00
Sergeanur ba8aa38654 Switching pad modes and cheats when player is switching between controller and kb&m 2020-05-02 19:39:36 +03:00
Nikolay Korolev 7d067684ff Merge remote-tracking branch 'upstream/master' 2020-05-02 18:02:45 +03:00
Nikolay Korolev f372ce156d changed saving compatibility 2020-05-02 18:02:17 +03:00
Sergeanur 52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap 4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages 
Japanese support
 2020-04-29 10:26:36 +02:00
Sergeanur fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
Sergeanur 7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03:00
Sergeanur f0890b1112 Merge branch 'master' into MoreLanguages 
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
 2020-04-26 22:03:15 +03:00
Nikolay Korolev 34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev bed41e1bec removed redundant checks 2020-04-24 01:40:12 +03:00
Nikolay Korolev 0fc505926f fix annoying bug 2020-04-24 01:32:17 +03:00
Nikolay Korolev 0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
Nikolay Korolev 05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
eray orçunus c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Nikolay Korolev 7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
shfil 7794cca429
Merge pull request #477 from ShFil119/mingw 
Try to make code working on more platforms
 2020-04-20 19:50:12 +02:00
Nikolay Korolev 35a7f89f73 Merge remote-tracking branch 'upstream/master' 2020-04-20 19:41:49 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Fire_Head c9920b6a2d
Merge pull request #480 from Fire-Head/master 
camerapickup ps2 code
 2020-04-20 08:21:27 +03:00
Fire-Head 556a6df401 camerapickup ps2 code 2020-04-20 08:17:08 +03:00
Nikolay Korolev 7e4c683824 fixes 2020-04-20 01:04:57 +03:00
Sergeanur 8e9c9fa445 Fix CPickups::GenerateNewOne loop 2020-04-20 00:14:48 +03:00
erorcun 0f07a323c9
Merge pull request #474 from Nick007J/master 
Bug fixes, mostly replay; added RegisterReference for player ped pointer
 2020-04-19 16:56:39 +03:00
eray orçunus 1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
Filip Gawin d6314f9564 Revert "Part one" 
This reverts commit 63951d9b95.
 2020-04-18 12:29:28 +02:00
Filip Gawin 2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
eray orçunus 812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
Filip Gawin 63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
Sergeanur b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone 
# Conflicts:
#	src/render/Coronas.cpp
 2020-04-17 10:17:38 +03:00
Sergeanur 881d61f811 Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 10:16:30 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus 2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
saml1er e52a02fb9e Merge branch 'master' into world 
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
 2020-04-17 00:01:53 +05:00
saml1er 52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
aap 89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
Nikolay Korolev 1fd7b0288c
fix Bait crash 2020-04-16 01:19:08 +03:00
Nikolay Korolev 3517f3f1a1
fix script crash 2020-04-16 00:31:57 +03:00
aap afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev 5cb7e2e42a
Merge pull request #440 from Fire-Head/master 
CWeapon done, fixes
 2020-04-15 23:28:09 +03:00
Nikolay Korolev a43ca86542
Merge pull request #429 from Nick007J/master 
Scene edit
 2020-04-15 23:27:23 +03:00
erorcun e132c3fada
Merge pull request #416 from saml1er/PedPath 
CPedPath complete
 2020-04-15 19:29:17 +03:00
erorcun 647cfbfd45
Merge pull request #446 from erorcun/erorcun 
Many fixes and cleanup
 2020-04-15 19:22:28 +03:00
eray orçunus 4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
aap 90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Sergeanur 27c9f7bc88 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-15 10:54:15 +03:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Nikolay Korolev b354a72de1 Merge remote-tracking branch 'upstream/master' 2020-04-15 01:06:56 +03:00
Nikolay Korolev 70b51d42f4
fixed crash 2020-04-15 00:33:55 +03:00
Sergeanur e373d0526e Merge branch 'master' into MoreLanguages 
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
 2020-04-15 00:10:50 +03:00
saml1er 6d5464b6bb CPedPath improvements 2020-04-14 23:32:15 +05:00
Nikolay Korolev f35d2721f5 fix 2020-04-14 20:16:02 +03:00
Nikolay Korolev f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
Nikolay Korolev 21a11fd343 scene edit 2020-04-14 20:09:42 +03:00
saml1er bf040c7cd1 Remove float casts 2020-04-14 17:05:51 +05:00
saml1er 8bb23ca5d4 Refactor CPedPath::CalcPedRoute 2020-04-14 16:57:28 +05:00
saml1er b4d5d5249c CPedPath complete 2020-04-14 15:45:47 +05:00
Sergeanur a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Nikolay Korolev f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Filip Gawin 2e20e040cc
Merge pull request #403 from saml1er/roadblocks 
CRoadBlocks complete
 2020-04-14 00:11:39 +02:00
saml1er 60eb60de4e Use NUMROADBLOCKS enum member in CRoadBlocks 2020-04-14 02:13:00 +05:00
Nikolay Korolev 906133d3be
fix garages 2020-04-13 22:43:41 +03:00
Sergeanur 304b574eba added missing break 2020-04-13 22:25:24 +03:00
Nikolay Korolev c21529467a
fixed record 2020-04-13 22:16:51 +03:00
Nikolay Korolev 12d36d8710
fixed record 2020-04-13 22:12:41 +03:00
Nikolay Korolev cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
Sergeanur d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
saml1er 68f8a6a9ed more CRoadBlocks::GenerateRoadBlocks improvements 2020-04-13 15:21:39 +05:00
Sergeanur 741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
saml1er 28fb1bdde7 Fix CRoadBlocks::GenerateRoadBlocks bugs 2020-04-13 05:52:18 +05:00
Nikolay Korolev e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev 04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev fa0f5542cc
Merge pull request #402 from Nick007J/master 
Record
 2020-04-12 12:06:12 +03:00
Nikolay Korolev c593599fc5
Merge pull request #399 from saml1er/master 
CObject complete
 2020-04-12 12:05:49 +03:00
Nikolay Korolev 9593a2c000
fixed cranes bug 2020-04-12 11:36:51 +03:00
saml1er 60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
Nikolay Korolev fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
aap 3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
saml1er 0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
Nikolay Korolev 1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev bc90f958da fix constants 2020-04-11 02:27:50 +03:00
Nikolay Korolev c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev 92b6d775d6 Record 2020-04-11 02:03:42 +03:00
Nikolay Korolev be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
aap c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00