Marc Zinnschlag
|
a9c2deb86e
|
bad lineendings; as usual Windows is to blame
|
2010-07-01 17:00:54 +02:00 |
|
Nicolay Korslund
|
4a71a4c50c
|
Merge branch 'master' of http://github.com/athile/openmw
|
2010-07-01 10:38:45 +02:00 |
|
athile
|
de7087caf4
|
Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.
|
2010-06-30 11:32:40 -07:00 |
|
athile
|
59a2e8dcf7
|
Merge upstream
|
2010-06-28 12:44:55 -07:00 |
|
athile
|
97feee6cb6
|
Move misc files back to components
|
2010-06-28 12:40:39 -07:00 |
|
Nicolay Korslund
|
cd1e17239c
|
Reverted moving caelum resources
|
2010-06-28 14:37:29 +02:00 |
|
Nicolay Korslund
|
5005f5eb06
|
Fixed platform/strings.h to work again on Linux
|
2010-06-28 11:45:42 +02:00 |
|
Nicolay Korslund
|
a26641cca1
|
Moved caelum resources into the right place in the repo, instead of having cmake make redundant copies. Also fixed file modes/line endings.
|
2010-06-28 11:36:58 +02:00 |
|
athile
|
67f89f27a2
|
Properly removing the old 'misc' file and fixing a minor error in the platform CMake
|
2010-06-27 18:12:31 -07:00 |
|
athile
|
819c146ad1
|
Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings
|
2010-06-27 18:05:01 -07:00 |
|
athile
|
82bbc69453
|
Only push the far clip plane out if the sky is enabled
|
2010-06-27 17:28:49 -07:00 |
|
athile
|
f1278232d2
|
Add CMakeLists.txt - should have been part of the last commit
|
2010-06-27 17:01:01 -07:00 |
|
athile
|
7db274f1c5
|
Sky rendering clean-up and correct resource configuration
|
2010-06-27 16:44:15 -07:00 |
|
athile
|
b2485e8a52
|
Windows build fixes
|
2010-06-27 14:43:07 -07:00 |
|
athile
|
d67f0c74b0
|
Merge remote branch 'upstream/master'
|
2010-06-27 14:10:46 -07:00 |
|
athile
|
52a3233243
|
Work in progress Caelum integration
|
2010-06-27 14:08:53 -07:00 |
|
Nicolay Korslund
|
91f5c9c01f
|
Moved mangle submodule. Running 'git submodule update' should be enough.
|
2010-06-26 10:39:37 +02:00 |
|
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
2010-06-25 22:28:59 +02:00 |
|
Nicolay Korslund
|
1d84b10b3e
|
fixed more warning messages, updated mangle
|
2010-06-25 15:23:21 +02:00 |
|
Marc Zinnschlag
|
261af208cd
|
increased warning level for gcc; fixed code to remove resulting warnings (except mangle)
|
2010-06-25 14:41:49 +02:00 |
|
Marc Zinnschlag
|
518ddab30e
|
Merge commit 'upstream/master'
|
2010-06-23 12:01:44 +02:00 |
|
athile
|
3ed03fee2f
|
Fix lighting defect and VS8 compiler warnings.
|
2010-06-22 18:13:16 -07:00 |
|
athile
|
3c04479919
|
Add source groupings for Visual Studio, fix missing return true, add filename increment to screenshots.
|
2010-06-22 17:52:17 -07:00 |
|
Marc Zinnschlag
|
67227c34ef
|
Merge commit 'upstream/master'
|
2010-06-22 16:32:32 +02:00 |
|
Nicolay Korslund
|
c17015dfb5
|
Added screenshot function
|
2010-06-22 16:07:03 +02:00 |
|
Marc Zinnschlag
|
5c085815c0
|
Merge commit 'upstream/master'
|
2010-06-22 10:36:30 +02:00 |
|
Nicolay Korslund
|
737b29035d
|
Added mouse look, fixed WASD bindings
|
2010-06-22 10:15:22 +02:00 |
|
Nicolay Korslund
|
3a0600b84c
|
Implemented correct bounding box computation in NIFLoader
|
2010-06-22 09:49:44 +02:00 |
|
Marc Zinnschlag
|
448f9f37c2
|
bug-fix: D-key was assigned twice
|
2010-06-22 09:02:24 +02:00 |
|
Nicolay Korslund
|
782a90066d
|
Cleaned up some old code
|
2010-06-22 08:58:09 +02:00 |
|
Nicolay Korslund
|
6b6f5b95ec
|
Added camera movement (arrows/WASD). No mouse look yet.
|
2010-06-21 23:39:59 +02:00 |
|
Nicolay Korslund
|
af7c87e8dc
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
2010-06-21 16:49:31 +02:00 |
|
Marc Zinnschlag
|
a8f4b3e66c
|
fixed NIF loader problem with NiTriShape as root node
|
2010-06-21 16:45:12 +02:00 |
|
Ardekantur
|
4337f2619f
|
Mistakes in previous commit
|
2010-06-18 21:13:34 -04:00 |
|
Ardekantur
|
5187d5bb17
|
Mac build - make bundle do everything except data copying
|
2010-06-18 21:07:15 -04:00 |
|
Ardekantur
|
9c6663019d
|
Mac build - Link Carbon so window can receive focus/input
|
2010-06-18 18:53:24 -04:00 |
|
Ardekantur
|
3c5923686d
|
Updated Mac build instructions for OIS
|
2010-06-18 18:38:29 -04:00 |
|
Marc Zinnschlag
|
7e4f655939
|
pull in all bsa files instead of only the bsa file matching the master
|
2010-06-16 20:15:48 +02:00 |
|
Marc Zinnschlag
|
223d8ffd9b
|
Redemption compatibility fix
|
2010-06-16 19:51:59 +02:00 |
|
Marc Zinnschlag
|
92bf5b4b6e
|
added 'Meshes' and 'Textures' sub-directories as Ogre resources location
|
2010-06-16 12:58:53 +02:00 |
|
Marc Zinnschlag
|
b7db6dcda3
|
second round of refactoring; moving configuration handling out of main function
|
2010-06-16 12:21:02 +02:00 |
|
Marc Zinnschlag
|
04037fb01a
|
first round of main refactoring; moving functionality out to a separate class
|
2010-06-16 12:13:21 +02:00 |
|
Marc Zinnschlag
|
f32105a2ae
|
added --master option; reimplemented file handling with boost::filesystem
|
2010-06-15 19:04:52 +02:00 |
|
Marc Zinnschlag
|
b1e96386c6
|
added doxygen configuration
|
2010-06-15 16:47:08 +02:00 |
|
Nicolay Korslund
|
415f9e31aa
|
Fixed up lighting and color
|
2010-06-15 15:33:24 +02:00 |
|
Marc Zinnschlag
|
847ef6df5d
|
changed fog configuration to more sensible default values
|
2010-06-15 10:32:07 +02:00 |
|
Marc Zinnschlag
|
264bab806b
|
added lighting configuration
|
2010-06-15 09:30:24 +02:00 |
|
Marc Zinnschlag
|
12427b1f3e
|
Merge commit 'upstream/master'
|
2010-06-15 09:14:26 +02:00 |
|
athile
|
6dd59bf51b
|
Fix typo in previous commit
|
2010-06-14 12:31:13 -07:00 |
|
athile
|
d37f5b3052
|
Windows compile fixes
|
2010-06-14 12:28:54 -07:00 |
|