Commit Graph

23 Commits (7f6b1d6b944244f07ae07f4883e71e5f33ea82c1)

Author SHA1 Message Date
Jonathan G Rennison 7f6b1d6b94 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
5 months ago
Rubidium e3f49ee7a0 Codechange: coding style fixes 5 months ago
Rubidium 84037d4a57 Codechange: use std::string for parameters in the dbg_helpers 1 year ago
Charles Pigott f481c9fc2c Codechange: Replace CStrA with std::string 3 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
alberth 1105b4d2c9 (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 9 years ago
alberth b885d79f50 (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 9 years ago
truebrain 1c9bec1999 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 13 years ago
rubidium fb5ecb9499 (svn r22411) -Document: another bunch of bits 13 years ago
alberth 67cd2cd6be (svn r21594) -Codechange: Whitespace fixes in ifndef/define lines. 14 years ago
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
frosch 6465f02fba (svn r18826) -Codechange: Unifiy return value of (SmallArray|FixedSizeArray)::(Append|AppendC) with other containers. (skidd13) 15 years ago
frosch e6faf06b68 (svn r18824) -Codechange: Turn some public members into protected ones. (skidd13) 15 years ago
frosch 085e9251c5 (svn r18823) -Codechange: Some uints for unsigned ints. (skidd13) 15 years ago
frosch c7dafb9a26 (svn r18822) -Codechange: Rename YAPF-related container classes and their members to better fit other container classes. (skidd13) 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium d03994098b (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 16 years ago
KUDr c37dc87ad2 (svn r10392) -Add [YAPF]: added structured dump support into some essential YAPF classes (node-list, nodes, keys, etc.) and CArrayT 17 years ago
KUDr 622235d8cd (svn r10390) -Fix: constness 17 years ago
belugas 607a55f4ec (svn r9662) -Documentation: Doxygen corrections and @file omissions 17 years ago
KUDr f2e5e604fb (svn r8092) -Codechange: header files with miscellaneous template classes (smart pointers, blob, array, hashtable, etc.) moved from src/yapf to src/misc as they can now be used anywhere. 18 years ago