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 |
|
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 |
|
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 |
|
Andrew Udvare
|
324f84750b
|
vscode: Linux: add release configurations
|
2020-10-08 23:14:37 -04:00 |
|
majestic
|
c091a5c11a
|
CWaterCreatures
|
2020-10-08 19:28:31 -07:00 |
|
eray orçunus
|
22c9e8b581
|
Fix POSIX streaming
|
2020-10-09 02:22:02 +03:00 |
|
eray orçunus
|
ed82c55475
|
Fix POSIX streaming
|
2020-10-09 02:19:49 +03:00 |
|
eray orçunus
|
570ccb7db1
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-08 22:45:37 +03:00 |
|
erorcun
|
b3b21e0af3
|
Merge pull request #756 from erorcun/miami
Fixes, some thanks to ASan
|
2020-10-08 22:44:32 +03:00 |
|
eray orçunus
|
73a3e9d5bb
|
Fixes, some thanks to ASan
|
2020-10-08 22:41:51 +03:00 |
|
erorcun
|
b97f86deea
|
Merge pull request #750 from erorcun/miami
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 21:39:11 +03:00 |
|
aap
|
eae9e7e685
|
Merge pull request #755 from theR4K/miami
car wheelie fix
|
2020-10-08 19:50:10 +02:00 |
|
Roman Masanin
|
e52c5ca1bb
|
fix for wheelie cras
|
2020-10-08 20:34:59 +03:00 |
|
majestic
|
9a10501698
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-10-08 09:31:57 -07:00 |
|
eray orçunus
|
a252e3a02a
|
update librw
|
2020-10-08 18:47:41 +03:00 |
|
Filip Gawin
|
6bae5a6031
|
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
|
2020-10-08 18:45:07 +03:00 |
|
eray orçunus
|
fec01aeff1
|
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-08 17:58:18 +03:00 |
|
Andrew Udvare
|
1a3e254b6c
|
CdStreamPosix: fix type issues
|
2020-10-08 17:53:32 +03:00 |
|
Andrew Udvare
|
ef9455c324
|
premake5: Place macosx-amd64 after arm64
Fixes xcode4 project from Premake getting the wrong target (for now).
|
2020-10-08 17:53:14 +03:00 |
|
Andrew Udvare
|
2bb29a50b7
|
core/CdStreamPosix: switch to named semaphores to support macOS
macOS does not support unnamed semaphores. The functions return ENOSYS.
|
2020-10-08 17:52:12 +03:00 |
|
Andrew Udvare
|
d590fdddf6
|
macOS support; thanks to @MrYadro
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
|
2020-10-08 17:51:43 +03:00 |
|
eray orçunus
|
7f330bfbf9
|
Merge branch 'master' of https://github.com/GTAmodding/re3
|
2020-10-08 16:25:05 +03:00 |
|
erorcun
|
bf98dcbc3a
|
Merge pull request #743 from erorcun/master
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-08 16:15:55 +03:00 |
|
erorcun
|
3435d6656c
|
Merge pull request #748 from theR4K/miamiUpstream
CExplosion and some audio
|
2020-10-08 16:15:18 +03:00 |
|
majestic
|
7861992fe6
|
CWaterCreatures
|
2020-10-08 05:59:08 -07:00 |
|
majestic
|
f5e6a3a274
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-10-07 18:07:15 -07:00 |
|
erorcun
|
fa373c7fdb
|
Merge branch 'miami' into miami
|
2020-10-08 01:29:35 +03:00 |
|
eray orçunus
|
0409907438
|
Merge branch 'master' of https://github.com/GTAmodding/re3
|
2020-10-08 01:26:34 +03:00 |
|
eray orçunus
|
07cdd06373
|
little renamings & librw update
|
2020-10-08 01:17:19 +03:00 |
|