Marc Zinnschlag
|
beb18282bb
|
Issue #342: various fixes
|
2012-07-17 16:44:55 +02:00 |
|
Marc Zinnschlag
|
2c70a93553
|
Merge branch 'master' into potions
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2012-07-17 10:32:18 +02:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +02:00 |
|
Marc Zinnschlag
|
29b4a5e5f7
|
Issue #314: added apply actions
|
2012-07-13 09:41:38 +02:00 |
|
Marc Zinnschlag
|
805b81bf6e
|
Issue #314: added skillUsageSucceeded function to Class
|
2012-07-13 09:03:17 +02:00 |
|
Marc Zinnschlag
|
7a2d613043
|
Issue #314: extended Class::apply function to cover the actor
|
2012-07-13 08:50:46 +02:00 |
|
Marc Zinnschlag
|
ec9ebe6b58
|
Merge branch 'skillgain' into potions
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
|
2012-07-10 14:08:30 +02:00 |
|
Marc Zinnschlag
|
f11bf49a90
|
cmake fix; silenced some warnings
|
2012-07-10 13:23:41 +02:00 |
|
gugus
|
164a5c8fe4
|
rotation now also work with the physic representation
|
2012-07-10 12:10:50 +02:00 |
|
gugus
|
70c74ede05
|
changed rotation order
|
2012-07-10 11:53:12 +02:00 |
|
gugus
|
410b693555
|
setAngle improvement
|
2012-07-10 11:15:46 +02:00 |
|
gugus
|
557e114992
|
clean-up + getScale/Angle script instructions
|
2012-07-09 19:28:44 +02:00 |
|
gugus
|
0a67f60a6e
|
Clean-up
|
2012-07-09 18:47:59 +02:00 |
|
gugus
|
e6716c25c3
|
little correction.
|
2012-07-09 15:41:19 +02:00 |
|
gugus
|
feec67094f
|
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
|
2012-07-09 15:23:26 +02:00 |
|
gugus
|
03f7740474
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
|
2012-07-09 10:39:57 +02:00 |
|
Jason Hooks
|
b5edad790d
|
merge
|
2012-07-07 15:27:04 -04:00 |
|
Marc Zinnschlag
|
fe86ce5a2c
|
DrawState workaround
|
2012-07-07 20:53:19 +02:00 |
|
Marc Zinnschlag
|
6277e39216
|
Merge branch 'master' into skillgain
|
2012-07-07 20:27:56 +02:00 |
|
Alexander "Ace" Olofsson
|
113457d934
|
Fixed some windows issues and got rid of a few tiny warnings while at it.
|
2012-07-07 01:14:18 +02:00 |
|
Marc Zinnschlag
|
10723a149b
|
Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC
|
2012-07-06 18:25:16 +02:00 |
|
Marc Zinnschlag
|
d30ba14a17
|
Issue #324: Finished turning NpcStats into a proper class
|
2012-07-06 18:23:48 +02:00 |
|
Marc Zinnschlag
|
771863e73b
|
Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
|
2012-07-06 15:50:26 +02:00 |
|
Marc Zinnschlag
|
c85aaafac2
|
more include cleanup (most removing Ogre.h)
|
2012-07-03 15:32:38 +02:00 |
|
Marc Zinnschlag
|
87667ab57e
|
Issue #107: Ptr related include cleanup
|
2012-07-03 13:55:53 +02:00 |
|
Marc Zinnschlag
|
5a7b95bf7a
|
Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp
|
2012-07-03 13:15:20 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
Marc Zinnschlag
|
035c1c4b6e
|
added World interface class; cleanup of World interface
|
2012-07-03 01:06:38 +02:00 |
|
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
2012-06-29 18:54:23 +02:00 |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
2012-06-29 16:48:50 +02:00 |
|
Marc Zinnschlag
|
83c3972a89
|
Issue #314: added return value to addSpell function
|
2012-06-24 16:23:43 +02:00 |
|
scrawl
|
63ce143a04
|
fix triangle / batch counts with compositors
|
2012-06-22 12:56:04 +02:00 |
|
Marc Zinnschlag
|
89ac0fa232
|
Issue #312: Implemented ID-search caching to speed up some badly written scripts
|
2012-06-21 11:43:18 +02:00 |
|
Jason Hooks
|
5c51674070
|
update
|
2012-06-20 13:14:27 -04:00 |
|
Jason Hooks
|
86d8a07fc7
|
Switching back to old scaling
|
2012-06-19 13:28:06 -04:00 |
|
Marc Zinnschlag
|
1f0efa9f7d
|
Merge remote branch 'scrawl/guifixes'
|
2012-06-19 19:06:18 +02:00 |
|
scrawl
|
15e959868c
|
make some of the gui mode changes a bit safer
|
2012-06-19 17:07:00 +02:00 |
|
Marc Zinnschlag
|
590dfe8d63
|
fixed the container fill problem on cell load
|
2012-06-19 16:42:10 +02:00 |
|
Jason Hooks
|
4d55ecfdbe
|
Deleting scaled shapes; scaleObject()
|
2012-06-18 13:03:00 -04:00 |
|
Jason Hooks
|
33fe80723c
|
btScaledBvhTriangleMeshShapes
|
2012-06-17 20:56:10 -04:00 |
|
gugus
|
5397b9dba6
|
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
|
2012-06-16 11:38:07 +02:00 |
|
gugus
|
01fefca0a3
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-06-15 14:53:19 +02:00 |
|
Jason Hooks
|
20288de685
|
Post merge
|
2012-06-11 15:39:57 -04:00 |
|
scrawl
|
c85c794c86
|
fixed some cppcheck issues
|
2012-06-06 20:29:30 +02:00 |
|
gugus
|
0012d7eb58
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-06-03 12:53:23 +02:00 |
|
scrawl
|
0ba0b2122e
|
set the implicit object for script excution by clicking on it
|
2012-06-02 12:25:24 +02:00 |
|
scrawl
|
36d26e0681
|
set the camera orientation after using teleport doors
|
2012-05-30 15:52:39 +02:00 |
|
Marc Zinnschlag
|
2bbbff2b75
|
Merge remote branch 'scrawl/spellwindow'
|
2012-05-30 10:22:56 +02:00 |
|
scrawl
|
2c90654401
|
fix a typo that caused a crash when trying to disable an already disabled object
|
2012-05-30 09:21:41 +02:00 |
|
gugus
|
a711a3ebe1
|
Various fixes
|
2012-05-29 16:45:43 +02:00 |
|