Commit Graph

1812 Commits

Author SHA1 Message Date
Sergeanur
f92770f74a Optimize ALDeviceList 2020-05-24 01:44:10 +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
ac208ce02c Even more small audio cleanup 2020-05-23 23:25:14 +03:00
Sergeanur
f2790f610b More audio cleanup 2020-05-23 22:48:50 +03:00
Nikolay Korolev
100e59886d
cranes fix 2020-05-23 16:14:39 +03:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
Nikolay Korolev
e18eb0ce01
script fix 2020-05-23 00:50:15 +03:00
eray orçunus
c993e99e00 Fix linux build 2020-05-22 22:49:54 +03:00
Sergeanur
a9f332f2d9 Possibly fix travis 2020-05-22 21:26:31 +03:00
Sergeanur
e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
Sergeanur
ab161d12d8 Merge remote-tracking branch 'origin/master' into opus 2020-05-22 17:41:03 +03:00
Sergeanur
0af4d57408 opus support 2020-05-22 17:40:19 +03:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
Nikolay Korolev
73ff01e35b
script fix 2020-05-21 00:18:13 +03:00
Nikolay Korolev
3405cfffb7 fixed dumb 2020-05-20 23:52:17 +03:00
Nikolay Korolev
b7c1784dd2
script fix 2020-05-20 23:25:01 +03:00
Nikolay Korolev
c0c8278c63 fixed ped comment 2020-05-20 20:45:07 +03:00
Nikolay Korolev
1b96e6c378
fixed script bug 2020-05-19 23:49:28 +03:00
aap
50f0c7a1dc bla 2020-05-19 22:01:28 +02:00
aap
0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
aap
0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02: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
shfil
6bf79120dc
Fix string assignment (aldlist.cpp) 2020-05-18 21:08:01 +02:00
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
aap
b05e6632be
Merge pull request #556 from Fire-Head/master
nullsampman
2020-05-18 17:08:32 +02:00
aap
2588e69849 some less certainly fps fixes 2020-05-18 16:55:38 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
Fire-Head
91fbfc1d23 nullsampman 2020-05-17 21:13:25 +03:00
aap
4ab49780b5 collect HUD colors at top of file 2020-05-17 15:33:44 +02:00
aap
405a6fcbef Merge branch 'master' of github.com:GTAmodding/re3 2020-05-17 15:16:27 +02:00
aap
964acba083 fix head/hand atomics 2020-05-17 15:16:12 +02:00
aap
72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Sergeanur
ad0b99231e Remove magic consts from ms_aAnimAssocDefinitions 2020-05-16 23:54:44 +03:00
Sergeanur
4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00
Sergeanur
13a0bf1c43 Move sound processors to AudioLogic.cpp, plus small fixes 2020-05-16 20:29:13 +03:00
Sergeanur
dc5ece8327 Fix audio use of number instead of enum for CAR_ACCEL 2020-05-16 16:55:37 +03:00
aap
c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
aap
b21f49ad6b fixed CText to be 64 bit compatible 2020-05-16 12:51:54 +02:00
aap
0c23166318 changed CPedIK names 2020-05-16 10:33:19 +02:00
Sergeanur
ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
aap
2fb4305a73 fixed hanging boot 2020-05-14 15:03:13 +02:00
aap
704a5c158f
Merge pull request #547 from Nick007J/master
a few bugfixes
2020-05-14 14:39:23 +02:00
aap
c21061a199 fixed RotateTorso 2020-05-14 14:29:39 +02:00
Nikolay Korolev
b01987719e
fixed script error 2020-05-14 15:26:59 +03:00
Nikolay Korolev
8e0b132f43 it works differently 2020-05-14 14:03:56 +03:00
Nikolay Korolev
9d4d83db0d some fixes 2020-05-14 14:01:24 +03:00
aap
9b162554ca fixed skinned cutscene head 2020-05-14 12:32:51 +02:00
aap
f5345f59ea blacklist for glfw "joysticks" 2020-05-14 00:09:45 +02:00
shfil
7036e80fc6
Fix calloc in CdStreamPosix 2020-05-13 17:48:07 +02:00
Nikolay Korolev
94bf7d9ea1 Merge remote-tracking branch 'upstream/master' 2020-05-13 17:34:09 +03:00
Nikolay Korolev
1237941180 fixed traffic lights 2020-05-13 17:33:50 +03:00
Sergeanur
3f1001b86b More save/load alignment fixes 2020-05-13 16:24:00 +03:00
Nikolay Korolev
509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Sergeanur
7aeac06fdb Redoing some pool reading for better alignment 2020-05-13 05:31:14 +03:00
Sergeanur
4ac53960f5 Changing save/load for CPlayerInfo because of alignment crap 2020-05-13 03:43:20 +03:00
Filip Gawin
a0b3117ee4 Revert to memcpy 2020-05-13 02:01:42 +02:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
Nikolay Korolev
c40fcdf39a
fix shotgun 2020-05-12 22:48:28 +03:00
aap
bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
Nikolay Korolev
180a1dc42b Merge remote-tracking branch 'upstream/master' 2020-05-12 20:23:03 +03:00
Nikolay Korolev
615bd1e878 garages fix 2020-05-12 20:22:35 +03:00
aap
98a233da43 little fixes to CClouds; disabled object clipping for SA cam 2020-05-12 16:36:23 +02:00
Nikolay Korolev
1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
aap
fab453efde fixed bug in cutscene head 2020-05-12 09:45:01 +02:00
Sergeanur
8f1a2825d4 Remove odd calculations for bullet hit smoke 2020-05-12 04:31:11 +03:00
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master
Linux build support
2020-05-12 00:33:13 +03:00
aap
70a8234dad RenderPedCB from VC 2020-05-11 22:24:53 +02: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
aap
95920d54f2 random fixes 2020-05-11 17:04:08 +02:00
aap
b11715608f few fixes 2020-05-11 09:18:41 +02:00
erorcun
c66c45f4c8
Merge pull request #509 from Fire-Head/master
OpenAL update
2020-05-11 03:23:36 +03:00
bigbossbro08
bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08
b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +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
Sergeanur
28103775ba Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
Sergeanur
1b599b2d35 Fix compilation error 2020-05-09 15:41:00 +03:00
erorcun
ce4996b09c
Merge pull request #527 from erorcun/erorcun
Menu map fixes and resizable window on GLFW
2020-05-09 13:44:43 +03:00
eray orçunus
f754da272f Menu map fixes and resizable window on GLFW 2020-05-09 13:43:08 +03:00
aap
d26ffdd05f fixes for anims 2020-05-09 12:04:48 +02:00
aap
633c2a7aeb Merge branch 'master' of github.com:GTAmodding/re3 2020-05-09 09:50:08 +02:00
aap
3f09ec0744 named anim assoc flags 2020-05-09 09:50:00 +02:00
Sergeanur
d686f587cc Merge remote-tracking branch 'origin/master' 2020-05-09 02:51:40 +03:00
Sergeanur
e917cd1f46 Fix corona scaling 2020-05-09 02:50:48 +03:00
aap
10cade9f60 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-08 20:58:48 +02:00
aap
f12e76fa13 more small fixes 2020-05-08 20:58:40 +02:00
Sergeanur
e0b3418e65 Fix water UV on high FPS and inverted free camera 2020-05-08 14:34:21 +03:00
aap
a8f1505517 small fixes 2020-05-07 21:56:09 +02:00
aap
3ae10c93ac Merge branch 'master' of github.com:GTAmodding/re3 2020-05-07 17:31:32 +02:00
Sergeanur
0b848bc147 Fix looping collision sound 2020-05-07 14:48:53 +03:00
Sergeanur
1ac6bea590 Fix GetDistanceSquared 2020-05-07 14:32:00 +03:00
Sergeanur
ed1bb7236f Fixed arguments for sound collisions 2020-05-07 14:10:56 +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
Fire-Head
875c77e8b1 oal update 2020-05-07 10:13:59 +03:00
Fire-Head
12a3499ca3 oal wav/mp3 stream update 2020-05-07 09:26:16 +03:00
Nikolay Korolev
a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
aap
aa12251c6b Merge branch 'master' of github.com:GTAmodding/re3 2020-05-06 17:13:53 +02:00
aap
a2b89c6a18 sorted out object collision enums 2020-05-06 17:13:46 +02:00
Sergeanur
b633288d1b Merge remote-tracking branch 'origin/master' 2020-05-06 18:02:16 +03:00
Sergeanur
daa3b20477 Fix cAudioManager::ProcessActiveQueues loop 2020-05-06 18:01:52 +03:00
aap
b4bbd91921 got rid of superfluous enum 2020-05-06 16:56:59 +02:00
aap
13522259b8 fix for radar 2020-05-06 15:41:40 +02:00
aap
7c356b08e6 little cworld bugfix 2020-05-06 14:27:41 +02:00
aap
cbfc45b3f7 some work on zones 2020-05-06 12:23:26 +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
Sergeanur
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur
0163a7bc46 Remove ColStore 2020-05-05 18:13: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
5580eb21a4 ModeInfoType -> ModelInfoType 2020-05-05 15:13:09 +03:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
aap
fd462c9b55 implemented most of streamed collisions and big buildings 2020-05-05 14:00:20 +02: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
Fire-Head
73c809f616 bb std::string 2020-05-04 22:02:54 +03:00
Fire-Head
6382b6d2fc fix typo 2020-05-04 21:32:42 +03:00
Fire-Head
0abd0c659b openal-soft added 2020-05-04 21:06:14 +03:00
Fire-Head
8aac6060d3 oal upd 2020-05-04 20:33:48 +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
3554ec58bb
Merge pull request #507 from aap/master
implemented most of vice city path system, conditionals for train, bridge, cullzones
2020-05-04 19:51:56 +03:00
Nikolay Korolev
11c7050dfb deny coach in crusher 2020-05-04 15:02:46 +03:00
Nikolay Korolev
20ffccbe2a Merge remote-tracking branch 'upstream/master' 2020-05-04 14:58:12 +03:00
Nikolay Korolev
d1a46c35ce fixed spawn bug 2020-05-04 14:57:49 +03:00
aap
f027c3afed fixed fog color for librw 2020-05-04 13:41:17 +02:00
aap
a073dda5ec GTA_ZONECULL define 2020-05-03 17:44:10 +02: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
ff4af35292 Fix pad Y axis 2020-05-03 01:42:05 +03:00
Sergeanur
dcd1ba6578 Fix CMessages::InsertStringInString 2020-05-03 01:40:37 +03:00
Sergeanur
6a40c03442 Put camera modes compatibility under COMPATIBLE_SAVES 2020-05-03 00:15:28 +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
9d600802fa Revert "Disable PED_SKIN for now"
This reverts commit d51bf48dcd.
2020-05-02 23:52:41 +03:00
Sergeanur
4448156e29
Merge pull request #494 from Nick007J/master
pools compatibility
2020-05-02 23:48:17 +03:00
Sergeanur
89961325b2 Ceil health and armor values in hud (fix 99 health) 2020-05-02 23:38:52 +03:00
Sergeanur
c62d35fed0 Adding sound intensity consts 2020-05-02 23:31:45 +03:00
Nikolay Korolev
b095bc1b5a Merge remote-tracking branch 'upstream/master' 2020-05-02 21:31:41 +03:00
Sergeanur
52a13e3301 Fix number of unique jumps in stat menu 2020-05-02 21:28:44 +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
Sergeanur
d51bf48dcd Disable PED_SKIN for now 2020-05-02 19:13:51 +03:00
Sergeanur
271517915f Cleanup cAudioManager::ProcessVehicleSkidding 2020-05-02 18:23:48 +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
7ba5b3c353 A bit more audio cleanup 2020-05-02 17:10:51 +03:00
Sergeanur
853dab23f5 cleanup cAudioManager::UpdateReflections 2020-05-02 16:45:24 +03:00
Sergeanur
8d0b0051b4 AudioManager.cpp autoformat 2020-05-02 16:27:40 +03:00
Sergeanur
05b2ae10c6 Replacing >> and << to / and * in AudioManager 2020-05-02 15:56:59 +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
rollschuh2282
ccf7ebca9a
fixed the CIRCLE_BACK_BUTTON define. 2020-05-02 12:58:12 +02:00
Nikolay Korolev
5a916c16b7 Merge remote-tracking branch 'upstream/master' 2020-05-02 11:26:26 +03:00
aap
339365806a update librw (vsynch) 2020-05-02 10:08:58 +02:00
Nikolay Korolev
026ed72bfc Merge remote-tracking branch 'upstream/master' 2020-05-01 21:23:09 +03:00
erorcun
90f5a8fa8e
Merge pull request #501 from erorcun/erorcun
Screen mode selector and persistent map target fix
2020-05-01 21:21:05 +03:00
eray orçunus
97b288c1e4 Screen mode selector and persistent map target fix 2020-05-01 21:16:02 +03:00
aap
59bfbaddfb implemented debugmenu shutdown 2020-05-01 17:31:29 +02:00
Nikolay Korolev
0d5f56cacc Merge remote-tracking branch 'upstream/master' 2020-05-01 15:22:56 +03:00
aap
1ef67aee22 update librw 2020-05-01 14:22:23 +02:00
Nikolay Korolev
79d66b7910 Merge remote-tracking branch 'upstream/master' 2020-05-01 13:46:36 +03:00
aap
56cb586f15
Merge pull request #499 from aap/master
Better handling of video modes, windowed mode, fixes to glfw
2020-05-01 08:43:35 +02:00
Nikolay Korolev
063bf51bf1 updated get/set 2020-04-30 22:04:07 +03:00
Nikolay Korolev
dc12718fc2 Merge remote-tracking branch 'upstream/master' 2020-04-30 21:41:20 +03:00
Sergeanur
e14733367e Rename m_phy_flagA80 to bSkipLineCol 2020-04-30 18:58:15 +03:00
Sergeanur
81094f2cd7 Rename m_ped_flagA2 into bWasStanding 2020-04-30 18:13:38 +03:00
Sergeanur
94acee8580 Fix MakeSureSlotInObjectPoolIsEmpty 2020-04-30 16:52:37 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
aap
1b40693f80 improved video modes for glfw 2020-04-30 15:38:25 +02:00
aap
b714103703 fixed CVector != 2020-04-30 11:31:49 +02:00
aap
9950d105f7 Merge branch 'master' of github.com:gtamodding/re3 2020-04-30 10:17:26 +02:00
Sergeanur
080689589c Jap fixes 2020-04-30 02:27:15 +03:00
Nikolay Korolev
38655693f5 Merge remote-tracking branch 'upstream/master' 2020-04-29 21:56:25 +03:00
aap
3580e31ce0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-29 20:53:54 +02:00
aap
804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
eray orçunus
fdb1580e15 Mouse wheel fix 2020-04-29 18:53:05 +03:00
Nikolay Korolev
1e78278b5a Merge remote-tracking branch 'upstream/master' 2020-04-29 11:44:33 +03:00
aap
4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
Nikolay Korolev
7608174224 Merge remote-tracking branch 'upstream/master' 2020-04-28 15:11:22 +03:00
Sergeanur
299bbc47ec Changing prefixes for some audio fields 2020-04-28 14:00:38 +03:00
Nikolay Korolev
d8371dcf80 Merge remote-tracking branch 'upstream/master' 2020-04-28 12:16:50 +03:00
Nikolay Korolev
d921871a88
Allow keyboard controls for flying cheats 2020-04-28 12:05:52 +03:00
aap
c7e2845602 removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp? 2020-04-28 10:56:30 +02:00
Nikolay Korolev
fcf9011601 Merge remote-tracking branch 'upstream/master' 2020-04-28 00:47:47 +03:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
aap
1180cc2947 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 20:56:53 +02:00
aap
f399fd1050 little support for gl3 textures; txd.img enabled again 2020-04-27 20:56:44 +02:00
Sergeanur
64e6af1db8 Fix tVehicleSampleData struct 2020-04-27 20:26:24 +03:00
Sergeanur
c94ccce6d6 Audio structs moved to their AudioManager.h 2020-04-27 20:06:54 +03:00
aap
d397a59951 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 12:31:49 +02:00
aap
d9c987bd8c fix (temporary?) for black bullet traces 2020-04-27 12:31:38 +02:00
Sergeanur
7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03:00
Nikolay Korolev
9df04961ce Merge remote-tracking branch 'upstream/master' 2020-04-27 12:20:28 +03:00
Sergeanur
81fce4edab Audio fixes 2020-04-27 02:49:07 +03:00
Sergeanur
669bbe3cc7 Workaround for a crash on release 2020-04-27 01:55:06 +03:00
Nikolay Korolev
a38a867cc5 sync with upstream 2020-04-27 00:55:22 +03:00
Nikolay Korolev
74fde1397e pools compatibility 2020-04-27 00:54:43 +03:00
Nikolay Korolev
68bf239868
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
2020-04-27 00:53:54 +03:00
aap
e467cb08b8 Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 21:51:11 +02:00
aap
1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02: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
Sergeanur
4dc2f30791 Remove little hack 2020-04-26 21:58:12 +03:00
aap
41586c7cda fixes for glfw 2020-04-26 20:16:31 +02:00
Sergeanur
b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
Sergeanur
1a44bcccd5 A few fixes 2020-04-26 14:18:34 +03:00
Sergeanur
4f763cba49 Fix compilation error 2020-04-26 13:59:06 +03:00
eray orçunus
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
Nikolay Korolev
fbca45239d Merge remote-tracking branch 'upstream/master' 2020-04-25 21:46:15 +03:00
Nikolay Korolev
ae8deff131 helis done + cheats 2020-04-25 21:25:14 +03:00
aap
ea79cc4469 update librw 2020-04-25 15:56:20 +02:00
Nikolay Korolev
7ddfc40675 Merge remote-tracking branch 'upstream/master' 2020-04-25 16:48:03 +03:00
Nikolay Korolev
40ec636291 fixed flight control code 2020-04-25 16:47:39 +03:00
aap
8289b42c9e fixed shooting target 2020-04-25 14:37:58 +02:00
aap
241352e312 real names (from LCS) 2020-04-25 14:03:20 +02:00
aap
f15a5ac0f9 using librw GS alpha test emulation 2020-04-25 12:16:50 +02:00
Nikolay Korolev
bb14d9689f Merge remote-tracking branch 'upstream/master' 2020-04-25 12:26:37 +03:00
aap
05bba73225 Merge branch 'master' of github.com:gtamodding/re3 2020-04-25 11:26:05 +02:00
Nikolay Korolev
2be2899034 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:25:40 +03:00
aap
ad9ebbd390
Merge pull request #490 from aap/debugmenu
implemented debugmenu
2020-04-25 11:25:19 +02:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
Nikolay Korolev
f3ae4fa184 undo 2020-04-25 12:14:51 +03:00
Nikolay Korolev
c8fd0385cf flying control 2020-04-25 12:14:21 +03:00
aap
ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00
Nikolay Korolev
4b883f2b40
disable mouse steering by default 2020-04-24 20:50:00 +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
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
aap
6467e2003a Merge branch 'master' of github.com:gtamodding/re3 2020-04-23 22:10:46 +02:00
Nikolay Korolev
05ddc80ea2 Merge remote-tracking branch 'upstream/master' 2020-04-23 19:12:20 +03:00
Nikolay Korolev
458eb3a4f0
removed fix that made no sense 2020-04-23 16:40:19 +03:00
Fire_Head
ff46dc1c6c
Merge branch 'master' into master 2020-04-23 11:50:06 +03:00
Fire-Head
2925b7e0c3 fix #ifdef 2020-04-23 11:35:42 +03:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
erorcun
9660594634
Merge pull request #481 from erorcun/erorcun
Crossplatform work continues
2020-04-22 14:08:01 +03:00
eray orçunus
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Nikolay Korolev
78d6ad7348 Merge remote-tracking branch 'upstream/master' 2020-04-21 23:41:04 +03:00
Fire_Head
828dc85be5
fix RenderExtraPlayerShadows 2 2020-04-21 22:53:55 +03:00
Fire_Head
fba4c51f6b
fix RenderExtraPlayerShadows 2020-04-21 22:52:42 +03:00
aap
959f84ff95 fixed extra directory issues 2020-04-21 13:56:33 +02: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
aap
98fc8ecef0 update librw (matfx) 2020-04-20 16:05:39 +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
Fire_Head
0a07a2233b
Merge pull request #479 from Fire-Head/master
OddJob sliding text
2020-04-20 07:46:44 +03:00
Fire-Head
83810168ee beta OddJob(unique jump etc) sliding text 2020-04-20 07:45:17 +03:00
Nikolay Korolev
b8c34f6654 Merge remote-tracking branch 'upstream/master' 2020-04-20 01:05:20 +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
Fire-Head
36f08269a5 MenuScreens.h fix 2020-04-19 22:38:02 +03:00
Fire-Head
4c5edda82e MenuScreens.h fix 2020-04-19 22:37:20 +03:00
Fire-Head
2308321805 Add polish lang support 2020-04-19 22:32:59 +03:00
Nikolay Korolev
df376a13ea sync with master 2020-04-19 17:38:48 +03:00
Nikolay Korolev
9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +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
erorcun
f9ed50e178
Merge pull request #475 from erorcun/erorcun
Struct cleanup, various fixes, enable PS2 rand
2020-04-19 16:54:05 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev
bcc3a8b6c7 missing ifded 2020-04-19 01:20:14 +03:00
Sergeanur
fce2e02444 Fix savename buffer overflow 2020-04-18 23:58:43 +03:00
Nikolay Korolev
4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
eray orçunus
9bfcaff849 slider fix 2020-04-18 22:56:49 +03:00
eray orçunus
5320bf7964 RpClumpRemoveAtomic update 2020-04-18 21:44:07 +03:00
erorcun
6e24cb28ad
Merge pull request #472 from gennariarmando/master
Hide Vehicle/Zone name during Wasted/Busted...
2020-04-18 21:38:33 +03:00
eray orçunus
2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
gennariarmando
ffe5dce7f5 Hide Vehicle/Zone name during Wasted/Busted...
Fixed little mistake in my latest commit.
2020-04-18 18:14:38 +02:00
gennariarmando
522d14814f Changed extraOffset value. 2020-04-18 16:14:48 +03:00
erorcun
70ccd4c187
Merge pull request #464 from gennariarmando/master
Fixed menu radio icons.
2020-04-18 16:14:26 +03:00
Nikolay Korolev
89688843ec bug fixes 2020-04-18 13:56:21 +03:00
Filip Gawin
d6314f9564 Revert "Part one"
This reverts commit 63951d9b95.
2020-04-18 12:29:28 +02:00
Filip Gawin
3f32b69a79 Fix crash in cAudioManager::ServicePoliceRadio 2020-04-18 12:20:20 +02:00
Filip Gawin
2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur
eadb5a16aa Zones save/load 2020-04-18 12:24:44 +03:00
Sergeanur
555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
gennariarmando
e41c32df43 Fixed menu radio icons. 2020-04-18 05:52:33 +02:00
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
aap
bdf9fa2f01 implemented librw alphatest setting 2020-04-17 23:55:20 +02:00
aap
5c474b9c68 Merge branch 'master' of github.com:gtamodding/re3 2020-04-17 21:45:25 +02:00
aap
886d73b123 fixed raster from image conversion 2020-04-17 21:45:02 +02:00
Filip Gawin
63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur
64cf568691 We don't need rw.cpp anymore 2020-04-17 18:46:43 +03:00
Sergeanur
941c50ee25 Merge remote-tracking branch 'origin/master' into Standalone 2020-04-17 16:31:43 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
aap
6ef7924e01 implemented CVector2D::NormaliseSafe for SkidMarks 2020-04-17 15:15:42 +02:00
Sergeanur
c8af08330a Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 15:06:49 +03:00
saml1er
ac61da3feb Fix CWorld::FindObjectsOfTypeInRangeSectorList bug 2020-04-17 17:04:09 +05:00
Sergeanur
4ecf56a2d7 Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone 2020-04-17 15:03:00 +03:00
saml1er
2a4717fa41 Apply clang format to CWorld 2020-04-17 16:14:59 +05:00
saml1er
ce7d6848ba CWorld fixes 2020-04-17 16:13:55 +05: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
425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
saml1er
e777f24064 More CWorld fixes 2020-04-17 05:38:05 +05:00
saml1er
03247ce98f Fix CWorld::RepositionOneObject bugs 2020-04-17 03:54:22 +05:00
saml1er
6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05: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
Sergeanur
83cbe4e39e More refs removed 2020-04-16 15:30:47 +03:00
aap
7bd12f4a48 add textures in correct order 2020-04-16 13:33:32 +02:00
Sergeanur
552f8c864f
Merge pull request #448 from Nick007J/master
CBulletInfo
2020-04-16 12:57:58 +03:00
Sergeanur
69c32376fe Increase alpha entity list capacity for wide screen 2020-04-16 12:44:04 +03:00
Sergeanur
b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
aap
4b602940eb first fake RW implementation working 2020-04-16 10:26:16 +02:00
aap
89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
Fire-Head
c1fcb7bd43 Removed refs from sampman 2020-04-16 08:28:17 +03:00
eray orçunus
c22e59abab Various fixes 2020-04-16 05:07:32 +03:00
Nikolay Korolev
22c84356b1 Merge remote-tracking branch 'upstream/master' 2020-04-16 02:00:38 +03:00
Nikolay Korolev
5993c66efb
Fixed bridge despawns 2020-04-16 01:59:19 +03:00
Sergeanur
f435455bde Removed refs from weapons/, WeaponEffects moved 2020-04-16 01:56:15 +03:00
Sergeanur
b9a8ad9481 Fix misplaced targeting 2020-04-16 01:44:43 +03:00
Nikolay Korolev
75733f3c83 Merge remote-tracking branch 'upstream/master' 2020-04-16 01:19:45 +03:00
Nikolay Korolev
1fd7b0288c
fix Bait crash 2020-04-16 01:19:08 +03:00
Sergeanur
d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Nikolay Korolev
156177ff5a Merge remote-tracking branch 'upstream/master' 2020-04-16 00:32:29 +03:00
Nikolay Korolev
3517f3f1a1
fix script crash 2020-04-16 00:31:57 +03:00
Sergeanur
3e460d94ac More japanese 2020-04-16 00:24:49 +03:00
Nikolay Korolev
e0394a1558 vs botch 2020-04-16 00:00:04 +03:00
Nikolay Korolev
480573452e definition fix 2020-04-15 23:49:23 +03:00
Nikolay Korolev
2a96846eac anim fix 2020-04-15 23:48:08 +03:00
aap
afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev
1795f3d479 sync with master 2020-04-15 23:31:52 +03: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
Fire-Head
190bc696d8 fixed crash 2020-04-15 21:29:00 +03:00