scrawl
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
2012-02-28 21:49:45 +01:00
scrawl
f34b2c73c5
committing the terrain material generator from ogre 1.7.4, it seems to
...
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify
if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
2012-02-27 19:44:52 +01:00
Marc Zinnschlag
739870489a
Merge remote branch 'scrawl/weather' into weather
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-02-27 15:02:03 +01:00
Marc Zinnschlag
26bd2be1e8
Merge branch 'equipment' into next
2012-02-23 13:02:20 +01:00
Marc Zinnschlag
af23cc352e
more cleanup
2012-02-23 12:58:12 +01:00
scrawl
c1fb5ce769
added (incomplete) WeatherManager, created by World
2012-02-21 20:22:46 +01:00
scrawl
2d8b0a4ac0
merged the sky manager implementation with its interface
2012-02-21 16:15:38 +01:00
scrawl
694a537b57
- removed caelum sources, resources, build scripts
2012-02-21 00:14:20 +01:00
scrawl
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
2012-02-20 23:53:17 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
52a6605f10
Merge remote branch 'mirc/refactor_wm' into refactor_wm
...
- changed the way dynamics stats are passed to the character creation object
- some more clean up
Conflicts:
.gitignore
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
2012-02-03 11:24:28 +01:00
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
2012-01-30 19:27:49 +02:00
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
2012-01-30 16:38:43 +02:00
Nikolay Kasyanov
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
2012-01-29 23:41:27 +04:00
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
2012-01-28 11:46:34 +01:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Marc Zinnschlag
baf9cff21d
added customdata base class (issue #185 )
2012-01-24 11:24:05 +01:00
Marc Zinnschlag
6a88133178
Split refdata.hpp in a hpp and a cpp file
...
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117 .
2012-01-22 11:00:40 +01:00
Jacob Essex
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
2012-01-21 16:59:08 +00:00
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
2012-01-17 15:37:51 +01:00
gugus
dd14368f76
correct CMake
2011-12-11 11:24:25 +01:00
Jason Hooks
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
2011-11-24 01:48:54 -05:00
Marc Zinnschlag
0f4adc39b3
added animation-related script instructions
2011-11-21 14:08:44 +01:00
Jason Hooks
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
2011-11-16 21:15:49 -05:00
Jason Hooks
c25b49d2b6
refdata change
2011-11-08 22:59:39 -05:00
Jason Hooks
469086747e
Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed
2011-11-07 23:35:39 -05:00
Marc Zinnschlag
cb1373a4c7
rewrote cmake scripts for components
2011-11-06 09:30:15 +01:00
Jason Hooks
f1bc5b0ab6
Objects started, RenderingInterface
2011-10-31 23:59:16 -04:00
Jason Hooks
db73487623
Physics fix and cmake changes
2011-10-29 18:52:57 -04:00
Marc Zinnschlag
2ee6be1a34
finished cmake cleanup for apps/openmw source files
2011-10-29 13:17:04 +02:00
Marc Zinnschlag
ad086312b8
testing: cmake script simplification
2011-10-22 13:55:06 +02:00
Marc Zinnschlag
10778d8c3e
Issue #19 : factored out local script handling into a separate class
...
This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)
2011-10-06 12:30:30 +02:00
Marc Zinnschlag
e8632a799d
Feature #28 : refactored out cell management into a separate class
2011-09-08 11:02:55 +02:00
Marc Zinnschlag
0a2979caf2
more cleanup
2011-08-27 10:45:09 +02:00
Sebastian Wick
54724d7e7f
start RenderingManager
2011-08-07 16:40:01 +02:00
Sebastian Wick
4b846a54f1
PhysicsSystem
2011-08-01 15:55:36 +02:00
Sebastian Wick
e7057bed29
moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals
2011-07-31 17:07:11 +02:00
Marc Zinnschlag
27cba6c624
created config.hpp file for appps/openmw
2011-07-08 14:39:23 +02:00
Sebastian Wick
5198de53b8
add the new header to the cmake script
2011-06-16 15:16:35 +02:00
Sebastian Wick
84c19a90ad
deleted needless code
2011-06-14 18:29:20 +02:00
Marc Zinnschlag
58cbdfd762
Merge branch 'journal'
2011-04-28 10:27:18 +02:00
Marc Zinnschlag
7131c08ca4
moved path.hpp/path.cpp to a new component
2011-04-28 09:39:40 +02:00
Marc Zinnschlag
7a1b215b6a
splitting of topic class from quest class
2011-04-26 20:39:59 +02:00
Marc Zinnschlag
944291d34f
added quest tracking to the journal
2011-04-26 20:08:37 +02:00
Marc Zinnschlag
5851e0a28c
added journal entry struct
2011-04-19 10:54:11 +02:00
Marc Zinnschlag
e4a0702bb4
added journal-related script instructions
2011-04-04 14:49:26 +02:00
Marc Zinnschlag
190f77f6c9
added journal class
2011-04-04 11:16:56 +02:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
2a53afc2bf
Move StatsWindow class to it's own file.
2011-03-12 10:56:10 +01:00
Nikolay Kasyanov
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
2011-03-12 03:00:42 +03:00
