scrawl
91ffacbb6d
added moon phases
13 years ago
scrawl
10ca67c0a5
fixed the sky elements positioning delay (nodes are now children of the camera node)
13 years ago
scrawl
2d8b0a4ac0
merged the sky manager implementation with its interface
13 years ago
Marc Zinnschlag
b2b09320fc
Merge branch 'config'
13 years ago
Marc Zinnschlag
547d6a0639
Merge remote branch 'lgro/config' into config
13 years ago
scrawl
694a537b57
- removed caelum sources, resources, build scripts
13 years ago
scrawl
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
13 years ago
scrawl
6aac3d4b77
- removed caelum (we can get it from the git history, if needed)
...
- added code for moon rendering (they are not visible by default)
13 years ago
scrawl
090c0586a0
leak fix
13 years ago
scrawl
6d37f53fa2
- abstracted the sun creation code into a CelestialBody class to be reused for the moons
...
- fixed render queue problem
13 years ago
scrawl
ad0f9f4bcf
fixed the sun rendering (rendered without depth check)
13 years ago
scrawl
3b3218d907
fixed 3 gcc warnings in sky.cpp
13 years ago
scrawl
8b5da06fce
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
13 years ago
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag
1beaea0115
forgot to add cone file
13 years ago
Marc Zinnschlag
781b16a00e
removed bCollision variable from World
13 years ago
Marc Zinnschlag
7eae24bb45
some fixes
13 years ago
Marc Zinnschlag
4a16553acc
replaced an include with a forward declaration
13 years ago
Marc Zinnschlag
e3e6b3809f
added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)
13 years ago
scrawl
c884f70a61
added sun rendering (unfinished)
13 years ago
Lukasz Gromanowski
0c0b594090
Issue #168 - Configuration cleanup
...
Removed unnecessary path methods - according to forum disscusion:
http://openmw.org/forum/viewtopic.php?f=6&t=448
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks
7e1e746201
More changes
13 years ago
scrawl
705d85e7d1
Merge branch 'next' into weather
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
scrawl
60856b46e6
moved the renderer update call from OMW::Engine to RenderingManager
13 years ago
scrawl
1d9f0f4813
added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)
13 years ago
Jason Hooks
38a0d1d1c5
Merging in master
13 years ago
Jason Hooks
e330c22d68
Removing unneeded files
13 years ago
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
13 years ago
scrawl
457d9fd9f8
updated vmformat.txt
13 years ago
scrawl
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
13 years ago
scrawl
899aa5b870
fix last commit, also reacts to ToggleWireframe and not only twf
13 years ago
scrawl
40e23fe26f
added twf console command
13 years ago
gugus
9716199d18
script "fix". I'm waiting for you Zini^^
13 years ago
gugus
c0bd86ce44
scripts. Not tested
13 years ago
gugus
232e478768
Fix for prefix/suffix stuff
13 years ago
Marc Zinnschlag
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
13 years ago
Nikolay Kasyanov
2020d916ec
added missing comment
13 years ago
Nikolay Kasyanov
57a4b19880
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
13 years ago
Marc Zinnschlag
9af08ff18d
store screenshots in user directory instead of local directory
13 years ago
Marc Zinnschlag
77201d05bc
post-merge fix
13 years ago
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
Marc Zinnschlag
10d4771550
Merge remote branch 'corristo/osx-packaging'
13 years ago
Marc Zinnschlag
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
13 years ago
Nikolay Kasyanov
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
13 years ago
gugus
bc72b2d535
fixed text color
13 years ago
Lukasz Gromanowski
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag
d66b6743f4
minor fix
13 years ago
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
13 years ago
Marc Zinnschlag
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
13 years ago
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
13 years ago
gugus
4d4ae41a4a
greetings are working now
13 years ago
gugus
4658ec276f
increased the max size of the text of the dialogue
13 years ago
gugus
eee5d20809
a little fix
13 years ago
gugus
f1dc360720
added the script instruction addTopic
13 years ago
gugus
554bf8e586
Improvement in the dialogue manager
13 years ago
Pieter van der Kloet
eea8773be1
Changed the order of preference for the configuration files
13 years ago
Marc Zinnschlag
bc71fb47e0
minor fix
13 years ago
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
13 years ago
gugus
94ab65f8bb
fixe a compiling error?
13 years ago
gugus
ea8335a393
addTopic function
13 years ago
Marc Zinnschlag
bb7730a708
Merge branch 'lightfix'
13 years ago
gugus
597e670eef
corrected the light problem
13 years ago
Marc Zinnschlag
00ac2deefb
Merge remote branch 'pvdk/cmakeogre' into cmakeogre
13 years ago
Marc Zinnschlag
b878c87ba8
Merge branch 'renderingfix'
13 years ago
gugus
e7ef39cabc
more improvements to dialogue filters. Some of them are still missing.
13 years ago
gugus
f76e0e1941
corrected the light problem
13 years ago
Marc Zinnschlag
c4e028effe
fixing a faulty include
13 years ago
Marc Zinnschlag
0b0254d30e
spelling fix
13 years ago
Marc Zinnschlag
784c6fe0ff
some cleanup
13 years ago
Marc Zinnschlag
e1600d9a2a
fixed movable object cleanup for ordinary objects
13 years ago
Marc Zinnschlag
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
13 years ago
gugus
c65c160e7b
finished connecting the dialogue GUI and the dialogue manager
13 years ago
gugus
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
13 years ago
Marc Zinnschlag
ee02154805
lights without a mesh were not rendered
13 years ago
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
13 years ago
Cris Mihalache
4bc7051741
Finished refactoring, brought CharacterCreation up to standards
13 years ago
Nikolay Kasyanov
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
13 years ago
Cris Mihalache
ed5892eb5c
Finished moving the bulk of character creation code
13 years ago
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
13 years ago
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
13 years ago
Marc Zinnschlag
78b6ceabc7
Merge branch 'refdata' into equipment
13 years ago
Marc Zinnschlag
e19cea3e7b
Merge branch 'refdata' into next
13 years ago
Marc Zinnschlag
a4785ffc4f
minor fix
13 years ago
Jason Hooks
2d0e83a2cf
Reversing changes
13 years ago
Jason Hooks
d2b3c1dbac
Collision may be working correctly
13 years ago
Jason Hooks
9c73fa6b6d
Physics sort of fixed
13 years ago
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)
13 years ago
Marc Zinnschlag
5a70f28f47
removed a warning
13 years ago
Lukasz Gromanowski
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag
81d0d58346
Merge remote branch 'mirc/master' into openengine
13 years ago
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
13 years ago
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
13 years ago
Jason Hooks
1da519a914
Some cleanup
13 years ago
gugus
5cbd256e1c
"full" question support. Now needs to be linked with the dialogue Manager.
13 years ago
gugus
debec44b51
better colors (not perfect yet), and some basic question support (not finished yet).
13 years ago
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
Marc Zinnschlag
f2972b1ca0
turned ContainerStore from a template into a simple struct
13 years ago
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
13 years ago
Marc Zinnschlag
8de6761a79
general cleanup
13 years ago
Marc Zinnschlag
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
gugus
f7cf5f9bef
improved the dialogue GUI. Questions are still missing.
13 years ago
Marc Zinnschlag
b0256cea34
replaced movement settings in ref data with new custom data implementation
13 years ago
Marc Zinnschlag
aa87bd4030
replaced creature stats in ref data with new custom data implementation
13 years ago
Lukasz Gromanowski
1d96b99532
Issue #168 - Configuration cleanup
...
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag
c6761e3470
replaced NPC stats in ref data with new custom data implementation
13 years ago
Jason Hooks
6de0847b86
Slightly better performance on animation
13 years ago
Marc Zinnschlag
baf9cff21d
added customdata base class (issue #185 )
13 years ago
Marc Zinnschlag
4b6cd582a7
removed some redundant (and misplaced) functions
13 years ago
Marc Zinnschlag
26c328e73f
added some more comments to avoid further confusion
13 years ago
Marc Zinnschlag
16bc374921
animation updates were hooked up to the wrong update function
13 years ago
Marc Zinnschlag
7439c83623
Added custom copy-constructor, assignment-operator and destructor for RefData
...
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117 .
13 years ago
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 .
13 years ago
Lukasz Gromanowski
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Lukasz Gromanowski
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks
bcf3e45ff6
Proper buffer designation
13 years ago
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
13 years ago
Marc Zinnschlag
9b910dda94
clean up
13 years ago
Marc Zinnschlag
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
13 years ago
Marc Zinnschlag
f5a82931b6
some cleanup
13 years ago
Jacob Essex
e73640e720
Improved code, added labels to the counter
13 years ago
gugus
484b8a95f0
removed useless std::cout
13 years ago
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
13 years ago
gugus
eb4dea3d87
Previous/Next button implemented
13 years ago
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
13 years ago
Jason Hooks
e35aee0f89
Disjointed free part fix
13 years ago
Jason Hooks
41769f202c
Huge Performance Increase
13 years ago
Jason Hooks
d1793bc4bd
Animation files in the correct directory
13 years ago
Jason Hooks
0712bba49b
Changing a few things around with handleshapes
13 years ago
gugus
9031f62962
The journal is now in the center of the screen.
13 years ago
Jason Hooks
5e1cc07ee8
Fixed ancestor ghost crash
13 years ago
Jason Hooks
eab69f18ac
File output switch
13 years ago
Jason Hooks
7fde576dd9
actor physics again
13 years ago
Jason Hooks
a615369189
Warning and different physics
13 years ago
Jason Hooks
295eb27c2d
Better Text Indices; Better file output
13 years ago
Jason Hooks
859ac1153e
Basic Text Indices Working
13 years ago
Jason Hooks
0715f9b6ab
Preparing to use text indices
13 years ago
Jason Hooks
595d0b1192
Cleanup; warnings
13 years ago
Jason Hooks
c2fa82326d
Animation with physics attempt
13 years ago
Jason Hooks
45c57721ff
Turning off hardware skinning2
13 years ago
Jason Hooks
1d2e77d947
Turning off hardware skinning
13 years ago
Jason Hooks
762727308e
Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)
13 years ago
Jason Hooks
a4c6d948d4
Disabling normal updates
13 years ago
Jason Hooks
289b8f667e
Various npc heights
13 years ago
Jason Hooks
f7d26b2695
Scaling for wood elves
13 years ago
Jason Hooks
497d994525
female argonian fix
13 years ago
gugus
428d0ce820
journal formating. Problems with french accents.
13 years ago
gugus
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
gugus
d59284a096
first attempt to read the journal
13 years ago
Marc Zinnschlag
33f8049a36
accessing topic index didn't work
13 years ago
Jason Hooks
42e7ff9b13
Introducing loops; SkipAnim; Skeleton reset bug fixed
13 years ago
Jason Hooks
c8cca06b40
unlocking change and stop change
13 years ago
Jason Hooks
8c3127367a
Npc Optimization
13 years ago
Jason Hooks
cef2f5e927
Trying to get code to conform with older c++
13 years ago
Jason Hooks
d855bb4fc6
physics reenabled
13 years ago
Jason Hooks
c399f4f210
Fixing a few things
13 years ago
Jason Hooks
1a90f4241b
Npc Animation Working
13 years ago
Jason Hooks
a6b88b48ec
A different way
13 years ago
Jason Hooks
653d999ac4
Animation creatures
13 years ago
Jason Hooks
88c427543b
Deleting animations; Empty Functions/Planning
13 years ago
Jason Hooks
7eee54bcd7
More physics and managing of Animation objects
13 years ago
Jason Hooks
1b835d6702
Cell changing fixes
13 years ago
Jason Hooks
7cf3fc8991
handleAnimationTransforms
13 years ago
Jason Hooks
6d10c76b06
Unique Identifiers for Creatures and NPC Free Parts
13 years ago
Jason Hooks
93a4060346
Switching handleShapes to use sets instead of maps
13 years ago
Jason Hooks
d51dfebde1
NPCs fully rendered
13 years ago
Jason Hooks
47112ad7f9
Changing a lot of things
13 years ago
Jason Hooks
509009e5c1
Putting the actors in a list
13 years ago
Jason Hooks
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
13 years ago
gugus
dd14368f76
correct CMake
13 years ago
gugus
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
gugus
7a3bc885d0
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
Jason Hooks
39338f4be1
NPC bounded parts
13 years ago
Jason Hooks
5c48d8fc1e
more stuff
13 years ago
Jason Hooks
ee98a2af1a
Empty npcs
13 years ago
gugus
4087ab3cda
correct CMake and add some text formating attempt.
13 years ago
gugus
62946cc79d
can now clear text.
13 years ago
gugus
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
13 years ago
Jason Hooks
835c3f2603
Working towards npc rendering
13 years ago
Jason Hooks
7bd911b401
Problems with handles
13 years ago
Jason Hooks
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
13 years ago
Jason Hooks
0d3338f867
Some naming changes
13 years ago
Marc Zinnschlag
51d9c2c780
fixed argument type in ai related script instructions
13 years ago
Marc Zinnschlag
0f4adc39b3
added animation-related script instructions
13 years ago
Marc Zinnschlag
51d5c7cd59
Merge remote branch 'jhooks/mwrender' into mwrender
...
Conflicts:
apps/openmw/engine.cpp
- fixed code that did not compile
- removed tons of tabs
- more clean up
13 years ago
Jason Hooks
7385948056
Yet another crash fix
13 years ago
Jason Hooks
d8367f4968
Activation fix
13 years ago
Jason Hooks
7319f7a8c6
Many bugs fixed related to changing cells
13 years ago
Jason Hooks
15fcdc8b72
Physics working
13 years ago
Jason Hooks
b3e1044699
Exterior cells
13 years ago
Jason Hooks
4dc59dfbdd
Scenenode flip
13 years ago
Jason Hooks
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
13 years ago
Jason Hooks
9b94074472
addObject
13 years ago
Jason Hooks
58f103a75c
Adding new insertCellRefList;Collection switched to a set
13 years ago
Jason Hooks
bc06d13d30
Removing backups
13 years ago
Jason Hooks
dd46694059
Changing a lot of things in scene and world
13 years ago
Jason Hooks
db57f0a1a5
more corrections
13 years ago
Jason Hooks
bc58ef28cd
Made corrections
13 years ago
Jason Hooks
0b3bb2719f
Fixing some errors
13 years ago
Jason Hooks
c7dadec840
Updating the rest of mwclass
13 years ago
Jason Hooks
62d8d1add2
more recommended changes
13 years ago
Jacob Essex
746c3dc297
Added some minor documentation
13 years ago
Jason Hooks
f4e7bd6dfd
Made some recommended changes
13 years ago
Jacob Essex
3779aaba62
Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule
13 years ago
Jason Hooks
042bceb547
Changes to insertObjectRendering; Proposed insertObject
13 years ago
Jason Hooks
1faa07b279
insertObjectRendering proposed
13 years ago
Jason Hooks
a7652bcb0c
Yacoby's changes on Objects
13 years ago
Jason Hooks
c25b49d2b6
refdata change
13 years ago
Jason Hooks
469086747e
Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed
13 years ago
Jacob Essex
9aac625000
Changes to move the mutable ESM::Position data to RefData
13 years ago
Marc Zinnschlag
9794c4b928
Merge branch 'cmake'
13 years ago
Marc Zinnschlag
cb1373a4c7
rewrote cmake scripts for components
13 years ago
Jason Hooks
c11b3a57c1
Made buildStaticGeometry function
13 years ago
Jason Hooks
8edcd4d15b
removing tabs
13 years ago
Jason Hooks
6c80e75deb
More Objects functionality
13 years ago
Jason Hooks
e041006063
Adding light and fog functions
13 years ago
Jason Hooks
edf85b26f9
Insert Mesh, Insert Light, insertBegin improved
13 years ago
Marc Zinnschlag
4e25200844
fixed usage of Qt exit
13 years ago
Jason Hooks
9ac627c931
Commenting out assert
13 years ago
Jason Hooks
d49a02abe5
new insertBegin()
13 years ago
Jacob Essex
0e3859385d
Now ensures that the directory to the config file exists before Ogre tries to access it
13 years ago
Jason Hooks
c2181d2091
Dealing with scenenodes
13 years ago
Jason Hooks
5822221ae1
Made recommended changes
13 years ago
Jason Hooks
3d43a4cd33
Made recommended changes
13 years ago
Jason Hooks
f1bc5b0ab6
Objects started, RenderingInterface
13 years ago
Jason Hooks
3761271c59
Empty creature, objects, npc
13 years ago
Jason Hooks
86d3cec1aa
Changing refdata3
13 years ago
Jason Hooks
15fae749ae
Changing refdata2
13 years ago
Jason Hooks
e1558e8e14
Changing refdata
13 years ago
Jason Hooks
1083db5582
Hiding debugging
13 years ago
Jason Hooks
db73487623
Physics fix and cmake changes
13 years ago
Jason Hooks
ee923e1abe
Testing
13 years ago
Marc Zinnschlag
2ee6be1a34
finished cmake cleanup for apps/openmw source files
13 years ago
Marc Zinnschlag
583e7221ef
silenced a warning and removed some tabs
13 years ago
Marc Zinnschlag
33ecd8b66c
fixed collision toggling bug
13 years ago
Jason Hooks
c3a492bf74
Debugging file renamed
13 years ago
Jason Hooks
d4f63443e6
Hiding the rendering manager; crash eliminated
13 years ago
Jason Hooks
965ff24597
Removing Object:
13 years ago
Jason Hooks
0c8aa7fae3
Removing Object:
13 years ago
Jason Hooks
6efc61b9df
Removal of MWScene; Object listing fixed
13 years ago
Marc Zinnschlag
ad086312b8
testing: cmake script simplification
13 years ago
Jason Hooks
30ba9b74da
Simple Debugging class
13 years ago
Jason Hooks
47593f3641
Removing old files
13 years ago
Jason Hooks
fcf404d27b
GetFacedHandle in Physics. RenderingManager constructor code added
13 years ago
Jason Hooks
3315de8b4a
Naming convention change
13 years ago
Jason Hooks
d0f922ec5d
Moved SkyManager creation
13 years ago
Jason Hooks
0992f1e903
Applying Gus's Windows fix
13 years ago
Jason Hooks
9126bb27b6
empty functions
13 years ago
Pieter van der Kloet
5dbbc5bb7b
Changed error handling for Ogre config and made the launcher exit cleanly
13 years ago