Cyp
|
e689ad51d5
|
Merge remote branch 'origin/master' into qt
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
|
2011-03-13 22:31:19 +01:00 |
abomination
|
a72c41aeec
|
fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
|
2011-03-13 12:32:24 +01:00 |
|
Cyp
|
a7730ccd15
|
Change "typedef struct {...} Blah;" into "struct Blah {...};".
Removed a few structs due to disuse.
|
2011-02-25 21:30:13 +01:00 |
|
Cyp
|
4a1b5fb543
|
Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
|
2011-02-25 18:50:54 +01:00 |
|
Cyp
|
ae2ce18314
|
Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
|
2011-02-25 18:45:27 +01:00 |
|
Cyp
|
28f9830a63
|
Merge remote branch 'origin/master' into qt
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
|
2011-01-14 19:26:55 +01:00 |
Per Inge Mathisen
|
e27ac240be
|
Inline pie_SetTranslucencyMode() and remove the entirely superfluous TRANSLUCENCY_MODE abstraction.
|
2010-12-31 23:02:20 +01:00 |
|
Per Inge Mathisen
|
67e9635f9f
|
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
|
2010-12-31 22:37:14 +01:00 |