Marc Zinnschlag
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
2011-07-31 19:28:12 +02:00
Lukasz Gromanowski
ac9b1715d5
Added new command line option: "encoding"
...
Added new command line option: "encoding" which allow to
change font encoding used in game messages.
Currently there are three evailable encodings:
win1250 - Central and Eastern European (languages
that use Latin script, such as Polish,
Czech, Slovak, Hungarian, Slovene, Bosnian,
Croatian, Serbian (Latin script),
Romanian and Albanian)
win1251 - languages that use the Cyrillic alphabet
such as Russian, Bulgarian, Serbian Cyrillic
and others
win1252 - Western European (Latin) - default
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-07-17 22:16:50 +02:00
Marc Zinnschlag
2b5dc0042b
fix for issue 138 (record loading failed for some NPCs)
2011-07-04 23:36:22 +02:00
Marc Zinnschlag
ba55b51627
removed a leftover debug message
2011-06-26 21:29:22 +02:00
Nikolay Kasyanov
e48d265b5d
Mac fix: added local config dir support, app root dir is dir where bundle located
2011-06-26 20:15:42 +04:00
Marc Zinnschlag
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
57972eb042
Mantis: #18 - Move components from global namespace into their own namespace.
...
Added namespace around generated win_1252 table.
Added generation of header guard and ToUTF8 namespace in gen_iconv.
Small corrections in Makefile.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:33:30 +02:00
Lukasz Gromanowski
e9ff9a446b
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifogre into NifOgre namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 19:14:14 +02:00
Lukasz Gromanowski
2ddd5dba11
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/nifbullet into NifBullet namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:45:23 +02:00
Lukasz Gromanowski
514b55766f
Mantis: #18 - Move components from global namespace into their own namespace.
...
Updated components/misc tests.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:25:09 +02:00
Lukasz Gromanowski
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:14:03 +02:00
Lukasz Gromanowski
8a84201ba2
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/bsa into Bsa namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 16:46:34 +02:00
Marc Zinnschlag
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8
more cleanup
2011-06-15 22:33:31 +02:00
Jason Hooks
2132488408
merge
2011-06-15 13:24:37 -04:00
Jason Hooks
56affd018a
Some cleanup
2011-06-15 13:09:47 -04:00
Marc Zinnschlag
a6e83f5b9b
case-handling fix for references in cells
2011-06-13 13:47:59 +02:00
Jason Hooks
9eefee7168
Say strict
2011-06-11 20:01:21 -04:00
Jason Hooks
93f41e25a4
fs-strict
2011-06-08 17:29:28 -04:00
Jason Hooks
65cc0e8317
trying strict
2011-06-08 17:15:13 -04:00
Jason Hooks
3a9007849d
Windows fix
2011-06-08 00:35:30 -04:00
Jason Hooks
a719a6b468
Getting rid of animation code in nif loader
2011-06-07 18:57:24 -04:00
Marc Zinnschlag
d59856af5c
minor performance improvement
2011-06-08 00:52:25 +02:00
Marc Zinnschlag
4f304cfff2
Merge remote branch 'jhooks/directories' into directories
2011-06-08 00:29:12 +02:00
Jason Hooks
4d31ca2c86
Leading slashes now work, efficiency changes
2011-06-07 17:17:25 -04:00
Marc Zinnschlag
5fb3dc854b
Merge branch 'optimisation'
2011-06-07 10:21:29 +02:00
Marc Zinnschlag
ac4af583b7
Merge remote branch 'jhooks/directories' into directories
2011-06-07 09:22:58 +02:00
Jason Hooks
45453fd7a9
Case insensitive external loader working
2011-06-06 20:11:23 -04:00
Jason Hooks
f2a0fa8af2
Adding files to directory map
2011-06-05 23:46:18 -04:00
Marc Zinnschlag
a95a0f821b
Merge remote branch 'jhooks/directories' into directories
...
Conflicts:
components/files/multidircollection.hpp
2011-06-04 10:27:16 +02:00
Jason Hooks
2aaa0f4578
Backslash working in linux
2011-06-04 01:29:57 -04:00
Jason
b92955763a
Introducing Dir Archive
2011-06-03 20:28:47 -04:00
athile
231be8f381
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
2011-05-31 21:55:08 -06:00
Jason Hooks
51b74c2f05
starting
2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5
Merge remote branch 'upstream/master'
2011-05-23 15:01:47 -04:00
gugus
0d9dde0fcf
experimental: each material with the same texture is loaded only once. Problem: it doesn't take into account other material properties (which seems to be always the same anyway)
2011-05-23 14:59:36 +02:00
gugus
b05f780675
fix a compiler error under window
2011-05-23 14:56:19 +02:00
Marc Zinnschlag
80691250ec
don't create a new virtual machine for each script and frame
2011-05-18 16:01:19 +02:00
Marc Zinnschlag
a133920eb0
boost filesystem fix
2011-05-10 09:32:47 +02:00
Marc Zinnschlag
d9f1b64213
some file collection bug fixing
2011-05-05 21:39:52 +02:00
Marc Zinnschlag
6e880cffb2
changed engine class to support multiple data directories for esm files
2011-05-05 19:32:42 +02:00
Marc Zinnschlag
d260e5c1bd
added file collection class
2011-05-05 19:00:00 +02:00
Marc Zinnschlag
5b6ec405e3
Merge branch 'script'
2011-04-28 10:30:32 +02:00
Marc Zinnschlag
7f0a75c803
Merge branch 'config'
2011-04-28 10:26:51 +02:00
Marc Zinnschlag
3cb994764c
Merge remote branch 'corristo/header-refactoring'
2011-04-28 10:22:33 +02:00
Marc Zinnschlag
bdfd28f44d
adjusted components/files namespace; some related cleanup
2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4
moved path.hpp/path.cpp to a new component
2011-04-28 09:39:40 +02:00
Marc Zinnschlag
861dc6a16e
redirecting output of expression evalutation to new report channel
2011-04-26 22:07:27 +02:00
Marc Zinnschlag
125319c441
splitting off console output from messageBox channel
2011-04-26 21:48:13 +02:00
Jason Hooks
2ac1cc8aee
Trying to animate creatures
2011-04-13 20:16:46 -04:00
Jason Hooks
d035441876
Reintroducing animation
2011-04-11 20:56:06 -04:00
Nikolay Kasyanov
79911b16d0
Fixed enum formatting in components/esm headers
2011-04-08 22:26:27 +04:00
Marc Zinnschlag
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
Pieter van der Kloet
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
2011-03-28 17:36:05 +02:00
Marc Zinnschlag
c571148bef
Merge branch 'collision'
2011-03-23 22:57:56 +01:00
gugus
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2
Merge branch 'tab_completion'
2011-03-23 17:08:52 +01:00
gugus
b2194398a4
fixed a bug in loading. Every collision mesh is correctly loaded now.
2011-03-23 13:42:28 +01:00
gugus
9d4cda6510
OEngine doesn't rely on OpenMW anymore
2011-03-18 13:22:09 +01:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
229a91a625
Remove unused code/dependencies
2011-03-12 13:20:28 +01:00
Nikolay Kasyanov
3552ad045d
Removed obsolete macBundlePath function from fileops.cpp. Using Ogre::macBundlePath
2011-03-09 21:54:01 +03:00
Marc Zinnschlag
ecfe57caf2
platform check fix
2011-03-09 18:50:24 +01:00
Nikolay Kasyanov
3d75eea377
Merge remote-tracking branch 'upstream/master'
2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
4dd76ff36e
Remove no longer needed local .gitignore
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
f65f210149
An unsigned integer can not be smaller than 0 so there's no point in checking
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203
Remove unused variables
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
9ee83caaa2
Avoid crash when no bones are available
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
696861349e
Rename skel to mSkel
2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
26b780d1ac
Remove unused variables and fix signed/unsigned comparison to make the compiler happy
2011-02-27 00:48:49 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
86ded891d9
modified the nif loader for shapes used for raycasting only.
2011-02-22 20:53:58 +01:00
gugus
d3c1640723
add physic support
2011-02-22 14:11:53 +01:00
gugus
1dc452ec91
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
2011-02-11 13:33:45 +01:00
Marc Zinnschlag
6a14ea8ec3
handle physics during player changing cells
2011-01-29 16:57:33 +01:00
gugus
a8ade56c80
Add a bullet Shape Loader
2011-01-13 17:51:50 +01:00
Marc Zinnschlag
d865c3cfc6
backend for tab completion: identifiers
2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18
backend for tab completion: keywords
2011-01-12 18:24:00 +01:00
athile
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
2011-01-10 16:13:32 -07:00
Yuri Krupenin
b791a8f6be
Merge remote branch 'zini/master'
2011-01-08 16:24:26 +03:00
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
2011-01-05 22:18:21 +01:00
Yuri Krupenin
6b6ee5440e
Minimal set of fixes to build with MinGW.
2011-01-03 17:00:53 +03:00
Jason Hooks
11406ae6f3
cleanupandupdate
2011-01-01 11:45:11 -05:00
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
2010-12-30 14:50:35 +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
13d8ea09b0
Cell case insensitivity, exterior and interior cells
2010-10-27 23:22:01 -04:00
Jason Hooks
ffaaad188a
using theirs
2010-10-27 12:32:50 -04:00
Marc Zinnschlag
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
2010-10-22 10:27:32 +02:00
Marc Zinnschlag
cc86fe54d5
Merge remote branch 'amos/gui-windows' into newchar
2010-10-22 10:12:39 +02:00
Nicolay Korslund
30f2d4fdd4
Added LAND and LTEX to esm_store
2010-10-03 12:41:35 +02:00
Marc Zinnschlag
770276281b
changed numeric char type defs from char to signed char
2010-09-30 13:56:22 +02:00
Nicolay Korslund
d36fa3deda
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-09-27 18:00:25 +02:00
Nicolay Korslund
255b0d03a9
Started early work on terrain code (no rendering yet.)
2010-09-27 17:59:47 +02:00
Marc Zinnschlag
c16f79afc6
fixed a bug in esm loader, that made all doors and chests locked by default
2010-09-27 17:11:16 +02:00
Marc Zinnschlag
e39caef261
second set of additional doxygen comments
2010-09-25 20:15:05 +02:00
Jan Borsodi
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
2010-09-24 15:28:14 +02:00
Jan Borsodi
cd3e976b7c
Added birthsign dialog and spell effect widget.
2010-09-21 12:34:47 +02:00
Jan Borsodi
eec34e9f0e
Added dialog for picking class from a list.
2010-09-19 04:29:22 +02:00
Jan Borsodi
54996684aa
Merge branch 'master' into gui-windows
2010-09-19 02:04:36 +02:00
Jan Borsodi
573917f3e1
Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group.
2010-09-18 19:26:45 +02:00
Nicolay Korslund
3e170002e2
Merge remote branch 'zinnschlag/cell'
2010-09-16 10:25:11 +02:00
Nicolay Korslund
71e5a15298
Minor improvement to to_utf8
2010-09-16 10:24:45 +02:00
Jan Borsodi
30e0d713ed
Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST.
2010-09-15 13:44:24 +02:00
Jan Borsodi
edb2df7d27
Merge remote branch 'zini/newchar' into gui-windows
2010-09-14 23:27:43 +02:00
Jan Borsodi
415426c30b
Convert tabs to spaces.
2010-09-14 23:26:32 +02:00
Jan Borsodi
1c79a62957
Added a static list of skill names to ESM::Skill.
2010-09-14 23:26:29 +02:00
Marc Zinnschlag
9a2f128f58
improved record searching
2010-09-12 09:44:12 +02:00
Marc Zinnschlag
0414d7f862
load skill and magic effect records
2010-09-12 09:34:45 +02:00
Nicolay Korslund
6a12ce313e
Fixed uninit var in loadland.hpp
2010-09-11 15:52:20 +02:00
Marc Zinnschlag
814d721e33
build external cell names from name of region instead of from internal region id
2010-09-11 15:12:42 +02:00
Marc Zinnschlag
5f84b680af
implemented exterior coc
2010-09-11 11:55:28 +02:00
Nicolay Korslund
0eae9d1504
Removed -Werror again
2010-09-10 19:34:38 +02:00
Nicolay Korslund
91e8590288
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-09-10 12:07:15 +02:00
Nicolay Korslund
f55362cbdc
Some Windows-help to cmake/FindAudiere.cmake + non-important changes.
2010-09-10 10:45:16 +02:00
Marc Zinnschlag
058f2d0cce
fixed a problem with previous merge
2010-09-08 15:42:49 +02:00
Marc Zinnschlag
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2010-09-08 15:38:19 +02:00
Nicolay Korslund
5552c44753
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
2010-09-07 10:40:00 +02:00
Nicolay Korslund
e30306f7c3
Removed redundant custom exception class
2010-09-02 22:30:39 +02:00
Nicolay Korslund
c5d3a40fde
Fixed ESM bug (quest records).
2010-09-02 14:57:26 +02:00
Nicolay Korslund
d32563063b
Alternative fix to mesh crash bug
2010-09-02 14:12:48 +02:00
Marc Zinnschlag
044bf0ab48
fixed parsing explicit references in the body of control structures
2010-08-30 14:44:23 +02:00
Marc Zinnschlag
15878b12fd
Merge branch 'master' into exterior
2010-08-22 21:12:16 +02:00
Marc Zinnschlag
c18e83d7c0
extended scripting extensions to code segment 3 (instructions and functions with optional arguments)
2010-08-22 14:00:30 +02:00
Marc Zinnschlag
b3cc3073a3
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
2010-08-22 13:15:56 +02:00
Marc Zinnschlag
08d2b80434
message box fix
2010-08-22 12:56:35 +02:00
Marc Zinnschlag
f4e79a48f0
implemented optional arguments
2010-08-22 12:47:56 +02:00
Marc Zinnschlag
276a9db6f7
added missing button implementation for MessageBox
2010-08-22 11:14:14 +02:00
Marc Zinnschlag
72cc0a3983
fixed typo in documentation
2010-08-22 09:17:05 +02:00
Marc Zinnschlag
9a7c72cdbe
Merge commit 'ape/master'
2010-08-21 20:23:40 +02:00
Armin Preiml
27166b4ee4
added bone assignment, skeleton is disabled for meshes
...
Skeleton isn't assigned to the meshes for now, because it crashes on some.
2010-08-21 19:40:08 +02:00
Nicolay Korslund
2ad9850070
Added .wav -> .mp3 sound file lookup
2010-08-20 14:20:05 +02:00
Marc Zinnschlag
6583b66e82
added load function for exteriors to cell sstore
2010-08-20 13:06:01 +02:00
Nicolay Korslund
3127602c57
Added file_finder component. Used by sound system.
2010-08-20 12:56:46 +02:00
Marc Zinnschlag
d52e2f68cd
added searchExt function to cell RecList
2010-08-20 12:52:51 +02:00
Nicolay Korslund
38ad2d98f9
Fixed windows issues + one minor optimization on to_utf8
2010-08-18 19:50:59 +02:00
Nicolay Korslund
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
2010-08-18 18:45:44 +02:00
Marc Zinnschlag
2cfe5f0697
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
2010-08-18 09:25:07 +02:00
Armin Preiml
47a28fe02b
If nif has a skeleton vertices are placed on the right position.
2010-08-17 19:02:22 +02:00
Armin Preiml
6a936100a7
Merge remote branch 'upstream/master'
2010-08-16 20:11:38 +02:00
Armin Preiml
d8f8bd12d3
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
2010-08-16 19:31:59 +02:00
Nicolay Korslund
5d4dba981f
Fixed mistake in NPC record struct
2010-08-13 15:51:42 +02:00
Marc Zinnschlag
0d4f2ab3ef
disabled escape sequences in script strings (doesn't work with Windows paths)
2010-08-12 19:41:40 +02:00
Armin Preiml
181b538e4a
restructured ogre nif code (struct -> class with singleton), formated code
2010-08-08 17:20:55 +02:00
Marc Zinnschlag
8086933282
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2010-08-08 14:14:43 +02:00
Marc Zinnschlag
8d85211fa1
modified Npc and Creature class to let them store a copy of their own ID
2010-08-08 14:09:09 +02:00
Armin Preiml
305563e595
disabled char encoding method for windows, although you'll need to add the iconv libs
2010-08-08 10:07:02 +02:00
Marc Zinnschlag
7611572065
cleanup
2010-08-06 15:25:54 +02:00
Marc Zinnschlag
6b1b3b20fd
store info records in dialogue records
2010-08-06 15:23:13 +02:00
Marc Zinnschlag
d47de55ce9
read info records
2010-08-06 15:19:39 +02:00
Marc Zinnschlag
69ea00455f
Merge branch 'poly'
...
Conflicts:
apps/openmw/mwworld/world.cpp
2010-08-03 21:43:05 +02:00
Marc Zinnschlag
f50ced4616
added missing record classes
2010-08-03 15:24:44 +02:00
Armin Preiml
986325b3b2
Changed decoding code page from ISO-8859-1 to WINDOWS-1252
2010-08-02 13:22:50 +02:00
Marc Zinnschlag
00c0a50f7f
Merge commit 'ape/master'
2010-07-31 19:37:49 +02:00
Armin Preiml
f3ee9ced5c
Added cmake file for the iconv library and extended relevant
...
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
2010-07-31 19:02:29 +02:00
Marc Zinnschlag
80000866fe
split reclists find function into find and search functions (search can be used to check if an object does not exist, while find would see this as an error situation and would throw an exception)
2010-07-26 11:40:03 +02:00
Marc Zinnschlag
61d09c4768
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
2010-07-26 11:15:38 +02:00
Nicolay Korslund
532ccbd1f8
Killed clientconsole, mwcompiler, mwinterpreter and command server
2010-07-22 14:15:02 +02:00
Nicolay Korslund
ff64c1fbf0
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-07-21 16:20:38 +02:00
Nicolay Korslund
f87810ce7a
Moved esmtool to apps/
2010-07-21 13:52:28 +02:00
Marc Zinnschlag
cf7150e585
implemented naked expressions in lineparser (used in console; result is send through messagebox interface)
2010-07-21 13:34:52 +02:00
Marc Zinnschlag
01edd8deb5
compiler exception class fixes
2010-07-21 10:57:21 +02:00
Nicolay Korslund
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
2010-07-20 20:23:37 +02:00
Nicolay Korslund
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
2010-07-17 19:38:32 +02:00
Nicolay Korslund
4d74f85ae0
Moved mwgui manager to components, ready for testing
2010-07-16 22:27:50 +02:00
Nicolay Korslund
13d3f9c87e
Integrated OpenEngine, replaces entire components/engine/ directory.
2010-07-16 14:56:14 +02:00
Marc Zinnschlag
c9a6335918
replaced flat Type_Data stack with a union
2010-07-14 15:28:55 +02:00
Marc Zinnschlag
0f742ce7f9
even better error checking for extensions with explicit references
2010-07-10 12:31:00 +02:00
Marc Zinnschlag
211b723137
better error checking for extensions with explicit references
2010-07-10 12:16:45 +02:00
Marc Zinnschlag
d8c99c6ce3
Merge commit 'upstream/master'
2010-07-09 22:01:35 +02:00
Marc Zinnschlag
71c710f9f6
enhanced compiler extenion system to support new instructions and functions with explicit references
2010-07-09 22:01:24 +02:00
Marc Zinnschlag
69e607e140
implemented getdistance with explicit references
2010-07-09 20:55:39 +02:00
Marc Zinnschlag
c37b007be0
added verification for explicit references (check if the given ID exists)
2010-07-09 20:35:34 +02:00
Marc Zinnschlag
d4ac3b506e
implemented enable, disable and getdisabled with explicit references
2010-07-09 19:32:17 +02:00
Marc Zinnschlag
ce74ee8618
removed an outdated log message
2010-07-09 18:27:31 +02:00
Marc Zinnschlag
5a1dd4fedd
fixed fileparser bug (empty line before the initial begin statement were not handled correctly
2010-07-09 18:21:16 +02:00
Marc Zinnschlag
592fa84e2d
added Enable, Disable, GetDisabled
2010-07-09 16:07:03 +02:00
Nicolay Korslund
9c839e220e
Moved GUI stuff into components
2010-07-08 22:34:35 +02:00
Nicolay Korslund
3896fd218a
Added stand-alone GUI test, compiles and runs
2010-07-08 11:53:59 +02:00
Marc Zinnschlag
6b3ff8a516
constness fixes
2010-07-07 20:14:50 +02:00
Nicolay Korslund
505a972faa
changed assert to a softer warning message in cell_store.hpp
2010-07-07 17:39:23 +02:00
Nicolay Korslund
b97def39b3
Minor fixes to Mac stuff
2010-07-07 10:07:15 +02:00
Nicolay Korslund
2ec96ed7de
Merge branch 'master' of http://github.com/ardekantur/openmw
2010-07-07 09:53:13 +02:00
Nicolay Korslund
359f2903d7
Merged athile and zinnschlag
2010-07-07 09:46:11 +02:00
athile
a638c330ec
Add one more command server fix so it still works correctly on Windows and reeanble the command server by default.
2010-07-06 10:28:48 -07:00
athile
57de436db4
Command server Linux fix for open client connections.
2010-07-06 10:21:18 -07:00
athile
22c1314738
Potential fix for inability to cancel Boost.Asio blocking accept on Linux
2010-07-06 10:03:49 -07:00
Marc Zinnschlag
9d73718ec1
added GetSecondsPassed
2010-07-06 12:06:50 +02:00
Marc Zinnschlag
eff931b464
fixed broken getdistance function
2010-07-05 14:59:22 +02:00
Marc Zinnschlag
85cd744f44
fixed a stringparser bug
2010-07-05 13:33:17 +02:00
Marc Zinnschlag
b28a6fd7b8
modified parser to skip over button arguments in an messagebox instruction
2010-07-05 13:21:08 +02:00
Marc Zinnschlag
34b824cb70
implemented GetDistance function
2010-07-05 12:30:45 +02:00
Marc Zinnschlag
cc0c21cf35
added function to retrieve a live cell ref via name
2010-07-05 12:09:04 +02:00
Marc Zinnschlag
5786addab5
allowed the use of keywords as script names (*sigh*)
2010-07-05 10:58:10 +02:00
athile
5fe4313b95
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
2010-07-04 20:17:10 -07:00
Ardekantur
ee6c933156
Merge branch 'master' of git://github.com/korslund/openmw
...
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
game/engine.cpp
2010-07-04 17:16:57 -04:00
Marc Zinnschlag
a61b2c39f0
added scriptrunning/startscript/stopscript; sorted out more case problems
2010-07-04 16:00:32 +02:00
Marc Zinnschlag
185f8bd56d
added random function; global variable fix
2010-07-04 13:59:29 +02:00
Marc Zinnschlag
c3c16facbf
fixed handling of case-insensitive IDs in esm store (cell list still on TODO list)
2010-07-04 13:07:01 +02:00
Marc Zinnschlag
d57e67e722
added global variable handling to compiler context (not working yet because of case problems)
2010-07-04 12:55:55 +02:00
Marc Zinnschlag
f9c1548f80
added menumode script function; added global variable handling in compiler and interpreter (openmw context still ignores global variables)
2010-07-04 12:29:28 +02:00
Marc Zinnschlag
5d46fc869c
added missing sound script functionality; various script-related bug-fixes
2010-07-03 20:35:59 +02:00
Marc Zinnschlag
c12752df4d
added sound manager skeleton and sound script functions
2010-07-03 15:04:00 +02:00
Marc Zinnschlag
32eafaa301
added custom function handling (compiler)
2010-07-03 10:43:55 +02:00
Marc Zinnschlag
a1beffc3cd
added compiler extensions class
2010-07-03 09:54:01 +02:00
Marc Zinnschlag
474b412b47
implemented local script execution
2010-07-02 18:08:00 +02:00
Marc Zinnschlag
def0a773bd
replaced void * entry in cell store with a generic type
2010-07-02 13:48:48 +02:00
Marc Zinnschlag
c7f76f51fb
added --debug option and finally cleaned up the merge mess
2010-07-02 13:12:05 +02:00
Nicolay Korslund
4a3f6b0ff1
Various fixes to get openmw to compile and run properly
2010-07-02 10:41:39 +02:00
athile
450542b4b9
Fix Windows line feeds and chdmod
2010-07-02 00:05:57 -07:00
athile
5825af45c3
Visual Studio 2010 compile fixes
2010-07-01 23:52:20 -07:00
athile
7cc27d9b66
Add command output string and client/server response.
2010-07-01 15:50:24 -07:00
athile
056194baa2
Merge upstream
2010-07-01 12:01:59 -07:00
athile
7357ea2102
Add simple external console server/client
2010-07-01 11:49:00 -07:00
Nicolay Korslund
d03a4c2c7c
Fixed a couple more line endings
2010-07-01 17:41:06 +02:00
Marc Zinnschlag
1ad9b234f0
Merge branch 'mwscript'
...
Conflicts:
CMakeLists.txt
2010-07-01 17:08:27 +02:00
Marc Zinnschlag
804aed6298
added basic message box formatting
2010-07-01 16:40:03 +02:00
Marc Zinnschlag
aeb41105c4
added comparison operators
2010-07-01 12:19:52 +02:00
Marc Zinnschlag
1674d406dc
made usage of comma as argument separator optional (largely untested, because we don't have anything that takes more than one argument)
2010-07-01 11:07:21 +02:00
Marc Zinnschlag
bf55880ce9
a bit of refactoring
2010-07-01 10:47:29 +02:00
Marc Zinnschlag
46fab68d44
implemented while loops
2010-07-01 10:42:49 +02:00
Marc Zinnschlag
69342f320d
added if control structure
2010-06-30 19:58:25 +02:00
Marc Zinnschlag
73f9436ed9
fixed round brackets parsing bug
2010-06-30 14:08:59 +02:00
Marc Zinnschlag
ed92ffcf89
added local variable usage in expressions
2010-06-30 12:46:10 +02:00
Marc Zinnschlag
fac8fb8fcb
added return and messagebox statements (messagebox does neither formating nor buttons yet)
2010-06-30 12:04:26 +02:00
Marc Zinnschlag
8bb2a6039d
modified comma handling to be morse consistent with original script language
2010-06-30 11:03:08 +02:00
Marc Zinnschlag
5fb4abae4f
added function parsing (only one function so far)
2010-06-29 17:51:02 +02:00
Marc Zinnschlag
c8c5ef5467
added bracket parsing
2010-06-29 16:24:54 +02:00
Marc Zinnschlag
48f6ad0f89
added basic arithmetic
2010-06-29 16:11:19 +02:00
Marc Zinnschlag
ca8002e533
added parsing for signed integers and floats
2010-06-29 12:05:22 +02:00
Marc Zinnschlag
ab33234027
prepared expression parser for implementation of more complex expressions
2010-06-29 11:24:07 +02:00
Marc Zinnschlag
6ebe2cff5f
extended expression parser for non-negative floats
2010-06-29 10:36:42 +02:00
Marc Zinnschlag
bceb7ebcbd
reimplemented expression parsing as a separate parser (still only handling non-negative integers)
2010-06-29 10:22:55 +02:00
Marc Zinnschlag
10cb9d3dab
made local variable names case-insensitive
2010-06-29 08:29:16 +02:00
Marc Zinnschlag
c6a37b2e18
added first batch of opcodes
2010-06-28 21:49:48 +02:00
athile
59a2e8dcf7
Merge upstream
2010-06-28 12:44:55 -07:00
athile
97feee6cb6
Move misc files back to components
2010-06-28 12:40:39 -07:00
Marc Zinnschlag
d80cb3461c
added code execution main loop
2010-06-28 20:46:15 +02:00
Marc Zinnschlag
770eb14d95
added context for standalone interpreter
2010-06-28 20:07:17 +02:00
Marc Zinnschlag
487a70388f
added interpreter framework
2010-06-28 19:20:45 +02:00
Marc Zinnschlag
fdcd34941b
added parsing for set statement (only integer values so far); added code generator
2010-06-28 18:27:45 +02:00
Marc Zinnschlag
5cf3264bd3
added literal container and reworked output container handling
2010-06-28 16:48:19 +02:00
Marc Zinnschlag
ba847ae9d8
write local variable declarations into a separate file
2010-06-28 14:17:50 +02:00
Marc Zinnschlag
a3ad61b4d0
write code file after successfull parsing
2010-06-28 14:07:55 +02:00
Marc Zinnschlag
0cfeab622d
added storage class for local variable declarations; added checks for variable re-declaration
2010-06-28 13:28:50 +02:00
Marc Zinnschlag
21e0182ae2
added skip parser for skipping faulty lines
2010-06-28 12:47:11 +02:00
Marc Zinnschlag
bff0855af0
added parsing for local variable declarations
2010-06-28 12:32:08 +02:00
Marc Zinnschlag
16f6f27a90
added line parser (doesn't parse anything yet)
2010-06-28 12:12:47 +02:00
Marc Zinnschlag
fda7077cf2
bug-fix: comments were eating up newlines
2010-06-28 11:40:48 +02:00
Marc Zinnschlag
8930134d82
exception class fix
2010-06-28 11:38:21 +02:00
Marc Zinnschlag
aa99a0dd56
added basic script parser (can only parse empty script bodies for now)
2010-06-28 11:38:04 +02:00
athile
67f89f27a2
Properly removing the old 'misc' file and fixing a minor error in the platform CMake
2010-06-27 18:12:31 -07:00
athile
819c146ad1
Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings
2010-06-27 18:05:01 -07:00
Marc Zinnschlag
de8a651df4
improved error handling
2010-06-28 01:01:48 +02:00
Marc Zinnschlag
a068ca78d7
replaced dummy parser with top level file parser
2010-06-28 00:50:48 +02:00
athile
b2485e8a52
Windows build fixes
2010-06-27 14:43:07 -07:00
athile
d67f0c74b0
Merge remote branch 'upstream/master'
2010-06-27 14:10:46 -07:00
Marc Zinnschlag
d20e850d31
-> wasn't properly translated into a token
2010-06-27 22:31:03 +02:00
Marc Zinnschlag
ddcbc8cd62
added tokenizing of MW scripts
2010-06-27 19:20:21 +02:00
Marc Zinnschlag
106d12906a
special case handling for script records
2010-06-27 14:17:04 +02:00
Marc Zinnschlag
e4f85cb3e6
directory structure reorganisation (still missing the mangle stuff)
2010-06-25 22:28:59 +02:00