77201d05bc
post-merge fix
13 years ago
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
10d4771550
Merge remote branch 'corristo/osx-packaging'
13 years ago
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
13 years ago
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
13 years ago
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
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
13 years ago
a0ac6e5150
cells were sometimes not fully loaded
13 years ago
eea8773be1
Changed the order of preference for the configuration files
13 years ago
bc71fb47e0
minor fix
13 years ago
17b1546dc1
Changed the way screenshots are created (Bug #191 )
13 years ago
bb7730a708
Merge branch 'lightfix'
13 years ago
597e670eef
corrected the light problem
13 years ago
00ac2deefb
Merge remote branch 'pvdk/cmakeogre' into cmakeogre
13 years ago
b878c87ba8
Merge branch 'renderingfix'
13 years ago
c4e028effe
fixing a faulty include
13 years ago
0b0254d30e
spelling fix
13 years ago
784c6fe0ff
some cleanup
13 years ago
e1600d9a2a
fixed movable object cleanup for ordinary objects
13 years ago
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
13 years ago
ee02154805
lights without a mesh were not rendered
13 years ago
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
4bc7051741
Finished refactoring, brought CharacterCreation up to standards
13 years ago
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
13 years ago
ed5892eb5c
Finished moving the bulk of character creation code
13 years ago
d17ba6ce19
Forgot the CharacterCreation files
13 years ago
4b758376be
Created a class for char gen, and starting moving code to it
13 years ago
78b6ceabc7
Merge branch 'refdata' into equipment
13 years ago
e19cea3e7b
Merge branch 'refdata' into next
13 years ago
a4785ffc4f
minor fix
13 years ago
2d0e83a2cf
Reversing changes
13 years ago
d2b3c1dbac
Collision may be working correctly
13 years ago
9c73fa6b6d
Physics sort of fixed
13 years ago
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
5a70f28f47
removed a warning
13 years ago
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
81d0d58346
Merge remote branch 'mirc/master' into openengine
13 years ago
daa8fb15ce
Removed all physics-related code from Engine
13 years ago
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
13 years ago
1da519a914
Some cleanup
13 years ago
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
f2972b1ca0
turned ContainerStore from a template into a simple struct
13 years ago
ea241d85ef
Fixed some issues with the CMake files
13 years ago
8de6761a79
general cleanup
13 years ago
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
b0256cea34
replaced movement settings in ref data with new custom data implementation
13 years ago
aa87bd4030
replaced creature stats in ref data with new custom data implementation
13 years ago
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
c6761e3470
replaced NPC stats in ref data with new custom data implementation
13 years ago
6de0847b86
Slightly better performance on animation
13 years ago
baf9cff21d
added customdata base class (issue #185 )
13 years ago
4b6cd582a7
removed some redundant (and misplaced) functions
13 years ago
26c328e73f
added some more comments to avoid further confusion
13 years ago
16bc374921
animation updates were hooked up to the wrong update function
13 years ago
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
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
406897aa64
Issue #168 - Configuration cleanup - WIP
...
Sources update.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
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
bcf3e45ff6
Proper buffer designation
13 years ago
0c2de2c00c
Merge branch 'animation2'
13 years ago
9b910dda94
clean up
13 years ago
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
13 years ago
f5a82931b6
some cleanup
13 years ago
e73640e720
Improved code, added labels to the counter
13 years ago
484b8a95f0
removed useless std::cout
13 years ago
3b15170d09
Cleaned up and simplified the code relating to the fps display
13 years ago
eb4dea3d87
Previous/Next button implemented
13 years ago
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
13 years ago
e35aee0f89
Disjointed free part fix
13 years ago
41769f202c
Huge Performance Increase
13 years ago
d1793bc4bd
Animation files in the correct directory
13 years ago
0712bba49b
Changing a few things around with handleshapes
13 years ago
9031f62962
The journal is now in the center of the screen.
13 years ago
5e1cc07ee8
Fixed ancestor ghost crash
13 years ago
eab69f18ac
File output switch
13 years ago
7fde576dd9
actor physics again
13 years ago
a615369189
Warning and different physics
13 years ago
295eb27c2d
Better Text Indices; Better file output
13 years ago
859ac1153e
Basic Text Indices Working
13 years ago
0715f9b6ab
Preparing to use text indices
13 years ago
595d0b1192
Cleanup; warnings
13 years ago
c2fa82326d
Animation with physics attempt
13 years ago
45c57721ff
Turning off hardware skinning2
13 years ago
1d2e77d947
Turning off hardware skinning
13 years ago
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
a4c6d948d4
Disabling normal updates
13 years ago
289b8f667e
Various npc heights
13 years ago
f7d26b2695
Scaling for wood elves
13 years ago
497d994525
female argonian fix
13 years ago
428d0ce820
journal formating. Problems with french accents.
13 years ago
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
d59284a096
first attempt to read the journal
13 years ago
33f8049a36
accessing topic index didn't work
13 years ago
42e7ff9b13
Introducing loops; SkipAnim; Skeleton reset bug fixed
13 years ago
c8cca06b40
unlocking change and stop change
13 years ago
8c3127367a
Npc Optimization
13 years ago
cef2f5e927
Trying to get code to conform with older c++
13 years ago
d855bb4fc6
physics reenabled
13 years ago
c399f4f210
Fixing a few things
13 years ago
1a90f4241b
Npc Animation Working
13 years ago
a6b88b48ec
A different way
13 years ago
653d999ac4
Animation creatures
13 years ago
88c427543b
Deleting animations; Empty Functions/Planning
13 years ago
7eee54bcd7
More physics and managing of Animation objects
13 years ago
1b835d6702
Cell changing fixes
13 years ago
7cf3fc8991
handleAnimationTransforms
13 years ago
6d10c76b06
Unique Identifiers for Creatures and NPC Free Parts
13 years ago
93a4060346
Switching handleShapes to use sets instead of maps
13 years ago
d51dfebde1
NPCs fully rendered
13 years ago
47112ad7f9
Changing a lot of things
13 years ago
509009e5c1
Putting the actors in a list
13 years ago
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
13 years ago
dd14368f76
correct CMake
13 years ago
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
13 years ago
7a3bc885d0
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
39338f4be1
NPC bounded parts
13 years ago
5c48d8fc1e
more stuff
13 years ago
ee98a2af1a
Empty npcs
13 years ago
4087ab3cda
correct CMake and add some text formating attempt.
13 years ago
62946cc79d
can now clear text.
13 years ago
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
13 years ago
835c3f2603
Working towards npc rendering
13 years ago
7bd911b401
Problems with handles
13 years ago
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
13 years ago
0d3338f867
Some naming changes
13 years ago
51d9c2c780
fixed argument type in ai related script instructions
13 years ago
0f4adc39b3
added animation-related script instructions
13 years ago
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
7385948056
Yet another crash fix
13 years ago
d8367f4968
Activation fix
13 years ago
7319f7a8c6
Many bugs fixed related to changing cells
13 years ago
15fcdc8b72
Physics working
13 years ago
b3e1044699
Exterior cells
13 years ago
4dc59dfbdd
Scenenode flip
13 years ago
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
13 years ago
9b94074472
addObject
13 years ago
58f103a75c
Adding new insertCellRefList;Collection switched to a set
13 years ago
bc06d13d30
Removing backups
13 years ago
dd46694059
Changing a lot of things in scene and world
13 years ago
db57f0a1a5
more corrections
13 years ago
bc58ef28cd
Made corrections
13 years ago
0b3bb2719f
Fixing some errors
13 years ago
c7dadec840
Updating the rest of mwclass
13 years ago
62d8d1add2
more recommended changes
13 years ago
746c3dc297
Added some minor documentation
13 years ago
f4e7bd6dfd
Made some recommended changes
13 years ago
3779aaba62
Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule
13 years ago
042bceb547
Changes to insertObjectRendering; Proposed insertObject
13 years ago
1faa07b279
insertObjectRendering proposed
13 years ago
Marc Zinnschlag
Nikolay Kasyanov
Lukasz Gromanowski
Pieter van der Kloet
gugus
Cris Mihalache
Jason Hooks
Jacob Essex
Jason Hooks