athile
|
c459eb7c55
|
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
|
2011-01-10 13:48:16 -07:00 |
|
Marc Zinnschlag
|
46a8ccc2ff
|
changed collision mode instruction from enable/disable to toggle
|
2011-01-09 21:07:27 +01:00 |
|
Marc Zinnschlag
|
42ef7a61a0
|
Merge branch 'script'
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
|
2011-01-09 20:56:21 +01:00 |
|
Marc Zinnschlag
|
bb34f6e7fc
|
added Enable/DisableCollision instructions
|
2011-01-09 20:44:17 +01:00 |
|
Marc Zinnschlag
|
0a832f2d23
|
Merge branch 'playerpos' into script
|
2011-01-09 19:22:27 +01:00 |
|
Diggory Hardy
|
39614c6813
|
CMake configuration tweaks
Make the PkgConfig search for OGRE libraries and headers happy when custom paths are set.
Check the uuid/uuid.h header is found.
|
2011-01-09 10:22:21 +01:00 |
|
Marc Zinnschlag
|
b6e7de6527
|
new mangle version (remember to update your subnodules)
|
2011-01-09 09:39:13 +01:00 |
|
Marc Zinnschlag
|
6d7be16f0b
|
redirected submodules to my own repositories
|
2011-01-09 09:20:05 +01:00 |
|
Yuri Krupenin
|
e7d853bb3c
|
Corrected subsystem link flags for MinGW.
|
2011-01-08 23:58:47 +03:00 |
|
Marc Zinnschlag
|
f01a3d5e35
|
split Player class into a MWWorld and a MWRender component
|
2011-01-08 15:11:37 +01:00 |
|
Yuri Krupenin
|
b791a8f6be
|
Merge remote branch 'zini/master'
|
2011-01-08 16:24:26 +03:00 |
|
Marc Zinnschlag
|
4f51391003
|
general player class cleanup
|
2011-01-06 10:07:01 +01:00 |
|
Marc Zinnschlag
|
4dd8616f87
|
Merge remote branch 'pvdk/master'
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwsound/soundmanager.cpp
|
2011-01-06 09:45:14 +01:00 |
|
Pieter van der Kloet
|
dd4d022301
|
Converted all tabs to four spaces
|
2011-01-05 22:18:21 +01:00 |
|
Jan-Peter Nilsson
|
ba18dc46ef
|
Don't try to play random tunes when sound is disabled
|
2011-01-05 02:12:43 +01:00 |
|
Jan-Peter Nilsson
|
d38f2f0a00
|
See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound
|
2011-01-05 02:12:13 +01:00 |
|
Marc Zinnschlag
|
4a12be11bf
|
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
|
2011-01-04 15:58:22 +01:00 |
|
Yuri Krupenin
|
15a7cc0674
|
That should solve link-time problems when building with mingw.
Not supplying "SUBSYSTEM:" flags to mingw linker.
Linking mygui with libwinmm - should resolve reference to timeGetTime().
|
2011-01-04 14:40:28 +03:00 |
|
Yuri Krupenin
|
6b6ee5440e
|
Minimal set of fixes to build with MinGW.
|
2011-01-03 17:00:53 +03:00 |
|
Jason Hooks
|
f3ae1ea737
|
NPC leg appearance changed
|
2011-01-01 13:00:58 -05:00 |
|
Jason Hooks
|
ba168b22e9
|
cleanupandupdate
|
2011-01-01 11:47:12 -05:00 |
|
Jason Hooks
|
11406ae6f3
|
cleanupandupdate
|
2011-01-01 11:45:11 -05:00 |
|
Marc Zinnschlag
|
2ffe1206a6
|
merged opcode classes that came in explicit and implicit variants
|
2010-12-31 19:09:25 +01:00 |
|
Marc Zinnschlag
|
67a745cdf6
|
workaround for NPC activation crash
|
2010-12-31 15:50:54 +01:00 |
|
Marc Zinnschlag
|
2628b5143c
|
Merge remote branch 'jpn/dialouge'
|
2010-12-30 15:11:17 +01:00 |
|
Marc Zinnschlag
|
5336b90149
|
music player and NPC rendering branch
|
2010-12-30 14:50:35 +01:00 |
|
Marc Zinnschlag
|
e404d71e4f
|
fixes for class selection merge
|
2010-12-30 14:27:19 +01:00 |
|
Jason Hooks
|
60601682cd
|
Beast races fixed
|
2010-12-21 21:45:54 -05:00 |
|
Jason Hooks
|
1896a6a2e8
|
Preliminary npcs4
|
2010-12-13 16:01:52 -05:00 |
|
Jason Hooks
|
467988455c
|
Preliminary npcs3
|
2010-12-12 22:05:47 -05:00 |
|
Jason Hooks
|
dfe20033ea
|
Preliminary npcs2
|
2010-11-25 18:36:25 -05:00 |
|
Jason Hooks
|
6aaedff86a
|
Preliminary NPCs
|
2010-11-25 15:44:56 -05:00 |
|
Jason Hooks
|
a9892161af
|
MP3 functions moved to soundmanager
|
2010-11-11 19:47:26 -05:00 |
|
Jason Hooks
|
be1582a88f
|
Regional Sounds
|
2010-11-08 18:01:33 -05:00 |
|
Jason Hooks
|
a038c67e5a
|
Preliminary region sound framework2
|
2010-11-07 12:51:59 -05:00 |
|
Jason Hooks
|
cab2341259
|
Preliminary region sound framework
|
2010-11-06 13:11:09 -04:00 |
|
Jan-Peter Nilsson
|
d9d626cc95
|
Make DialogueWindow use the new WindowBase
|
2010-11-06 11:47:46 +01:00 |
|
Jan-Peter Nilsson
|
180164b2f3
|
Remove unnecessary includes
|
2010-11-06 11:45:13 +01:00 |
|
Jan-Peter Nilsson
|
770b490539
|
Make CreateClassDialog use the new WindowBase
|
2010-11-06 11:44:02 +01:00 |
|
Jan-Peter Nilsson
|
6fc0e4d6d6
|
Make DescriptionDialog use the new WindowBase
|
2010-11-06 11:42:54 +01:00 |
|
Jan-Peter Nilsson
|
12dee62307
|
Make SelectSkillDialog use the new WindowBase
|
2010-11-06 11:41:41 +01:00 |
|
Jan-Peter Nilsson
|
8f334d1df2
|
Make SelectAttributeDialog use the new WindowBase
|
2010-11-06 11:40:41 +01:00 |
|
Jan-Peter Nilsson
|
037c1021e3
|
Make SelectSpecializationDialog use the new WindowBase
|
2010-11-06 11:39:38 +01:00 |
|
Jan-Peter Nilsson
|
4e8f55b630
|
Make PickClassDialog use the new WindowBase
|
2010-11-06 11:38:29 +01:00 |
|
Jan-Peter Nilsson
|
ed05c5752b
|
Make GenerateClassResultDialog use the new WindowBase
|
2010-11-06 11:37:00 +01:00 |
|
Jan-Peter Nilsson
|
0d97200e18
|
Make InfoBoxDialog use the new WindowBase
|
2010-11-06 11:33:30 +01:00 |
|
Jan-Peter Nilsson
|
6c7f59725f
|
Make StatsWindow use the new WindowBase
|
2010-11-06 11:29:49 +01:00 |
|
Jan-Peter Nilsson
|
2e7e79f596
|
Make ReviewDialog use the new WindowBase
|
2010-11-06 11:29:03 +01:00 |
|
Jan-Peter Nilsson
|
5db021e99b
|
Make TextInputDialog use the new WindowBase
|
2010-11-06 11:27:53 +01:00 |
|
Jan-Peter Nilsson
|
e551c60e75
|
Make RaceDialog use the new WindowBase
|
2010-11-06 11:26:45 +01:00 |
|