1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-23 02:42:39 +01:00
Commit Graph

635 Commits

Author SHA1 Message Date
Daniel Evans
7a987ea1b6 Merge pull request #40 from Hockenberry/feature-compile-under-macos
more changes to compile under macOS
2016-05-21 18:24:50 +01:00
Marco Schmidt
961bc27b6e add .clang-format to disable automagically reformat of source code 2016-05-21 19:16:09 +02:00
Marco Schmidt
8bccbeeaa7 move include_directories and use it on all platforms 2016-05-21 19:09:41 +02:00
Marco Schmidt
ab9d61643e add GLM as an dependency 2016-05-21 19:04:56 +02:00
Christoph Heiss
3c4ce72488 Fix GameConfig::getDefaultConfigPath for OS X.
Under OS X, configuration files are usually stored in $HOME/Library/Preferences/<appname>.
2016-05-21 19:04:29 +02:00
Daniel Evans
8e629fd2ab Add null check for the water texture 2016-05-21 15:58:27 +01:00
Daniel Evans
87cd90dbc0 Update readme with current control scheme. 2016-05-21 15:17:57 +01:00
Daniel Evans
d64f9a9ffc Add compile time draw distance multiplier for testing.
In the future this should be a runtime option controlled by the game
configuration.
2016-05-21 14:32:23 +01:00
Daniel Evans
1a2a3811f9 Initialise suspension length to 0 2016-05-21 13:11:05 +01:00
Daniel Evans
ca92e1e0aa Fix crash when script attempts to delete null object. Closes #30 2016-05-21 03:00:41 +01:00
Daniel Evans
3e43eb61be Add spawn offset to script set object position function 2016-05-21 02:34:24 +01:00
Daniel Evans
1b85926f36 Merge pull request #33 from christoph-heiss/osx-port
OS X port of OpenRW
2016-05-21 01:03:01 +01:00
Christoph Heiss
4c2c42ef6a Fix some OS X/Clang (build) errors.
For rwengine/src/engine/GameData.cpp, `#ifdef __unix__` is used, which
Clang on OS X does not define, thus not finding files while loading.
2016-05-20 16:28:47 +02:00
Christoph Heiss
d02b53e4ad OS X: Add platform define 2016-05-20 16:24:51 +02:00
Daniel Evans
2ee4a6e533 Add configuration file to replace OPENRW_GAME_PATH env var
This will permit the storage of other user settings like language and
video settings.
2016-05-20 02:10:11 +01:00
Daniel Evans
fe61c1a9f4 Move include inside debug section 2016-05-20 02:10:11 +01:00
Timmy Sjöstedt
dff96b7293 Make OpenGLRenderer use correct preprocessor check for profiler 2016-05-20 01:40:11 +02:00
Daniel Evans
9f85f283cb CMake: FindSFML+FindMAD, set library paths as SYSTEM, remove dead stuff. 2016-05-19 22:30:06 +01:00
Timmy Sjöstedt
b8062714a9 Work around Boost having moved stuff around, fixes #20 2016-05-19 22:28:01 +02:00
Daniel Evans
8ede36c59d Implement semi-functional world viewer widget 2016-05-19 19:46:23 +01:00
Daniel Evans
5b76eb72f3 Clean up viewer widgets to make additional viewers easier to add. 2016-05-19 19:46:23 +01:00
Daniel Evans
238d788c0d Merge pull request #22 from rcrit/screenshot
Don't hardcode screenshot directory (still hardcodes filename)
2016-05-19 19:41:21 +01:00
Rob Crittenden
a1072de670 Don't hardcode screenshot directory (still hardcodes filename)
Signed-off-by: Rob Crittenden <rcrit@greyoak.com>
2016-05-19 11:17:23 -04:00
Daniel Evans
11365a3c73 Remove old text rendering logic code. 2016-05-07 18:35:09 +01:00
Daniel Evans
5721333fb0 Overhaul script text display with new text logic system.
Logic for displaying text now belongs in ScreenText, which will
handle type specific text display.
2016-05-07 18:29:08 +01:00
Daniel Evans
e7faa60926 Make unit tests work again, fixing tests & code 2016-05-02 17:38:04 +01:00
Daniel Evans
9bc535d243 Fix uninitalized read in cutscene loading 2016-05-02 17:20:42 +01:00
Daniel Evans
f2fb822a83 Ensure that LoaderIMG always has the correct archive filename. 2016-05-02 01:42:27 +01:00
Daniel Evans
d2f254731a Increase warnings to pedantic and fix rwlib/rwengine warnings 2016-05-01 22:30:15 +01:00
Daniel Evans
0057f76630 fix uninitialized member in GameRenderer 2016-05-01 22:26:59 +01:00
Daniel Evans
185ba23f05 Fix all compiler warnings in rwengine. 2016-04-28 00:54:42 +01:00
Daniel Evans
637a6b97ab Fix compliler error with profiling disabled 2016-04-27 00:18:57 +01:00
Daniel Evans
bf68ddcd7c Fix compiler warnings in rwlib 2016-04-26 23:51:42 +01:00
Daniel Evans
84c276002c Improve rendering to support screen door transparency for LODs.
The LOD selection and fade logic has been changed to be more.. correct.
The fading now uses screen door transparency so the faded objects don't
need to be sorted with the actually transparent objects.
2016-04-26 23:40:43 +01:00
Daniel Evans
b0a2ae4da5 Implement a trivial profiler for perf. overview 2016-04-26 23:35:04 +01:00
Daniel Evans
4fc177d98a Improve benchmark output 2016-04-20 21:25:48 +01:00
Daniel Evans
61b47192c1 Change the Profiling flag to be shorter 2016-04-19 01:22:41 +01:00
Daniel Evans
3e9b0c64e4 Re-implement object rendering using a depth-sorted approach.
This moves the object rendering logic into ObjectRenderer. This makes
GameRenderer a bit smaller.

