1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 18:32:44 +01:00
Commit Graph

1880 Commits

Author SHA1 Message Date
Anonymous Maarten
8aee672466 rwlib: refactor FileIndex
- make FileIndex const correct (std::map::operator[] modifies the std::map)
- use a single map
- keys are paths relative in the game data directory + filenames
  (so paths like "data/main.scm" can be found twice in the map)
- normalization of the file paths is done inside FileIndex,
  so there shouldn't be any ::tolower's anymore.
- added a normalizer helper function "normalizeFilePath"
- added Documentation
2018-06-30 04:03:20 +02:00
Anonymous Maarten
062115f6bd rwgame+rwengine: get background from index + pass as rwfs::path 2018-06-30 04:03:20 +02:00
Anonymous Maarten
4f60dfad43 rwlib: bit_case is a header, not a source file 2018-06-30 04:03:20 +02:00
Anonymous Maarten
36149cf38e rwlib: rw/defines.hpp -> rw/debug.hpp 2018-06-30 04:03:20 +02:00
Daniel Evans
0b8407b618
Merge pull request #534 from ShFil119/icon
Add an SDL window icon to the executable
2018-06-30 01:06:12 +01:00
Filip Gawin
93c55057c8 Add an SDL window icon to the executable, thx @vflyson 2018-06-29 23:15:23 +02:00
Daniel Evans
4c357ad618
Merge pull request #493 from husho/pacman
Big'N'Veiny pickups
2018-06-29 21:15:17 +01:00
Jannik Vogel
2b59f8b210
Merge pull request #533 from christoph-heiss/fix-cutscenes-macos
Fix cutscene only showing a grey screen on macOS.
2018-06-26 22:09:59 +02:00
Christoph Heiss
359d61e544
cmake: Fix linking failure when using the C++17 or C++TS filesystem library on macOS. 2018-06-26 14:16:10 +02:00
Christoph Heiss
4e38cb1d30
rwengine: Fix cutscenes only showing a grey screen on macOS.
This is caused by different handling of formatted input in the C++
standard library on macOS than on a linux box.
On linux, characters after a number are ignored (such as 'f' in this
case), on macOS this leads to an error on the stream.
2018-06-26 14:15:08 +02:00
husho
f9fc588d64 Fixed: tests weren't working
Fixed: mission timer
Timer was going crazy due to missing 02d9 opcode, update timer 25 times per second

Fixed: mission timer
Don't beep on every timer update
2018-06-26 03:45:52 +03:00
Daniel Evans
7061813afd
Merge pull request #507 from husho/scmfix
Fix: terminate only mission scripts when starting new mission via debug menu
2018-06-26 00:43:19 +01:00
husho
363840396a Implemented: Big'N'Veiny pickups 2018-06-26 02:39:24 +03:00
Daniel Evans
7d7400308c
Merge pull request #490 from husho/garages_continuation
[Ready] Garages continuation
2018-06-26 00:23:38 +01:00
Daniel Evans
146b42d510
Merge pull request #525 from dracc/349-fix
Fix #349 "Smooth vehicle steering"
2018-06-25 23:54:45 +01:00
husho
92d2a614b7 Garages continuation 2018-06-24 02:43:24 +03:00
Lucas Eriksson
15c7f7299c 349-fix 2018-06-22 12:37:46 +02:00
Daniel Evans
10ef3448aa
Merge pull request #517 from NFSMONSTR/implement_some_cheats_2
Implement some cheats and showing cheat activated message
2018-06-21 22:45:34 +01:00
Anonymous Maarten
bf0b03d940 conan: conan is a package manager 2018-06-21 23:44:06 +02:00
Daniel Evans
9ef401f7c4
Merge pull request #471 from husho/patch-2
Temporary partial fix for duped cars & peds in first mission
2018-06-21 22:33:55 +01:00
Daniel Evans
c07d4b3ca3
Merge pull request #520 from madebr/appveyor_race_condition
ci: use hash of checked out git repo instead of appveyor hash
2018-06-21 21:18:50 +01:00
Daniel Evans
7cc5731ad1
Merge pull request #521 from madebr/fixCharacterController
rwengine: check whether character is player
2018-06-21 21:17:22 +01:00
Anonymous Maarten
811948ab27 ci: use hash of checked out git repo instead of appveyor hash 2018-06-21 03:36:09 +02:00
Anonymous Maarten
ae5edcf056 rwengine: check whether character is player
Fixes #519

==13884==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000b3d954 at pc 0x0000008ba469 bp 0x7ffd7c8f9ab0 sp 0x7ffd7c8f9aa0
READ of size 4 at 0x607000b3d954 thread T0
    #0 0x8ba468 in PlayerController::isTalkingOnPayphone() const /home/maarten/programming/openrw/rwengine/src/ai/PlayerController.cpp:315
    #1 0xa148eb in CharacterObject::updateMovementAnimation(float) /home/maarten/programming/openrw/rwengine/src/objects/CharacterObject.cpp:128
    #2 0xa185d9 in CharacterObject::updateCharacter(float) /home/maarten/programming/openrw/rwengine/src/objects/CharacterObject.cpp:356
    #3 0xa17735 in CharacterObject::tick(float) /home/maarten/programming/openrw/rwengine/src/objects/CharacterObject.cpp:297
    #4 0x7c7731 in RWGame::tick(float) /home/maarten/programming/openrw/rwgame/RWGame.cpp:541
    #5 0x7c6abb in RWGame::run() /home/maarten/programming/openrw/rwgame/RWGame.cpp:447
    #6 0x793b45 in main /home/maarten/programming/openrw/rwgame/main.cpp:17
    #7 0x7f154c17e18a in __libc_start_main (/lib64/libc.so.6+0x2318a)
    #8 0x793839 in _start (/home/maarten/programming/openrw/build/build/rwgame/rwgame+0x793839)
