Marc Zinnschlag
ba38bad46e
Merge remote branch 'scrawl/leakfix'
2012-06-15 17:42:32 +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
scrawl
0b850a2cb5
fix crash introduced by last commit
2012-06-15 09:15:37 +02:00
Marc Zinnschlag
0f71439991
Merge remote branch 'garvek/master'
2012-06-15 08:22:56 +02:00
scrawl
b6744e6195
Merge branch 'master' into leakfix
2012-06-14 21:28:24 +02:00
scrawl
e498495589
fix a leak: physics heightfield was only destroyed on cell change and not on exit
2012-06-14 21:27:55 +02:00
Sylvain THESNIERES
9f84518910
Remove dead code
...
Object class is quake specific stuff and these parts were *dead*. There is more references to the pointer but it is commented and seems to be used as "reference code" for future implementation of player functions, so I prefered not touching them.
2012-06-14 08:09:03 +02:00
Jason Hooks
c4c8288af8
Seven digit scales
2012-06-13 19:34:13 -04:00
Jason Hooks
897a331244
NPC activation
2012-06-13 12:21:51 -04:00
Alexander "Ace" Olofsson
82fba53771
Removed the license screen and changed so all licenses are instead installed to the game folder.
2012-06-13 14:58:27 +02:00
Jason Hooks
5028f9926d
Bullet scale solution
2012-06-12 18:09:58 -04:00
Jason Hooks
10810ee311
Outputting formatted string with scale
2012-06-11 19:55:10 -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
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
0c7476b88c
Fix build in DEBUG mode for MSVC
...
- commented stall code
2012-06-08 19:56:27 +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
Sylvain THESNIERES
7354d1eccb
CMake fixes:
...
- Fix environment variable in Bullet
- Remove spurious message in MyGUI
2012-06-08 19:54:12 +02:00
scrawl
246c6493df
Merge branch 'master' into graphics
2012-06-08 17:29:36 +02:00
Marc Zinnschlag
ce43ff8d05
Issue #181 : added member variable access opcodes
2012-06-07 13:56:49 +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
6ec2a2091c
Issue #305 : Allow the use of = as a synonym for ==
2012-06-07 12:16:03 +02:00
Marc Zinnschlag
72fca40090
Issue #181 : member variable access in interpreter context
2012-06-07 11:59:45 +02:00
Jason Hooks
4ff36a9018
Bullet loader trafos changed to match NIFLoader
2012-06-06 16:29:44 -04:00
scrawl
42e44ac1b5
fixed some leaks
2012-06-06 21:08:20 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
dfac5f26c3
fixed some issues:
...
- probes were not showing up in inventory category "misc"
- lights, probes, lockpicks were not equippable
- weapons could not be picked up
2012-06-04 21:48:20 +02:00
scrawl
ea8e3ca1c8
fix item duplication bug when picking up object with the mouse and immediately dropping again
2012-06-04 21:09:51 +02:00
scrawl
1ecc6f97ed
alchemy effect fix
2012-06-04 20:56:13 +02:00
scrawl
d56defd4f4
set input focus to console after selecting objects in console mode
2012-06-03 21:19:48 +02:00
scrawl
8e96871acd
remove something unused
2012-06-03 18:40:10 +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
Marc Zinnschlag
ad54955e95
Merge remote branch 'scrawl/objectselection'
2012-06-02 15:00:32 +02:00
scrawl
b8464d4ce5
allow picking up objects from the gameworld with the mouse in inventory mode
2012-06-02 14:19:02 +02:00
scrawl
b886aea298
change console skin to MW_Window and set the selected object refID as window title
2012-06-02 12:31:23 +02:00
scrawl
0ba0b2122e
set the implicit object for script excution by clicking on it
2012-06-02 12:25:24 +02:00
Jason Hooks
d081f7ea83
Don't run up walls
2012-05-31 20:13:40 -04:00
Edmondo Tommasina
a9a582f858
renderer.cpp: fix std::runtime_error compile error
2012-05-30 23:18:59 +02:00
scrawl
fbaedd2c3a
new underwater colors
2012-05-30 16:20:35 +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
scrawl
72bb7a2d2c
fix a typo
2012-05-30 08:04:07 +02:00
Jason Hooks
fb4e7f02b9
code correction
2012-05-29 22:03:00 -04:00