There are some rendering logic decisions that haven't been brought
back yet since they may be better placed elsewhere.
2016-04-19 01:20:54 +01:00
Daniel Evans
1d476270c0 First benchmark: Staunton 2016-04-18 02:33:13 +01:00
Daniel Evans
74f0e7f67c Added Benchmark mode (--benchmark file) 2016-04-18 02:31:52 +01:00
Daniel Evans
aecc43c75b Fix nans occuring when there was no movement 2016-04-18 00:10:44 +01:00
Daniel Evans
8a5be54b91 Overhaul animation system and character activities
Replaces animator with a simpler system that can overlay multiple
animations

Character animation split into two layers, motion and action.
Walking, running and jumping animations are played on the first
layer, actions such as firing can be overlayed on the second.
More work is needed to limit overlap to only the weapons that make
sense.
2016-04-17 04:54:19 +01:00
Daniel Evans
ceb711b25e Fix animations not playing in rwviewer 2016-04-16 15:05:36 +01:00
Daniel Evans
8575408ca2 Fix crash if there is no player object 2016-04-16 14:06:54 +01:00
Daniel Evans
76eb43c023 Fix compilation and runtime issues with reviewer from recent changes 2016-04-16 14:06:02 +01:00
Daniel Evans
f3b81c5690 Bring tests back up to compiling and running. Only a few are failing 2016-04-15 01:06:10 +01:00
Daniel Evans
90f9771cc8 Clean up main CMakeLists flag setting 2016-04-14 23:50:52 +01:00
Daniel Evans
66aed023b2 Remove Loader.hpp since it wasn't used for anything 2016-04-14 23:33:49 +01:00
Daniel Evans
3af1c37f5e Garage vehicle rotations are just directions. 2016-04-14 23:30:05 +01:00
Daniel Evans
df52ded730 Add defines include to types include 2016-04-14 01:24:23 +01:00