archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-04-20 17:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,610 Commits 3 Branches 0 Tags
Commit Graph

476 Commits

Author SHA1 Message Date
Nikolay Korolev
de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev
6bdc0365ee another backport 2021-01-23 23:15:50 +03:00
Nikolay Korolev
37d1aa4129 script fixes 2021-01-23 23:04:24 +03:00
Nikolay Korolev
965a3d6eec Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 02:36:34 +03:00
Nikolay Korolev
917cf44def script coronas 2021-01-23 02:36:13 +03:00
Sergeanur
c884edd923 cSmallHeap 2021-01-23 00:03:12 +02:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten
497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
Nikolay Korolev
a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
Nikolay Korolev
23831e38e6 sync 2021-01-20 21:14:12 +03:00
Nikolay Korolev
ad745aae63 some more script 2021-01-20 21:12:42 +03:00
Sergeanur
cc94419a72 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
 2021-01-20 19:32:03 +02:00
Nikolay Korolev
aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
Nikolay Korolev
061fd25c61 fixes 2021-01-19 02:38:02 +03:00
Nikolay Korolev
47c697feca fixes 2021-01-18 23:58:26 +03:00
Nikolay Korolev
c09297997e script full 2021-01-18 22:19:30 +03:00
Nikolay Korolev
e5af1edcb9 script until 1497 2021-01-17 16:02:19 +03:00
Nikolay Korolev
c28ed42617 script6 2021-01-16 18:16:35 +03:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Nikolay Korolev
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
Nikolay Korolev
08e5c8e010 fixes 2021-01-11 17:22:07 +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
75d1715442 script file 1 done (hopefully) 2021-01-10 22:58:06 +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
f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
Nikolay Korolev
203dff9165 script 2021-01-09 20:33:21 +03:00
Nikolay Korolev
c1e68b2c61 fix 2021-01-09 17:43:21 +03:00
Nikolay Korolev
97c95b7639 more script 2021-01-09 17:35:27 +03:00
Nikolay
b7f9bfda4a
fail 2021-01-09 02:41:27 +03:00
Nikolay Korolev
a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Nikolay Korolev
613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03: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
Nikolay Korolev
236b3b1c2b more stuff 2021-01-08 12:41:39 +03:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Nikolay Korolev
5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +03:00
Nikolay Korolev
2173ceae95 missing changes 2021-01-07 18:36:02 +03:00
Nikolay Korolev
9d6db921bd fail 2021-01-07 18:31:54 +03:00
Nikolay Korolev
db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev
416a898943 minor refactoring 2021-01-07 16:33:42 +03:00
Nikolay Korolev
69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03:00
Nikolay Korolev
bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
aap
57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
aap
0d05be4e31 slightly better variable name 2021-01-02 20:30:12 +01:00
Nikolay Korolev
29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
Nikolay Korolev
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Nikolay Korolev
2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00