2018-06-21 03:14:09 +02:00
Jannik Vogel
90a0b3ad97
Merge pull request #349 from drummyfish/master
Make vehicle wheels steer smoothly
2018-06-20 22:50:42 +02:00
Daniel Evans
b9b1ac9951 Add asset directory for logo SVG 2018-06-19 19:53:22 +01:00
husho
1132a4ba3c Fixed: missions debug menu
starting a mission via debug menu terminated non mission scripts
2018-06-19 21:22:44 +03:00
Jannik Vogel
3a052353a7
Merge pull request #492 from husho/patch-3
Fix vehicle damage
2018-06-19 18:36:36 +02:00
Jannik Vogel
a9e76da678
Merge pull request #516 from husho/fixpanic
Fix panic on new game
2018-06-18 23:58:03 +02:00
NFS_MONSTR
f5f1fb3247 Implement some cheats and cheat activated message 2018-06-18 22:15:31 +03:00
husho
22205aaa28 Fix panic 2018-06-18 16:20:51 +03:00
husho
7f249ecf89 Fix paramedic & vigilante submissions (#491)
Opcodes
0376 opcode "create_random_actor" was unimplemented and did return garbage to the script, and dereferencing nonexistent actor caused crashes
2018-06-18 07:36:27 -05:00
husho
595b671f6d Added missing std:: 2018-06-18 06:53:39 -05:00
husho
f3664def80 Redid opcodes related to player input and cutscenes (#476)
Redid opcodes related to player input and cutscenes
2018-06-18 06:53:09 -05:00
husho
6d04746222 [Ready] Payphones (#498)
Payphones
2018-06-17 23:24:34 -05:00
husho
81781a53ed Various opcodes (#499)
Various opcodes
2018-06-17 23:23:20 -05:00
darkf
1574ebb83c
Merge pull request #511 from madebr/ctest_retry
ctest: increase the retry count for cdash test submissions
2018-06-17 17:42:37 -05:00
Anonymous Maarten
2d9711b014 conan: update glm to 0.9.9.0 2018-06-17 16:24:50 +02:00
darkf
d0c07db836
Merge pull request #513 from madebr/ub_characterobject
rwgame: remove undefined behavior in CharacterObjects
2018-06-15 11:05:08 -05:00
Anonymous Maarten
46b94bd1ed rwgame: remove undefined behavior in CharacterObjects
Fixes this warning:
/home/maarten/programming/openrw/rwengine/src/objects/CharacterObject.cpp:202:54: runtime error: downcast of address 0x00000ae11d00 which does not point to an object of type 'PlayerController'
0x00000ae11d00: note: object is of type 'DefaultAIController'
 00 00 00 00  58 91 ca 00 00 00 00 00  e0 2e 90 0b 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00
              ^~~~~~~~~~~~~~~~~~~~~~~
              vptr for 'DefaultAIController'
/home/maarten/programming/openrw/rwengine/src/objects/CharacterObject.cpp:202:75: runtime error: member call on address 0x00000ae11d00 which does not point to an object of type 'PlayerController'
0x00000ae11d00: note: object is of type 'DefaultAIController'
 00 00 00 00  58 91 ca 00 00 00 00 00  e0 2e 90 0b 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00
              ^~~~~~~~~~~~~~~~~~~~~~~
              vptr for 'DefaultAIController'
/home/maarten/programming/openrw/rwengine/src/ai/PlayerController.hpp:66:16: runtime error: member access within address 0x00000ae11d00 which does not point to an object of type 'PlayerController'
0x00000ae11d00: note: object is of type 'DefaultAIController'
 00 00 00 00  58 91 ca 00 00 00 00 00  e0 2e 90 0b 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00
              ^~~~~~~~~~~~~~~~~~~~~~~
              vptr for 'DefaultAIController'
2018-06-15 16:24:23 +02:00
darkf
36e4cf498e
Merge pull request #512 from ShFil119/patch-3
Fix UB in gamestate
2018-06-14 19:47:31 -05:00
Filip Gawin
625ebdcb90
Fix UB in gamestate 2018-06-14 17:06:08 +02:00
Anonymous Maarten
9919fe5641 vs: Add convenience script to create a Visual Studio solution 2018-06-14 17:03:17 +02:00
Anonymous Maarten
adb5c32da2 ctest: increase the retry count for test submissions
Default retry count is 0 (=do not retry)
2018-06-14 15:55:33 +02:00
Anonymous Maarten
7d2da28dbc cmake: add ability to compile using conan package manager 2018-06-14 02:26:18 +02:00
Anonymous Maarten
1839b9c29d ctest: allow script_ci.sh to run on non CI machine 2018-06-14 02:18:10 +02:00
Anonymous Maarten
0c3dc78916 docker: add user to sudo group in docker image (only applicable for ubuntu) 2018-06-14 02:18:10 +02:00
Anonymous Maarten
cd55d17639 cmake: do not link to SDL2main library 2018-06-14 02:18:10 +02:00
Anonymous Maarten
4f98e363ce rwviewer: Visual Studio does not know about #warning 2018-06-14 02:18:10 +02:00
Anonymous Maarten
e4788b4229 cmake: add configuration option for static Boost 2018-06-14 02:18:06 +02:00