mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-27 06:43:43 +00:00
Code Issues Projects Releases Wiki Activity
3303 commits 3 branches 0 tags 63 MiB
Commit graph

3303 commits

This branch
This branch
All branches
Author SHA1 Message Date
eray orçunus
7bf2373fed update librw 2020-10-14 18:04:58 +03:00
Nikolay Korolev
2634d3b427 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-14 15:05:11 +03:00
Sergeanur
a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
erorcun
971b7cba65
Merge pull request #761 from erorcun/SampleMan 
SampleManager
 2020-10-13 13:18:49 +03:00
shfil
3b40e003ab
Fix typo in fire.cpp 2020-10-12 22:51:49 +02:00
Fire-Head
1e068aea73 fix AskForObjectToBeRenderedInGlass 2020-10-12 23:10:08 +03:00
Sergeanur
6450fd2692 Fix zone saving on 64 bit 2020-10-12 22:54:46 +03:00
erorcun
1e11c1eac6
Merge pull request #762 from Nick007J/miami 
Control update
 2020-10-12 21:52:59 +03:00
Roman Masanin
a4fd1a9f39 sirenes and more marks for audio. also fix cAudioMrg size 2020-10-12 20:55:19 +03:00
erorcun
4e07297503
Update sampman_miles.cpp 2020-10-12 20:51:52 +03:00
eray orçunus
342da2430b Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-12 20:47:34 +03:00
eray orçunus
3772be32bf Streaming and cross-platform fixes 2020-10-12 20:41:13 +03:00
eray orçunus
be6b97b5d8 Streaming and cross-platform fixes 2020-10-12 20:30:49 +03:00
eray orçunus
d18a55f429 SampleManager 2020-10-12 20:22:39 +03:00
Roman Masanin
e34261d3ef mark some audio stuff and fix frameCounter 2020-10-12 18:09:58 +03:00
Nikolay Korolev
d3788a9c70 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-12 13:57:25 +03:00
Roman Masanin
417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +03:00
Roman Masanin
56bb7d721a mark file and fix screen offset 2020-10-12 13:41:57 +03:00
Roman Masanin
e6a1ea9d4f CBrightLight::render 2020-10-12 13:28:06 +03:00
erorcun
96f36d16ae
Merge pull request #753 from majesticCoding/miami 
CWaterCreatures
 2020-10-12 12:37:47 +03:00
eray orçunus
40020f4e1e Fix forgotten wanted/busted text 2020-10-12 12:36:15 +03:00
eray orçunus
b1e235535c Cutscene aspect ratio fix 2020-10-12 12:16:24 +03:00
Nikolay Korolev
49c48f2ec2 sync with upstream 2020-10-12 12:11:53 +03:00
erorcun
9e0b23f065
Merge pull request #758 from erorcun/miami 
Hud, Fire, OnscreenBlaBla
 2020-10-12 11:13:46 +03:00
eray orçunus
8a622a0e72 Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
Sergeanur
239e09ad07
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad 
Zones saving and loading
 2020-10-12 04:16:30 +03:00
Roman Masanin
ca1d899413 final step 2020-10-11 22:29:49 +03:00
Roman Masanin
7a3e1ef19a SpecialFX almost done 2020-10-11 21:40:11 +03:00
Nikolay Korolev
28b47b601f fix 2020-10-11 18:14:35 +03:00
Nikolay Korolev
91a274da2b small fix 2020-10-11 13:11:25 +03:00
Nikolay Korolev
68779a4dac small fix 2020-10-11 13:05:41 +03:00
Nikolay Korolev
49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev
552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev
c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
Sergeanur
a5ea709edc
Merge pull request #760 from Sergeanur/VC/TextFinish 
Finish Text stuff
 2020-10-11 10:42:19 +03:00
Sergeanur
b0becb5a2d UnicodeMakeUpperCase move + arg fix 2020-10-11 10:39:04 +03:00
Sergeanur
9dba2386bb Merge branch 'master' into VC/TextFinish 
# Conflicts:
#	src/text/Text.cpp
 2020-10-11 10:34:47 +03:00
Sergeanur
43af5d9c1f Merge branch 'miami' into VC/TextFinish 2020-10-11 10:33:56 +03:00
Sergeanur
e26e85deb8 Some unicode funcs belong to Font.cpp + small fix 2020-10-11 10:33:02 +03:00
majestic
e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
Sergeanur
f1bb09826d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt
 2020-10-11 01:18:08 +03:00
Sergeanur
6fe6d0cb9a Finish Text stuff 2020-10-11 00:56:16 +03:00
Sergeanur
dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +03:00
Nikolay
63611408b1
bug fix 2020-10-10 18:19:49 +03:00
Roman Masanin
881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
eray orçunus
a01b14f301 Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
erorcun
70ae4b192b
Merge pull request #745 from Tatsh/vscode 
VS Code settings for code and debugging (Linux/macOS x64 only)
 2020-10-09 10:48:58 +03:00
Andrew Udvare
bbdfbe032e
.vscode/settings: fix include path 2020-10-09 02:01:53 -04:00
Andrew Udvare
53f6c6f8e9
.vscode/c_cpp_properties: add Linux configuration 2020-10-09 02:01:46 -04:00
Andrew Udvare
9250b36431
vscode: add macOS configurations 2020-10-08 23:19:55 -04:00