Marc Zinnschlag
1b368506d4
Merge remote branch 'pvdk/filedialog'
2012-06-20 16:05:20 +02:00
Pieter van der Kloet
d162445e68
Got rid of some unwanted warnings and did some cleanup on the launcher
2012-06-20 13:35:05 +02:00
Marc Zinnschlag
95d9c99d0d
Merge remote branch 'pvdk/filedialog'
2012-06-20 09:28:43 +02:00
Pieter van der Kloet
e21442f6cc
Fix for Bug #306 : launcher now creates the config dir and returns proper error codes
2012-06-20 02:28:49 +02: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
Marc Zinnschlag
511d0c0e1c
Merge remote branch 'scrawl/rendererselection'
2012-06-19 16:04:48 +02:00
scrawl
61ec56debc
don't add duplicate resolutions
2012-06-19 16:02:28 +02:00
scrawl
c9e76d3e90
remove extra tokens at the end of the resolution string, if present
2012-06-19 15:57:58 +02:00
scrawl
ff278ab4ec
chargen generate class: fix result not being shown in review dialog
2012-06-19 15:25:04 +02:00
scrawl
0aa01b93e2
don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter)
2012-06-19 15:24:52 +02:00
Marc Zinnschlag
9a6f012578
Merge branch 'script'
2012-06-19 11:07:47 +02:00
Jason Hooks
4d55ecfdbe
Deleting scaled shapes; scaleObject()
2012-06-18 13:03:00 -04:00
Marc Zinnschlag
09057daac5
Merge remote branch 'scrawl/containerunlocking'
2012-06-18 09:57:22 +02:00
Jason Hooks
33fe80723c
btScaledBvhTriangleMeshShapes
2012-06-17 20:56:10 -04:00
scrawl
de3daf3dc1
allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind
2012-06-18 00:21:55 +02:00
Marc Zinnschlag
4a726f272b
Merge remote branch 'pvdk/filedialog'
2012-06-17 09:58:39 +02:00
Marc Zinnschlag
badb20e5df
Merge remote branch 'scrawl/rendererselection'
2012-06-17 09:54:18 +02:00
Pieter van der Kloet
f81e127701
Created custom directory dialog which only accepts Data Files dirs
2012-06-17 06:48:32 +02:00
scrawl
b831c3313d
render system was not written on launcher exit
2012-06-17 00:47:45 +02:00
Marc Zinnschlag
3c42a71dae
removed some cout spam
2012-06-16 16:42:35 +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
ea29b74bb4
added per NPC/creature basic AI-settings (hello, fight, flee, alarm)
2012-06-16 16:17:42 +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
0795730a19
Merge branch 'xdoty' into script
2012-06-16 14:57:13 +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
5397b9dba6
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
2012-06-16 11:38:07 +02:00
gugus
974585d357
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
2012-06-15 14:53:58 +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
scrawl
584ae30213
don't show diseases and curses in the spell list
2012-06-15 10:09:46 +02:00
Marc Zinnschlag
0f71439991
Merge remote branch 'garvek/master'
2012-06-15 08:22:56 +02:00
Jason Hooks
897a331244
NPC activation
2012-06-13 12:21:51 -04:00
Jason Hooks
20288de685
Post merge
2012-06-11 15:39:57 -04:00
Jason Hooks
b14c132a31
Merging in the latest master
2012-06-11 13:25:06 -04:00
Jason Hooks
595b0729da
Few things changed
2012-06-10 21:08:58 -04:00
Pieter van der Kloet
0bcec32c70
Changed launcher logo to the new one done by Necrod
2012-06-11 02:50:29 +02:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d
Changing transformation processing
2012-06-09 15:19:15 -04:00
scrawl
447158e9d6
shutdown crash fix
2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
fc3a3fc173
MSVC build compliance:
...
- static const float member is not ISO
- callback do not match DLL signature
2012-06-08 19:55:39 +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
