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 |
|
gugus
|
410b693555
|
setAngle improvement
|
2012-07-10 11:15:46 +02:00 |
|
Marc Zinnschlag
|
a207c86fd1
|
Issue #324: added some range checks
|
2012-07-09 21:14:11 +02:00 |
|
Marc Zinnschlag
|
67c1c5ce18
|
Issue #324: adjusted setSkill script instructions according to the recent research
|
2012-07-09 20:42:45 +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
|
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 |
|
Marc Zinnschlag
|
d30ba14a17
|
Issue #324: Finished turning NpcStats into a proper class
|
2012-07-06 18:23:48 +02:00 |
|
Marc Zinnschlag
|
205ed0ce5b
|
post merge fix
|
2012-07-03 15:53:42 +02:00 |
|
Marc Zinnschlag
|
cc7c6aa0ad
|
Merge branch 'decouple'
|
2012-07-03 15:47:57 +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
|
efb95e2f83
|
Issue #317: check if spell actually exist in AddSpell
|
2012-07-02 14:25:46 +02:00 |
|
Marc Zinnschlag
|
e2a77037eb
|
fixed a type in a script instruction
|
2012-06-16 16:38:54 +02:00 |
|
Marc Zinnschlag
|
8283f5f135
|
added setHello/Fight/Flee/Alarm instructions
|
2012-06-16 16:31:32 +02:00 |
|
Marc Zinnschlag
|
7454713a9b
|
addet provisional implementation of AiWander (doesn't do anything yet)
|
2012-06-16 16:06:15 +02:00 |
|
Marc Zinnschlag
|
b16157a618
|
documentation fix
|
2012-06-16 15:49:39 +02:00 |
|
Marc Zinnschlag
|
3167ae9473
|
added force/clearforce instructions for run and sneak
|
2012-06-16 15:49:03 +02:00 |
|
Marc Zinnschlag
|
10b27e582b
|
Issue #181: various fixed to member variable access
|
2012-06-16 13:51:13 +02:00 |
|
Marc Zinnschlag
|
6c5b21fa42
|
Issue #181: Member variable access in expressions; error reporting fix for the previous commit
|
2012-06-16 13:06:23 +02:00 |
|
Marc Zinnschlag
|
6a89d76321
|
Issue #181: Improved script error reporting for local and global scripts
|
2012-06-16 11:52:35 +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 |
|
Marc Zinnschlag
|
eb0be10e80
|
Merge branch 'script' into xdoty
|
2012-06-07 13:00:01 +02:00 |
|
Marc Zinnschlag
|
ff84fbbfa7
|
Added DontSaveObject script instruction
We are ignoring it for now and unless users protest we will probably keep it that way.
|
2012-06-07 12:36:51 +02:00 |
|
Marc Zinnschlag
|
72fca40090
|
Issue #181: member variable access in interpreter context
|
2012-06-07 11:59:45 +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 |
|
gugus
|
a711a3ebe1
|
Various fixes
|
2012-05-29 16:45:43 +02:00 |
|
gugus
|
f83ffecae5
|
SetAngle and SetScale script instruction
|
2012-05-29 15:57:13 +02:00 |
|
gugus
|
77084b27c0
|
some work for rotation/scaling
|
2012-05-28 16:01:35 +02:00 |
|
scrawl
|
7ebbc099b3
|
allow stacking gui modes
|
2012-05-23 12:23:35 +02:00 |
|
Marc Zinnschlag
|
7938566004
|
Merge remote branch 'scrawl/graphics'
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-05-21 11:24:36 +02:00 |
|
scrawl
|
bda90b77bc
|
oops, forgot something
|
2012-05-21 10:59:06 +02:00 |
|
scrawl
|
157dd81524
|
removed script instruction, will be in the settings window later
|
2012-05-21 10:57:49 +02:00 |
|
Marc Zinnschlag
|
3e85151c9d
|
Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-05-21 10:13:27 +02:00 |
|
scrawl
|
76d71f86bc
|
fixed a faction case folding issue
|
2012-05-21 03:10:55 +02:00 |
|
scrawl
|
ee884634b9
|
fixed item refID handling in the dialogue manager and container script extensions.
|
2012-05-19 13:19:26 +02:00 |
|
scrawl
|
471f6467ec
|
Merge branch 'master' into graphics
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-05-13 16:18:22 +02:00 |
|
scrawl
|
c4aae96d94
|
implemented "goodbye" script function that force-cancels dialogue
|
2012-05-11 07:18:41 +02:00 |
|
scrawl
|
aaa81397ed
|
Merge branch 'master' into graphics
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-04-30 18:24:05 +02:00 |
|
scrawl
|
11ebae3be2
|
toggleCompositors command useful for debugging
|
2012-04-29 03:33:10 +02:00 |
|
scrawl
|
1b5bfc52a1
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
|
2012-04-24 02:02:03 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
Marc Zinnschlag
|
7102a825c2
|
Issue 255: moved global scripts into script manager (simplifying the environment class)
|
2012-04-23 11:15:47 +02:00 |
|
scrawl
|
f5ab127a39
|
toggleFullHelp
|
2012-04-16 15:00:44 +02:00 |
|
Marc Zinnschlag
|
b5d12d0723
|
fixed ForceGreeting
|
2012-04-15 17:08:22 +02:00 |
|
gugus
|
c24a85848f
|
forceGreeting script instruction
|
2012-04-15 15:56:36 +02:00 |
|
gugus
|
f68248e0d0
|
corrected a bug in getPCRank
|
2012-04-15 14:20:08 +02:00 |
|
gugus
|
45a5877b23
|
implement getPCRank. Does not work yet.
|
2012-04-15 12:05:46 +02:00 |
|
Marc Zinnschlag
|
3442ef17a8
|
fixed ModDisposition
|
2012-04-13 14:54:13 +02:00 |
|